Merge "fix doc-build.sh to support referring to other dirs"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7cdbed4..17d64d0 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -9,14 +9,6 @@
 - job-template:
     name: builder-verify-jjb
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -28,10 +20,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -55,12 +43,13 @@
                       pattern: jjb/**
                     - compare-type: ANT
                       pattern: jjb-templates/**
+                    - compare-type: ANT
+                      pattern: utils/**
 
 
     builders:
-        - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
-            jenkins-jobs test jjb/
+        - shell:
+            !include-raw verify-releng
 
 - job-template:
     name: 'builder-merge'
@@ -69,14 +58,6 @@
     #
     # This job's purpose is to update all the JJB
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -89,10 +70,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -108,6 +85,8 @@
                 file-paths:
                     - compare-type: ANT
                       pattern: jjb/**
+                    - compare-type: ANT
+                      pattern: utils/**
 
     builders:
         - shell: |