Merge "Gnocchi: Fix gate stable jobs"

This commit is contained in:
Jenkins 2016-04-14 19:53:15 +00:00 committed by Gerrit Code Review
commit fcfc9b16a3
2 changed files with 3 additions and 2 deletions

@ -208,12 +208,13 @@
case "$ZUUL_BRANCH" in
"stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;;
"stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
"stable/2.0") export OVERRIDE_ZUUL_BRANCH=master ;;
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mikita ;;
esac
else
case "$ZUUL_BRANCH" in
"stable/kilo") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.2";;
"stable/liberty") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.3";;
"stable/mikita") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1";;
esac
fi

@ -20,7 +20,7 @@
case "$ZUUL_BRANCH" in
"stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;;
"stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;;
"stable/2.0") export OVERRIDE_ZUUL_BRANCH=master ;;
"stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mikita ;;
esac
function gate_hook {{