Fix bug in builder-merge

[releng.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index fe8f50f..a2f597b 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -9,6 +9,8 @@
 - job-template:
     name: builder-verify-jjb
 
+    node: master
+
     project-type: freestyle
 
     logrotate:
@@ -17,7 +19,11 @@
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
-
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -38,6 +44,8 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'releng'
@@ -49,16 +57,22 @@
                       pattern: jjb/**
                     - compare-type: ANT
                       pattern: jjb-templates/**
+                forbidden-file-paths:
+                    - compare-type: ANT
+                      pattern: utils/**
+                    - compare-type: ANT
+                      pattern: docs/**
 
 
     builders:
-        - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs test /opt/jenkins-ci/builder/
+        - shell:
+            !include-raw verify-releng
 
 - job-template:
     name: 'builder-merge'
 
+    node: master
+
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
@@ -102,9 +116,16 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
+                    - compare-type: ANT
+                      pattern: utils/**
+                forbidden-file-paths:
+                    - compare-type: ANT
+                      pattern: docs/**
 
     builders:
         - shell: |
                 source /opt/virtualenv/jenkins-job-builder/bin/activate
+                cd /opt/jenkins-ci/releng
+                git pull
                 jenkins-jobs update --delete-old jjb/