Remove folsom-specific logic
No testing is done on OpenStack Folsom any longer, so we can clean up devstack-gate scripts accordingly. * devstack-vm-gate-dev.sh * devstack-vm-gate-wrap.sh * devstack-vm-gate.sh: Remove conditionals and variables relevant only to stable/folsom testing. Change-Id: I4e09c241920fb1c35138d6f34fc889b10926a0e6
This commit is contained in:
parent
bf104e1478
commit
17758d8390
|
@ -17,7 +17,6 @@ export BUILD_NUMBER=42
|
|||
export GERRIT_CHANGE_NUMBER=1234
|
||||
export GERRIT_PATCHSET_NUMBER=1
|
||||
export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
|
||||
export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0}
|
||||
export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
|
||||
export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0}
|
||||
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-""}
|
||||
|
|
|
@ -439,8 +439,6 @@ export DEVSTACK_GATE_TEMPEST_LARGE_OPS=${DEVSTACK_GATE_TEMPEST_LARGE_OPS:-0}
|
|||
# for tempest will be the one chosen by devstack.
|
||||
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=${DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION:-0}
|
||||
|
||||
export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0}
|
||||
|
||||
# Set to 1 to enable Cinder secure delete.
|
||||
# False by default to avoid dd problems on Precise.
|
||||
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1023755
|
||||
|
@ -465,13 +463,7 @@ export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
|
|||
|
||||
if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
|
||||
export DEVSTACK_GATE_EXERCISES=1
|
||||
if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
|
||||
# Set to 1 to run cinder instead of nova volume
|
||||
# Only applicable to stable/folsom branch
|
||||
export DEVSTACK_GATE_CINDER=1
|
||||
export GRENADE_OLD_BRANCH="stable/folsom"
|
||||
export GRENADE_NEW_BRANCH="stable/grizzly"
|
||||
elif [ "$ZUUL_BRANCH" == "stable/havana" ]; then
|
||||
if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
|
||||
export GRENADE_OLD_BRANCH="stable/grizzly"
|
||||
export GRENADE_NEW_BRANCH="stable/havana"
|
||||
export DEVSTACK_GATE_TEMPEST=1
|
||||
|
|
|
@ -46,14 +46,7 @@ function setup_localrc() {
|
|||
|
||||
SKIP_EXERCISES=boot_from_volume,client-env
|
||||
|
||||
if [ "$LOCALRC_BRANCH" == "stable/folsom" ]; then
|
||||
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net,swift
|
||||
if [ "$DEVSTACK_GATE_CINDER" -eq "1" ]; then
|
||||
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,cinder,c-api,c-vol,c-sch
|
||||
else
|
||||
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-vol
|
||||
fi
|
||||
elif [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
|
||||
if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
|
||||
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond
|
||||
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
|
||||
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
|
||||
|
@ -309,8 +302,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
|
|||
res=$?
|
||||
fi
|
||||
|
||||
if [[ "$LOCALRC_BRANCH" == "stable/folsom" ]] || \
|
||||
[[ "$LOCALRC_BRANCH" == "stable/grizzly" ]] || \
|
||||
if [[ "$LOCALRC_BRANCH" == "stable/grizzly" ]] || \
|
||||
[[ "$DEVSTACK_GATE_TEMPEST_STRESS" -eq "1" ]] || \
|
||||
[[ "$res" -ne "0" ]] ; then
|
||||
exit $res
|
||||
|
|
Loading…
Reference in New Issue