openstack/devstack-gate
Code Issues Proposed changes

Extract git_fetch_at_ref

Browse Source 
The really dense logic in the zuulification of trees is actually
hard to understand. Extracting it into a common function makes
this much easier to understand the AND and OR logic of it.

Change-Id: I96f94da8901cd94772d1910d39b48270a45f73e6
This commit is contained in:
Sean Dague
2013-11-01 17:30:05 -04:00
parent 06cf6ace70
commit 6bbc02fc42
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
devstack-vm-gate-wrap.sh
View File

@@ -26,6 +26,19 @@ function function_exists {
type $1 2>/dev/null | grep -q 'is a function'
}
# Attempt to fetch a git ref for a project, if that ref is not empty
function git_fetch_at_ref {
local project=$1
local ref=$2
if [ "$ref" != "" ]; then
git fetch $ZUUL_URL/$project $ref
return $?
else
# return failing
return 1
fi
}
function git_checkout {
local branch=$1
local reset_branch=$branch
@@ -125,13 +138,11 @@ function setup_project {
# See if we should check out a Zuul ref
if [ "$ZUUL_BRANCH" == "$branch" ]; then
# See if Zuul prepared a ref for this project
if { [ "$OVERRIDE_ZUUL_REF" != "" ] && \
git fetch $ZUUL_URL/$project $OVERRIDE_ZUUL_REF ; } || \
{ [ "$ZUUL_REF" != "" ] && \
git fetch $ZUUL_URL/$project $ZUUL_REF ; } || \
{ [ "$FALLBACK_ZUUL_REF" != "" ] && \
git fetch $ZUUL_URL/$project $FALLBACK_ZUUL_REF ; }; then
# It's there, so check it out.
if git_fetch_at_ref $project $OVERRIDE_ZUUL_REF || \
git_fetch_at_ref $project $ZUUL_REF || \
git_fetch_at_ref $project $FALLBACK_ZUUL_REF; then
# It's there, so check it out.
git_checkout FETCH_HEAD
else
if [ "$project" == "$ZUUL_PROJECT" ]; then