Fixes load-balancing jobs for virtual verify

Issue where apex-virtual-master label node was being passed from verify
job to deploy/functest.  We allow multiple verify jobs to kick off on
virtual slaves, but then passing the host down to the deploy/functest
jobs causes the deploy/functest only run 1 job at a time on the same
node, rather than running 2 jobs at a time, one on each slave.

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

diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 2a7e0d3..c57ac1d 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -237,7 +237,7 @@
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
+              node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 4228734..1c04260 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -321,6 +321,8 @@
 - job-template:
     name: 'apex-virtual-{stream}'
 
+    node: 'apex-virtual-master'
+
     project-type: 'multijob'
 
     disabled: false

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index bc8341e..900002c 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -189,6 +189,8 @@
 - job-template:
     name: 'apex-virtual-{stream}'
 
+    node: 'apex-virtual-master'
+
     project-type: 'multijob'
 
     disabled: false