Apex: variablize concurrent builds per node

only master branch supports more than 1 build per node at a time

Change-Id: I4e4b105cda5ff4f870917abd62660c64a4b535ee
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 87aa763..05e9da8 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -26,6 +26,7 @@
             virtual-slave: 'apex-virtual-master'
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
+            concurrent-builds: 3
 
         - danube:
             branch: 'stable/danube'
@@ -34,6 +35,7 @@
             virtual-slave: 'apex-virtual-danube'
             baremetal-slave: 'apex-baremetal-danube'
             verify-scenario: 'os-odl_l3-nofeature-ha'
+            concurrent-builds: 1
             disabled: false
 
     platform:
@@ -428,7 +430,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 3
+            max-per-node: {concurrent-builds}
             max-total: 10
             option: 'project'
 

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 3bebf85..26d7b46 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -26,6 +26,7 @@
             virtual-slave: 'apex-virtual-master'
             baremetal-slave: 'apex-baremetal-master'
             verify-scenario: 'os-odl-nofeature-ha'
+            concurrent-builds: 3
 
         - danube:
             branch: 'stable/danube'
@@ -34,6 +35,7 @@
             virtual-slave: 'apex-virtual-danube'
             baremetal-slave: 'apex-baremetal-danube'
             verify-scenario: 'os-odl_l3-nofeature-ha'
+            concurrent-builds: 1
             disabled: false
 
     platform:
@@ -428,7 +430,7 @@
     properties:
         - logrotate-default
         - throttle:
-            max-per-node: 3
+            max-per-node: {concurrent-builds}
             max-total: 10
             option: 'project'