From f36640710c41c55a6e5192f703238ee29debcbcc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Fri, 24 Jan 2014 11:41:37 -0800
Subject: [PATCH] Use ZUUL_URL in ggp

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

Change-Id: I3c6989f6a710bc124f55aed810be0d4888c67727
---
 .../files/slave_scripts/gerrit-git-prep.sh        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/jenkins/files/slave_scripts/gerrit-git-prep.sh b/modules/jenkins/files/slave_scripts/gerrit-git-prep.sh
index 094566bef4..3e32d4b64e 100755
--- a/modules/jenkins/files/slave_scripts/gerrit-git-prep.sh
+++ b/modules/jenkins/files/slave_scripts/gerrit-git-prep.sh
@@ -1,8 +1,13 @@
 #!/bin/bash -e
 
 GERRIT_SITE=$1
-ZUUL_SITE=$2
-GIT_ORIGIN=$3
+GIT_ORIGIN=$2
+
+# TODO(jeblair): Remove once the arg list is changed in jjb macros
+if [ ! -z $3 ]
+then
+    GIT_ORIGIN=$3
+fi
 
 if [ -z "$GERRIT_SITE" ]
 then
@@ -10,9 +15,9 @@ then
   exit 1
 fi
 
-if [ -z "$ZUUL_SITE" ]
+if [ -z "$ZUUL_URL" ]
 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
 fi
 
@@ -64,7 +69,7 @@ fi
 
 if [ -z "$ZUUL_NEWREV" ]
 then
-    git fetch $ZUUL_SITE/p/$ZUUL_PROJECT $ZUUL_REF
+    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