restore pipeline job for testing
Change-Id: I14936c73f3610209fcc4c7e38e57994a909734f6
diff --git a/jjb/onos/onos-buck-gerrit-pipeline.yaml b/jjb/onos/onos-buck-gerrit-pipeline.yaml
index 8ff922e..923e99a 100644
--- a/jjb/onos/onos-buck-gerrit-pipeline.yaml
+++ b/jjb/onos/onos-buck-gerrit-pipeline.yaml
@@ -1,72 +1,67 @@
-#---
+---
# ONOS Buck Pipeline jobs
-#
-#- job:
-# branch: master
-# git-url: '$GIT_URL/$GERRIT_PROJECT'
-# stream: master
-# name: onos-validate-pipeline
-# project-type: pipeline
-# sandbox: false
-#
-# parameters:
-# - lf-infra-parameters:
-# # TODO - this is a hack, figure out how to get these from defaults.yaml
-# project: 'onos'
-# stream: 'master'
-# branch: 'master'
-# lftools-version: '<1.0.0'
-#
-# #TODO(BOC): use the build node from the project
-# #FIXME figure out how to run this on a slave
-# #node: 'ubuntu16.04-basebuild-8c-15g'
-# #TODO(BOC) Need build discarding
-# concurrent: true
-#
-# pipeline-scm:
-# script-path: tools/build/jenkins/onos-buck-gerrit
-# scm:
-# - lf-infra-gerrit-scm:
-# #git-url: '{git-url}'
-# git-url: '$GIT_URL/$GERRIT_PROJECT'
-# refspec: '$GERRIT_REFSPEC'
-# branch: '$GERRIT_BRANCH'
-# #submodule-recursive: '{submodule-recursive}'
-# submodule-recursive: false
-# choosing-strategy: gerrit
-# #jenkins-ssh-credential: '{jenkins-ssh-credential}'
-# jenkins-ssh-credential: 'jenkins'
-# shallow-clone: true
-#
-# triggers:
-# - gerrit:
-# #server-name: '{gerrit-server-name}'
-# server-name: 'ONOS Project Gerrit'
-# #trigger-on: '{obj:gerrit_verify_triggers}'
-# trigger-on:
-# - patchset-created-event:
-# exclude-drafts: true
-# exclude-trivial-rebase: false
-# exclude-no-code-change: true
-# - draft-published-event
-# projects:
-# - project-compare-type: PLAIN
-# #project-pattern: '{project}'
-# project-pattern: 'onos'
-# branches:
-# - branch-compare-type: ANT
-# #branch-pattern: '**/{branch}'
-# branch-pattern: '**/master'
-# #file-paths: '{obj:gerrit_trigger_file_paths}'
-#
-#- project:
-# name: onos-validate-pipeline
-# build-timeout: '1800'
-# build-node: 'ubuntu16.04-basebuild-8c-15g'
-# project: 'onos'
-# project-name: 'onos'
-#
-# jobs:
-# - 'onos-validate-pipeline'
-#
-#
+
+- job:
+ branch: master
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+ stream: master
+ name: onos-validate-pipeline
+ project-type: pipeline
+ sandbox: false
+
+ parameters:
+ - lf-infra-parameters:
+ # TODO - this is a hack, figure out how to get these from defaults.yaml
+ project: 'onos'
+ stream: 'master'
+ branch: 'master'
+ lftools-version: '<1.0.0'
+
+ node: 'ubuntu16.04-basebuild-8c-15g'
+ concurrent: true
+
+ pipeline-scm:
+ script-path: tools/build/jenkins/onos-buck-gerrit
+ scm:
+ - lf-infra-gerrit-scm:
+ #git-url: '{git-url}'
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
+ refspec: '$GERRIT_REFSPEC'
+ branch: '$GERRIT_BRANCH'
+ #submodule-recursive: '{submodule-recursive}'
+ submodule-recursive: false
+ choosing-strategy: gerrit
+ #jenkins-ssh-credential: '{jenkins-ssh-credential}'
+ jenkins-ssh-credential: 'jenkins'
+ shallow-clone: true
+
+ triggers:
+ - gerrit:
+ #server-name: '{gerrit-server-name}'
+ server-name: 'ONOS Project Gerrit'
+ #trigger-on: '{obj:gerrit_verify_triggers}'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: true
+ exclude-trivial-rebase: false
+ exclude-no-code-change: true
+ - draft-published-event
+ projects:
+ - project-compare-type: PLAIN
+ #project-pattern: '{project}'
+ project-pattern: 'onos'
+ branches:
+ - branch-compare-type: ANT
+ #branch-pattern: '**/{branch}'
+ branch-pattern: '**/master'
+ #file-paths: '{obj:gerrit_trigger_file_paths}'
+
+- project:
+ name: onos-validate-pipeline
+ build-timeout: '1800'
+ build-node: 'ubuntu16.04-basebuild-8c-15g'
+ project: 'onos'
+ project-name: 'onos'
+
+ jobs:
+ - 'onos-validate-pipeline'