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:
parent
3ad3f8fa39
commit
b5aca74bd2
|
@ -404,12 +404,13 @@ function setup_project {
|
||||||
# It's there, so check it out.
|
# It's there, so check it out.
|
||||||
git_checkout_branch $project FETCH_HEAD
|
git_checkout_branch $project FETCH_HEAD
|
||||||
else
|
else
|
||||||
|
eol_tag=${base_branch#stable/}-eol
|
||||||
if git_has_branch $project $branch; then
|
if git_has_branch $project $branch; then
|
||||||
git_checkout_branch $project $branch
|
git_checkout_branch $project $branch
|
||||||
# NOTE(sambetts) If there is no stable/* branch try to checkout the
|
# NOTE(sambetts) If there is no stable/* branch try to checkout the
|
||||||
# *-eol tag for that version
|
# *-eol tag for that version
|
||||||
elif [[ "$branch" == stable/* ]] && git_has_tag $project "${branch#stable/}-eol"; then
|
elif [[ "$branch" == stable/* ]] && git_has_tag $project $eol_tag; then
|
||||||
git_checkout_tag $project $branch
|
git_checkout_tag $project $eol_tag
|
||||||
else
|
else
|
||||||
git_checkout_branch $project master
|
git_checkout_branch $project master
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue