Apex: Attempt to fix apex-virtual parallel execution

Remove passing node params and enable global queue scanning.  Hopefully
this will allow 2 apex-virtual jobs to run at the same time (1 per each
slave).

Change-Id: I310dbc477e267c302d50599bab2a933ce988dba7
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 421a3fa..3029322 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -238,7 +238,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 3f6b3e7..7d7ddb1 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -344,6 +344,7 @@
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
+          queue-scannning: 'ALL'
       - throttle:
           max-per-node: 1
           max-total: 10

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index b9cbd02..72d9a63 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -222,6 +222,7 @@
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
+          queue-scannning: 'ALL'
       - throttle:
           max-per-node: 1
           max-total: 10