X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=2adbc8d251e7cf13b65cd66a553f91f09ebd2d1f;hb=965e106adb68e4f9965c65a3ce6a83cfda7a123e;hp=b2e748a28c827aea9b4e3fac50d99439739f2da4;hpb=263eba1029d68dd735cbfa46180638589b0255ee;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index b2e748a28..2adbc8d25 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -15,14 +15,15 @@
 
 - job-template:
     name: builder-verify-jjb
+    node: jjbuilder
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+        artifactNumToKeep: 5
 
     parameters:
         - project-parameter:
@@ -65,23 +66,25 @@
 
     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]'
 
 - job-template:
     name: builder-verify-python
+    node: dynamic_verify
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
@@ -126,6 +129,11 @@
 
     builders:
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
+            pip freeze
+            pip install flake8
             flake8 scripts/
 
     publishers:
@@ -134,6 +142,7 @@
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -142,10 +151,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -184,7 +193,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-jjb-update.sh
+            !include-raw-escape:
+                - include-raw-jjb-update.sh
 
     publishers:
         - email-notification:
@@ -192,6 +202,8 @@
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
+    node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     #
@@ -201,10 +213,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -225,8 +237,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:
@@ -254,7 +265,8 @@
 
     builders:
         - shell:
-            !include-raw-escape include-raw-check-poms.sh
+            !include-raw-escape:
+                - include-raw-check-poms.sh
 
     publishers:
         - email-notification:
@@ -277,7 +289,7 @@
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1