openstack
/
devstack-gate
Code Issues Proposed changes

Merge "Fix setup_project checking out eol with branch name"

This commit is contained in:
Zuul 2018-01-03 23:19:54 +00:00 committed by Gerrit Code Review
parent 778884e5b7 b5aca74bd2
commit 2577d6e170
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
functions.sh
View File

@ -404,12 +404,13 @@ function setup_project {
# It's there, so check it out.
git_checkout_branch $project FETCH_HEAD
else
eol_tag=${base_branch#stable/}-eol
if git_has_branch $project $branch; then
git_checkout_branch $project $branch
# NOTE(sambetts) If there is no stable/* branch try to checkout the
# *-eol tag for that version
elif [[ "$branch" == stable/* ]] && git_has_tag $project "${branch#stable/}-eol"; then
git_checkout_tag $project $branch
elif [[ "$branch" == stable/* ]] && git_has_tag $project $eol_tag; then
git_checkout_tag $project $eol_tag
else
git_checkout_branch $project master
fi