openstack/devstack-gate
Code Issues Proposed changes

update grenade branches

Browse Source 
make it possible to run grenade from stable/icehouse -> master

Change-Id: If46d1624e0b35a37d5dfb043edb513fc04b6ea68
This commit is contained in:
Sean Dague
2014-04-17 15:51:13 -04:00
parent f2f60e31f1
commit 1ab574df7c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="stable/icehouse"
else # master
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_NEW_BRANCH="master"
fi
if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then
@@ -213,6 +213,9 @@ elif [ "$DEVSTACK_GATE_GRENADE_FORWARD" -eq "1" ]; then
export DEVSTACK_GATE_TEMPEST=1
if [ "$ZUUL_BRANCH" == "stable/havana" ]; then
export GRENADE_OLD_BRANCH="stable/havana"
export GRENADE_NEW_BRANCH="stable/icehouse"
elif [ "$ZUUL_BRANCH" == "stable/icehouse" ]; then
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_NEW_BRANCH="master"
fi
fi