Merge "Update grenade settings for stable/queens"

This commit is contained in:
Zuul 2018-02-15 18:07:16 +00:00 committed by Gerrit Code Review
commit 2b26488e9d
1 changed files with 7 additions and 1 deletions

View File

@ -311,6 +311,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
export GRENADE_NEW_BRANCH="stable/pike"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/pike" ]]; then
export GRENADE_OLD_BRANCH="stable/pike"
export GRENADE_NEW_BRANCH="stable/queens"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
export GRENADE_OLD_BRANCH="stable/queens"
export GRENADE_NEW_BRANCH="$GIT_BRANCH"
fi
;;
@ -333,8 +336,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
elif [[ "$GRENADE_BASE_BRANCH" == "stable/pike" ]]; then
export GRENADE_OLD_BRANCH="stable/ocata"
export GRENADE_NEW_BRANCH="stable/pike"
else # master
elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
export GRENADE_OLD_BRANCH="stable/pike"
export GRENADE_NEW_BRANCH="stable/queens"
else # master
export GRENADE_OLD_BRANCH="stable/queens"
export GRENADE_NEW_BRANCH="$GIT_BRANCH"
fi
;;