openstack/devstack-gate
Code Issues Proposed changes

Merge "Remove stable/grizzly provisions and workarounds"

Browse Source
This commit is contained in:
Jenkins
2014-03-30 03:08:43 +00:00
committed by Gerrit Code Review
parent 417a9ad9ac 12b0527fe8
commit 96c81a7b4e
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
devstack-vm-gate-wrap.sh
View File

@@ -183,9 +183,9 @@ export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}}
# for a stable branch we want to both try to upgrade forward n => n+1 as
# well as upgrade from last n-1 => n.
#
# i.e. stable/havana:
# DGG=1 means stable/grizzly => stable/havana
# DGGF=1 means stable/havana => master (or stable/icehouse if that's out)
# i.e. stable/icehouse:
# DGG=1 means stable/havana => stable/icehouse
# DGGF=1 means stable/icehouse => master (or stable/juno if that's out)
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}
export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0}
# DGGPN=1 means upgrade everything but n-cpu.
@@ -193,10 +193,7 @@ export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=${DEVSTACK_GATE_GRENADE_PARTIAL_NCPU:-
if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export DEVSTACK_GATE_TEMPEST=1
if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
export GRENADE_OLD_BRANCH="stable/grizzly"
export GRENADE_NEW_BRANCH="stable/havana"
elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
if [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="stable/icehouse"
else # master
@@ -211,10 +208,7 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
# the roll forward case
elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
export DEVSTACK_GATE_TEMPEST=1
if [ "$ZUUL_BRANCH" == "stable/grizzly" ]; then
export GRENADE_OLD_BRANCH="stable/grizzly"
export GRENADE_NEW_BRANCH="stable/havana"
elif [ "$ZUUL_BRANCH" == "stable/havana" ]; then
if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="master"
fi

17
devstack-vm-gate.sh
View File

@@ -50,19 +50,7 @@ function setup_localrc() {
# the exercises we *don't* want to test on for devstack
SKIP_EXERCISES=boot_from_volume,bundle,client-env,euca
if [ "$LOCALRC_BRANCH" == "stable/grizzly" ]; then
SKIP_EXERCISES=${SKIP_EXERCISES},swift,client-args
if [ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta
echo "Q_USE_DEBUG_COMMAND=True" >>localrc
echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
else
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
fi
if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
fi
elif [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
if [ "$LOCALRC_BRANCH" == "stable/havana" ]; then
MY_ENABLED_SERVICES+=,c-bak
# we don't want to enable services for grenade that don't have upgrade support
# otherwise they can break grenade, especially when they are projects like
@@ -370,8 +358,7 @@ if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
res=$?
fi
if [[ "$GRENADE_OLD_BRANCH" != "stable/grizzly" ]] && \
[[ "$DEVSTACK_GATE_TEMPEST_STRESS" -ne "1" ]] ; then
if [[ "$DEVSTACK_GATE_TEMPEST_STRESS" -ne "1" ]] ; then
tools/check_logs.py -d $BASE/new/screen-logs
res2=$?
fi