opendev/system-config
Code Issues Proposed changes

Merge "Allow BRANCH instead of ZUUL_REF in ggp"

Browse Source
This commit is contained in:
Jenkins 2014-03-25 21:16:10 +00:00 committed by Gerrit Code Review
commit fa8c0d1a87
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/jenkins/files/slave_scripts/gerrit-git-prep.sh
View File

@ -24,8 +24,16 @@ fi
if [ -z "$ZUUL_REF" ] if [ -z "$ZUUL_REF" ]
then then
echo "This job may only be triggered by Zuul." if [ -n "$BRANCH" ]
exit 1 then
echo "No ZUUL_REF so using requested branch $BRANCH from origin."
ZUUL_REF=$BRANCH
# use the origin since zuul mergers have outdated branches
ZUUL_URL=$GIT_ORIGIN
else
echo "Provide either ZUUL_REF or BRANCH in the calling enviromnent."
exit 1
fi
fi fi
if [ ! -z "$ZUUL_CHANGE" ] if [ ! -z "$ZUUL_CHANGE" ]