Update jobs to use jjbuilder slave

- Set build slave to jjbuilder
- Explicitly set --recursive via cli since puppet config is not
  currently setting this option.
- Remove virtualenv since jjbuilder is using official packaged JJB

Change-Id: Id6cf9dd3b9f989eae2cfd7699f60486ee03d94aa
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/include-raw-jjb-update.sh b/jjb/include-raw-jjb-update.sh
index 0aa0c669a9f9f64de7de4eedb5276b83f7e585ff..84a91cb90b2d41991fe19671ae88234d84a38603 100644 (file)
--- a/jjb/include-raw-jjb-update.sh
+++ b/jjb/include-raw-jjb-update.sh
@@ -1,5 +1,4 @@
-source /opt/virtualenv/jenkins-job-builder/bin/activate
-jenkins-jobs update --delete-old jjb/
+jenkins-jobs update --recursive --delete-old jjb/
 
 # Submit patches for any jobs that can be auto updated
 function submitJJB {

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 9d832311c983e69a7d0b50bfab9d85fbce75cf78..911ea271c67ff910ebe01fcbfa82a2f28fa13905 100644 (file)
--- 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,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:
@@ -136,6 +136,7 @@
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -195,6 +196,7 @@
 
 - job-template:
     name: 'builder-weekly'
+    node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     #
@@ -228,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: