X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=911ea271c67ff910ebe01fcbfa82a2f28fa13905;hb=eb9514ba6a8622910ac4feda7e69f8ed78ecc651;hp=ff084abc2ec21bddde80d6479a92ef6040881a5d;hpb=c6aa8ac5aad906d18aa9ff9a6b1621d94fc3f2e6;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ff084abc2..911ea271c 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,6 +15,7 @@
 
 - job-template:
     name: builder-verify-jjb
+    node: jjbuilder
 
     project-type: freestyle
 
@@ -65,12 +66,14 @@
 
     builders:
         - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
+            pip freeze
             python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test jjb/
+            jenkins-jobs test --recursive -o job_output jjb/
         - releng-check-unicode
 
     publishers:
+        - archive-artifacts:
+            artifacts: 'job_output/*'
         - email-notification:
             email-prefix: '[releng]'
 
@@ -133,6 +136,7 @@
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -183,7 +187,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+            !include-raw-escape:
+                - include-raw-jjb-update.sh
 
     publishers:
         - email-notification:
@@ -191,6 +196,7 @@
 
 - job-template:
     name: 'builder-weekly'
+    node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     #
@@ -224,8 +230,7 @@
 
     builders:
         - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs --flush-cache update jjb/
+            jenkins-jobs --flush-cache update --recursive jjb/
 
     publishers:
         - email-notification:
@@ -233,6 +238,7 @@
 
 - job-template:
     name: builder-check-poms
+    node: dynamic_verify
 
     project-type: freestyle
 
@@ -252,7 +258,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-check-poms.sh
+            !include-raw-escape:
+                - include-raw-check-poms.sh
 
     publishers:
         - email-notification:
@@ -282,11 +289,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
 
     scm:
-        - git-scm:
+        - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            branch: 'master'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
@@ -294,16 +304,30 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - reverse:
-            jobs: 'builder-merge'
-            result: 'success'
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'republish'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'releng/builder'
+                branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/master'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: src/**
+                    - compare-type: ANT
+                      pattern: pom.xml
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
         goals: 'site:site site:deploy -Dstream=master'
         maven-opts: '-Xmx1024m'
-        settings: '{autorelease-settings}'
+        settings: '{releng-builder-settings}'
         global-settings: '{odl-global-settings}'
 
     publishers: