Do not run packer merge jobs concurrently

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 3dee9fae6b2906e8467df96f93fbf3a93b50bcc1..5c670819831d8f96f6755292ecc7789a62bc7e70 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -62,7 +62,8 @@
 
 - job-template:
     name: builder-verify-jjb
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
+    concurrent: true
 
     project-type: freestyle
 
@@ -94,11 +95,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
 
@@ -114,6 +119,7 @@
 - job-template:
     name: builder-verify-python
     node: centos7-java-builder-2c-4g
+    concurrent: true
 
     project-type: freestyle
 
@@ -163,7 +169,7 @@
 
 - job-template:
     name: 'builder-merge'
-    node: jjbuilder
+    node: centos7-java-builder-2c-4g
 
     # builder-merge job to run JJB update
     #
@@ -209,8 +215,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 +235,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 +267,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:
@@ -423,7 +440,6 @@
     name: 'builder-merge-packer-{platforms}-{templates}'
     project-type: freestyle
     node: centos7-java-builder-2c-4g
-    concurrent: true
 
     properties:
         - opendaylight-infra-properties: