openstack/devstack-gate
Code Issues Proposed changes

Remove diablo/essex conditionals.

Browse Source 
The stable/diablo and stable/essex branches are closed.  Clean up
custom logic for those branches.

Change-Id: I54cd2a273e62d92a4cc5436481e96764226fa7a4
This commit is contained in:
James E. Blair
2013-05-06 09:23:05 -07:00
parent cb8508b148
commit e9edaa3a21
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
devstack-vm-gate.sh
View File

@@ -46,11 +46,7 @@ function setup_localrc() {
SKIP_EXERCISES=boot_from_volume,client-env
if [ "$LOCALRC_BRANCH" == "stable/diablo" ] ||
[ "$LOCALRC_BRANCH" == "stable/essex" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-vol,n-net
SKIP_EXERCISES=$SKIP_EXERCISES,swift
elif [ "$LOCALRC_BRANCH" == "stable/folsom" ]; then
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
@@ -154,11 +150,6 @@ EOF
fi
}
if [ "$ZUUL_BRANCH" == "stable/diablo" ]; then
export DEVSTACK_GATE_TEMPEST=0
fi
if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
cd $BASE/old/devstack
setup_localrc "old" "$GRENADE_OLD_BRANCH"