From 64fefb3f395f23f7f5878f6e24ced168d54bd7e4 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 26 May 2017 14:12:50 -0400 Subject: [PATCH] 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 --- jjb/apex/apex.yml | 4 +++- jjb/apex/apex.yml.j2 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 87aa763f1..05e9da8c6 100644 --- 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 3bebf85a1..26d7b46f0 100644 --- 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' -- 2.16.6