From 5d65a11833700102688128932f85a439a47525fa Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 3 Dec 2013 14:22:19 -0800 Subject: [PATCH] Enable requirement update proposal jobs Apparently we needed to use the magical ZUUL_REF job variable to get the branch info from a change in the Zuul post pipeline. Use it and only propose requirements updates to the branches that were updated. Closes-bug: 1246249 Change-Id: I7adfd19e502846d3a07cde1808fdc79164c061a9 --- .../files/slave_scripts/propose_requirements_update.sh | 7 ++++++- modules/openstack_project/files/zuul/layout.yaml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh index c48d289119..ca5852d553 100755 --- a/modules/jenkins/files/slave_scripts/propose_requirements_update.sh +++ b/modules/jenkins/files/slave_scripts/propose_requirements_update.sh @@ -15,7 +15,12 @@ INITIAL_COMMIT_MSG="Updated from global requirements" TOPIC="openstack/requirements" USERNAME=${USERNAME:-$USER} -BRANCH=${ZUUL_BRANCH:-master} +BRANCH=$ZUUL_REF + +if [ -z "$BRANCH" ] ; then + echo "No branch set, exiting." + exit 1 +fi git config user.name "OpenStack Jenkins" git config user.email "jenkins@openstack.org" diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index fad4cbe511..7302a26c8e 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -1508,6 +1508,7 @@ projects: - post-mirror-python26 - post-mirror-python27 - post-mirror-python33 + - propose-requirements-updates periodic: - periodic-mirror-python26 - periodic-mirror-python27