openstack/project-config
Code Issues Proposed changes

Merge "gnocchi: fix var for setting the Gnocchi branch"

Browse Source
This commit is contained in:
Jenkins 2016-06-29 07:28:36 +00:00 committed by Gerrit Code Review
commit 02456d0d9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/gnocchi.yaml
View File

@ -74,17 +74,17 @@
fi
case "{oldbranch}" in
"1.x") export GRENADE_OLD_BRANCH=stable/1.3;;
"1.x") export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/1.3;;
"2.x")
STABLE_BRANCH=${{ZUUL_BRANCH#stable/}}
if [ "${{STABLE_BRANCH}}" != "${{ZUUL_BRANCH}}" ]; then
# We are on stable branch
MAJOR=${{STABLE_BRANCH%.?}}
MINOR=${{STABLE_BRANCH#?.}}
export GRENADE_OLD_BRANCH=stable/${{MAJOR}}.$((MINOR - 1))
export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/${{MAJOR}}.$((MINOR - 1))
else
# We are on master
export GRENADE_OLD_BRANCH=stable/2.1
export OVERRIDE_GNOCCHI_PROJECT_BRANCH=stable/2.1
fi
;;
esac