opendev/system-config
Code Issues Proposed changes

Use ZUUL_URL in ggp

Browse Source 
Makes ggp more generally useful and needed to support multiple
Zuul mergers.

Change-Id: I3c6989f6a710bc124f55aed810be0d4888c67727
This commit is contained in:
James E. Blair 2014-01-24 11:41:37 -08:00
parent 141c63b7a7
commit f36640710c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,13 @@
#!/bin/bash -e #!/bin/bash -e
GERRIT_SITE=$1 GERRIT_SITE=$1
ZUUL_SITE=$2 GIT_ORIGIN=$2
GIT_ORIGIN=$3
# TODO(jeblair): Remove once the arg list is changed in jjb macros
if [ ! -z $3 ]
then
GIT_ORIGIN=$3
fi
if [ -z "$GERRIT_SITE" ] if [ -z "$GERRIT_SITE" ]
then then
@ -10,9 +15,9 @@ then
exit 1 exit 1
fi fi
if [ -z "$ZUUL_SITE" ] if [ -z "$ZUUL_URL" ]
then then
echo "The zuul site name (eg 'http://zuul.openstack.org') must be the second argument." echo "The ZUUL_URL must be provided."
exit 1 exit 1
fi fi
@ -64,7 +69,7 @@ fi
if [ -z "$ZUUL_NEWREV" ] if [ -z "$ZUUL_NEWREV" ]
then then
git fetch $ZUUL_SITE/p/$ZUUL_PROJECT $ZUUL_REF git fetch $ZUUL_URL/$ZUUL_PROJECT $ZUUL_REF
git checkout FETCH_HEAD git checkout FETCH_HEAD
git reset --hard FETCH_HEAD git reset --hard FETCH_HEAD
if ! git clean -x -f -d -q ; then if ! git clean -x -f -d -q ; then