From 5fbf5dd6c12aae2bfccd44d4e4e6e0f784ff75e3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 21 Jun 2013 14:21:25 -0700 Subject: [PATCH] Use ZUUL_ prefix instead of GERRIT_ prefix in jobs * modules/jenkins/files/slave_scripts/create-ppa-package.sh: * modules/jenkins/files/slave_scripts/docbook-properties.sh: Use ZUUL_REFNAME instead of GERRIT_REFNAME as the jenkins gearman plugin does not receive GERRIT_* parameters. Change-Id: I5869b277e9344b8805997a3c702e1ae3af0a9e8f Reviewed-on: https://review.openstack.org/34052 Reviewed-by: Jeremy Stanley Reviewed-by: Monty Taylor Approved: Clark Boylan Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/create-ppa-package.sh | 4 ++-- modules/jenkins/files/slave_scripts/docbook-properties.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/create-ppa-package.sh b/modules/jenkins/files/slave_scripts/create-ppa-package.sh index a758a924b8..49b2376c6e 100755 --- a/modules/jenkins/files/slave_scripts/create-ppa-package.sh +++ b/modules/jenkins/files/slave_scripts/create-ppa-package.sh @@ -6,7 +6,7 @@ then exit 1 fi -case "$GERRIT_REFNAME" in +case "$ZUUL_REFNAME" in master) export PPAS="ppa:openstack-ppa/bleeding-edge" ;; @@ -14,7 +14,7 @@ case "$GERRIT_REFNAME" in export PPAS="ppa:openstack-ppa/milestone-proposed" ;; *) - echo "No PPA defined for branch $GERRIT_REFNAME" + echo "No PPA defined for branch $ZUUL_REFNAME" exit 0 esac diff --git a/modules/jenkins/files/slave_scripts/docbook-properties.sh b/modules/jenkins/files/slave_scripts/docbook-properties.sh index 93bcd47c92..013749916b 100644 --- a/modules/jenkins/files/slave_scripts/docbook-properties.sh +++ b/modules/jenkins/files/slave_scripts/docbook-properties.sh @@ -7,7 +7,7 @@ # In case we start doing something more sophisticated with other refs # later (such as tags). -BRANCH=$GERRIT_REFNAME +BRANCH=$ZUUL_REFNAME # The master branch should get published to /trunk if [ $BRANCH == "master" ]