opendev/system-config
Code Issues Proposed changes

Fix Savanna d-g jobs

Browse Source 
DEVSTACK_GATE_SAVANNA env var that was defined in devstack-vm-gate-wrap.sh
should be used instead of DEVSTACK_SAVANNA to enable Savanna in d-g jobs.

Change-Id: I9e4596f277476a9972755a2ca01c12a59e902dcc
This commit is contained in:
Sergey Lukjanov 2013-12-05 21:19:59 +04:00
parent f39c92d22b
commit 5618aa7e94
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml
View File

@ -382,7 +382,7 @@
export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_POSTGRES=1 export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_SAVANNA=1 export DEVSTACK_GATE_SAVANNA=1
export ZUUL_BRANCH={branch-override} export ZUUL_BRANCH={branch-override}
unset ZUUL_PROJECT unset ZUUL_PROJECT
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@ -414,7 +414,7 @@
export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_SMOKE_SERIAL=1 export DEVSTACK_GATE_SMOKE_SERIAL=1
export DEVSTACK_SAVANNA=1 export DEVSTACK_GATE_SAVANNA=1
export ZUUL_BRANCH={branch-override} export ZUUL_BRANCH={branch-override}
unset ZUUL_PROJECT unset ZUUL_PROJECT
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

2
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -565,7 +565,7 @@
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_SAVANNA=1 export DEVSTACK_GATE_SAVANNA=1
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export ZUUL_BRANCH=$BRANCH_OVERRIDE export ZUUL_BRANCH=$BRANCH_OVERRIDE