openstack/project-config
Code Issues Proposed changes

Fix branch override in zuul-branch-git-prep

Browse Source 
Rather than overriding ZUUL_BRANCH (which should not be overidden)
set the --branch argument to zuul cloner, which is the z-c equivalent
of OVERRIDE_BRANCH.

Change-Id: Ie40b668a3a33943a0431047d18716329c1e440c0
This commit is contained in:
James E. Blair 2015-11-20 13:34:39 -08:00
parent da8c04f383
commit 8d343a812b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/macros.yaml
View File

@ -81,10 +81,10 @@
export ZUUL_REF=${{ZUUL_REF:-None}} export ZUUL_REF=${{ZUUL_REF:-None}}
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export ZUUL_BRANCH=$BRANCH_OVERRIDE BRANCH_ARG="--branch $BRANCH_OVERRIDE"
fi fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org $ZUUL_PROJECT $BRANCH_ARG git://git.openstack.org $ZUUL_PROJECT
- builder: - builder:
name: branch-git-prep name: branch-git-prep