opendev/puppet-jenkins
Code Issues Proposed changes

Merge "Fetch tag refs from zuul in gerrit-git-prep"

Browse Source
This commit is contained in:
Jenkins
2014-03-30 23:23:18 +00:00
committed by Gerrit Code Review
parent 7215705e1d 6d1f079452
commit 73a9a23d76
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
files/slave_scripts/gerrit-git-prep.sh
View File

@@ -69,22 +69,24 @@ if ! git clean -x -f -d -q ; then
git clean -x -f -d -q
fi
if [ -z "$ZUUL_NEWREV" ]
if echo "$ZUUL_REF" | grep -q ^refs/tags/
then
git fetch --tags $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
git checkout $ZUUL_REF
git reset --hard $ZUUL_REF
elif [ -z "$ZUUL_NEWREV" ]
then
git fetch $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
git checkout FETCH_HEAD
git reset --hard FETCH_HEAD
if ! git clean -x -f -d -q ; then
sleep 1
git clean -x -f -d -q
fi
else
git checkout $ZUUL_NEWREV
git reset --hard $ZUUL_NEWREV
if ! git clean -x -f -d -q ; then
sleep 1
git clean -x -f -d -q
fi
fi
if ! git clean -x -f -d -q ; then
sleep 1
git clean -x -f -d -q
fi
if [ -f .gitmodules ]