From: Tim Rozet Date: Wed, 7 Feb 2018 21:33:50 +0000 (-0500) Subject: Apex: Fixes scheduling with apex verify X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F51871%2F1;p=releng.git Apex: Fixes scheduling with apex verify apex-verify job calls apex-virtual to deploy and run functest. Apex has 2 virtual slaves attached to the apex-virtual-master label. When 2 verify jobs are triggered at the same time, apex-verify job is scheduled on each slave correctly. However, when the mulitjob triggers apex-virtual jobs, it only schedules both of them to a single slave. This happens even though apex-virtual job has the same slave label and node parameters are not passed from verify job. This patch changes the node to be passed to apex-virtual from apex-verify. That way 2 nodes will be scheduled on, but this is still not ideal scheduling as more than 1 verify can run per node (but not more than one virtual job). Change-Id: I155351c9037f70df2c5dba11bb5592423849e760 Signed-off-by: Tim Rozet --- diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 88c1b1765..111d0c18b 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -239,7 +239,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false + node-parameters: true kill-phase-on: FAILURE abort-all-job: true git-revision: true