Pass branch-override on jobs missing it

* .../files/jenkins_job_builder/config/devstack-gate.yaml: Pass the
branch-override parameter into the BRANCH_OVERRIDE envvar for
periodic-tempest-dsvm-all-.*, periodic-tempest-dsvm-coverage-.* and
periodic-tempest-dsvm-stress-.* jobs. Without this, devstack-gate
passes $BASE/new into the setup_workspace base_branch because
there's no ZUUL_BRANCH for periodic-trigger jobs. That leaves the
positional DEST argument empty and results in devstack-gate not
getting properly set up, leaving jobs to fail with a no such file or
directory error when trying to move past the setup phase.

Change-Id: I51bffcc529585cdb86876ad092eeb7353e231db9
This commit is contained in:
Jeremy Stanley 2014-03-14 13:16:16 +00:00
parent c66446aa33
commit 02915a211d

View File

@ -922,6 +922,7 @@
export DEVSTACK_GATE_TIMEOUT=180
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
@ -952,6 +953,7 @@
export DEVSTACK_GATE_TIMEOUT=180
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_COVERAGE=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
@ -982,6 +984,7 @@
export DEVSTACK_GATE_TIMEOUT=180
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_STRESS=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi