Update grenade settings for stable/rocky
Depends-On: https://review.openstack.org/600196/ Change-Id: I940a705d4b8269fbf3bec9f107f179e9191b5a42
This commit is contained in:
parent
d2bd6faf5e
commit
bc9c5d5b4c
|
@ -313,6 +313,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
|
|||
export GRENADE_NEW_BRANCH="stable/queens"
|
||||
elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
|
||||
export GRENADE_OLD_BRANCH="stable/queens"
|
||||
export GRENADE_NEW_BRANCH="stable/rocky"
|
||||
elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
|
||||
export GRENADE_OLD_BRANCH="stable/rocky"
|
||||
export GRENADE_NEW_BRANCH="$GIT_BRANCH"
|
||||
fi
|
||||
;;
|
||||
|
@ -338,8 +341,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
|
|||
elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
|
||||
export GRENADE_OLD_BRANCH="stable/pike"
|
||||
export GRENADE_NEW_BRANCH="stable/queens"
|
||||
else # master
|
||||
elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
|
||||
export GRENADE_OLD_BRANCH="stable/queens"
|
||||
export GRENADE_NEW_BRANCH="stable/rocky"
|
||||
else # master
|
||||
export GRENADE_OLD_BRANCH="stable/rocky"
|
||||
export GRENADE_NEW_BRANCH="$GIT_BRANCH"
|
||||
fi
|
||||
;;
|
||||
|
|
Loading…
Reference in New Issue