From faae9af3ac454a90b3daa1b9e5b3ad22d71053f0 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 13 Feb 2018 11:35:19 -0500 Subject: [PATCH] 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 --- jjb/apex/apex-verify-jobs.yml | 2 +- jjb/apex/apex.yml | 1 + jjb/apex/apex.yml.j2 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 -- 2.16.6