openstack
/
devstack-gate
Code Issues Proposed changes

Fix setup_project checking out eol with branch name 

A recent change to devstack-gate to enable falling back to EOL tags for
zuulv2 has a bug in it where it will try to checkout the stable/branch
instead of the converted eol tag. This patch addresses that issue.

Change-Id: I23330884da09befc3bca10973cbfd2ea9b666430
This commit is contained in:
Sam Betts 2017-11-29 16:28:02 +00:00
parent 3ad3f8fa39
commit b5aca74bd2
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