openstack/project-config
Code Issues Proposed changes

Fix branch check for proposal script

Browse Source 
We no longer have remote branches in our git clones, just check for the
proper local branch to exist.

Change-Id: I43b9f10c3b41c6cb3eb215d6d4552f2205e76012
This commit is contained in:
Jens Harbott
2017-10-20 09:43:43 +00:00
parent eb13c03083
commit 4eeb97c278
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/scripts/propose_update.sh
View File

@@ -122,9 +122,9 @@ for PROJECT in $PROJECTS; do
fi
pushd $PROJECT_DIR
# check whether the project has this branch or a suitable fallback
# check whether the project has this branch
BRANCH=""
if git branch -a | grep -q "^ remotes/origin/$ZUUL_REFNAME$" ; then
if git branch | grep -q "^ $ZUUL_REFNAME$" ; then
BRANCH=$ZUUL_REFNAME
fi