Move builder jobs to run on minion nodes

Change-Id: Ib57332e3f77df7f0645f891ed885a07ff61a6a62
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3dee9fae6b2906e8467df96f93fbf3a93b50bcc1..a74855eeefaf92c32346ae6f63048ecb8bf8f36e 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -62,7 +62,7 @@
 
 - job-template:
     name: builder-verify-jjb
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     project-type: freestyle
 
@@ -94,11 +94,15 @@
             files: 'jjb/**'
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
             pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs -l DEBUG test --recursive -o archives/job_output jjb/
             gzip archives/job_output/*
-
         - releng-check-unicode
         - verify-gpg-signature
 
@@ -163,7 +167,7 @@
 
 - job-template:
     name: 'builder-merge'
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     # builder-merge job to run JJB update
     #
@@ -209,8 +213,13 @@
                       pattern: jjb/**
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
             pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs --version
             jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
@@ -224,7 +233,7 @@
 - job-template:
     name: 'builder-weekly'
     disabled: false
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     # builder-weekly job to run JJB update weekly
     #
@@ -256,7 +265,13 @@
         - timed: 'H H * * 0'
 
     builders:
+        - opendaylight-infra-jjbini
         - shell: |
+            virtualenv $WORKSPACE/venv
+            source $WORKSPACE/venv/bin/activate
+            pip install --upgrade pip
+            pip freeze
+            pip install jenkins-job-builder
             jenkins-jobs --flush-cache update --recursive --workers 4 jjb/
 
     publishers:

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 673bb17e8cb5d98a8bf681b123ed0532ac0e0517..c068143a63e5ce4714bea11be611928195157315 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -498,3 +498,11 @@
     name: verify-gpg-signature
     builders:
         - shell: !include-raw: include-raw-verify-gpg-signatures.sh
+
+- builder:
+    name: opendaylight-infra-jjbini
+    builders:
+    - config-file-provider:
+          files:
+            - file-id: 'jjbini'
+              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'