X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=2adbc8d251e7cf13b65cd66a553f91f09ebd2d1f;hb=09703942f85f4df7aa90b8cf5fab213f6e857c8a;hp=9d832311c983e69a7d0b50bfab9d85fbce75cf78;hpb=fba4d551f7a94f45e5f41345784cb36cedb7980a;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 9d832311c..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,10 +66,9 @@
 
     builders:
         - shell: |
-            source /opt/virtualenv/jenkins-job-builder/bin/activate
             pip freeze
             python scripts/jjb-autoupdate-project.py
-            jenkins-jobs test -o job_output jjb/
+            jenkins-jobs test --recursive -o job_output jjb/
         - releng-check-unicode
 
     publishers:
@@ -79,11 +79,12 @@
 
 - job-template:
     name: builder-verify-python
+    node: dynamic_verify
 
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
@@ -128,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:
@@ -136,6 +142,7 @@
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -144,10 +151,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -195,6 +202,8 @@
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
+    node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     #
@@ -204,10 +213,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -228,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:
@@ -281,7 +289,7 @@
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1