openstack/zaqar
Code Issues Proposed changes

Enable swift in the gate hook

Browse Source 
This should let the swift gate run.

Change-Id: I9e3eaf3792e2a35e33184d61bac0ba8e562e426c
This commit is contained in:
Thomas Herve 2017-01-31 09:53:47 +01:00
parent cdb3c044da
commit 90dedeefbb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/gate/gate_hook.sh
View File

@ -14,7 +14,7 @@
# This script is executed inside gate_hook function in devstack gate. # This script is executed inside gate_hook function in devstack gate.
ENABLED_SERVICES="mysql,key,tempest,zaqar-websocket,zaqar-wsgi" OVERRIDE_ENABLED_SERVICES="mysql,key,tempest,zaqar-websocket,zaqar-wsgi"
export DEVSTACK_GATE_ZAQAR=1 export DEVSTACK_GATE_ZAQAR=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1
@ -28,9 +28,12 @@ export DEVSTACK_GATE_ZAQAR_TEST_SUITE=$1
# NOTE(flaper87): Backwards compatibility until `project-config`'s # NOTE(flaper87): Backwards compatibility until `project-config`'s
# patch lands. # patch lands.
export DEVSTACK_GATE_ZAQAR_BACKEND=${2:-$DEVSTACK_GATE_ZAQAR_TEST_SUITE} export DEVSTACK_GATE_ZAQAR_BACKEND=${2:-$DEVSTACK_GATE_ZAQAR_TEST_SUITE}
if [ "$DEVSTACK_GATE_ZAQAR_BACKEND" == "swift" ]; then
OVERRIDE_ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
fi
export DEVSTACK_LOCAL_CONFIG+=$" export DEVSTACK_LOCAL_CONFIG+=$"
export ZAQAR_BACKEND=$DEVSTACK_GATE_ZAQAR_BACKEND" export ZAQAR_BACKEND=$DEVSTACK_GATE_ZAQAR_BACKEND"
export ENABLED_SERVICES export OVERRIDE_ENABLED_SERVICES
function run_devstack_gate() { function run_devstack_gate() {
$BASE/new/devstack-gate/devstack-vm-gate.sh $BASE/new/devstack-gate/devstack-vm-gate.sh