Update jobs to use jjbuilder slave

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 55b7cbb09d601ba3a0468a7fb08c8d3781b35bd8..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,13 +66,14 @@
 
     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]'
 
@@ -134,6 +136,7 @@
 
 - job-template:
     name: 'builder-merge'
+    node: jjbuilder
 
     # builder-merge job to run JJB update
     #
@@ -193,6 +196,7 @@
 
 - job-template:
     name: 'builder-weekly'
+    node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     #
@@ -226,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: