summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-02-13 11:35:19 -0500
committerTim Rozet <trozet@redhat.com>2018-02-13 11:35:19 -0500
commitfaae9af3ac454a90b3daa1b9e5b3ad22d71053f0 (patch)
tree2fa9cfda3c0593612d2d7ebf1f257887225930df
parentb805003cdccdaa1e7d416661676803114689f291 (diff)
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>
-rw-r--r--jjb/apex/apex-verify-jobs.yml2
-rw-r--r--jjb/apex/apex.yml1
-rw-r--r--jjb/apex/apex.yml.j21
3 files changed, 3 insertions, 1 deletions
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 421a3fa31..302932246 100644
--- 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 3f6b3e76a..7d7ddb168 100644
--- 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 b9cbd0240..72d9a6351 100644
--- 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