From cec2b6e65cd4de85a63cce5decd92c8c18bff54a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 17 Oct 2013 14:41:42 -0400 Subject: [PATCH] Move the milestone-proposed logic to tag script The release pipeline does not have any branch information, because tag events are branchless. So, in the script, check to see if the tag is in milestone-proposed, and if so, submit the merge commit. Change-Id: Ia46bf6ad7826571d39884cf7cd8165c5cea678e6 --- .../jenkins/files/slave_scripts/merge_tags.sh | 23 +++++++++++-------- .../openstack_project/files/zuul/layout.yaml | 2 -- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/modules/jenkins/files/slave_scripts/merge_tags.sh b/modules/jenkins/files/slave_scripts/merge_tags.sh index b6a741bf67..ec2a707e10 100755 --- a/modules/jenkins/files/slave_scripts/merge_tags.sh +++ b/modules/jenkins/files/slave_scripts/merge_tags.sh @@ -14,14 +14,17 @@ TAG=$1 -git config user.name "OpenStack Jenkins" -git config user.email "jenkins@openstack.org" -git config gitreview.username "jenkins" +if $(git tag --contains origin/milestone-proposed | grep "^$TAG$" >/dev/null) +then + git config user.name "OpenStack Jenkins" + git config user.email "jenkins@openstack.org" + git config gitreview.username "jenkins" -git review -s -git checkout master -git reset --hard origin/master -git merge -s ours $TAG -# Get a Change-Id -GIT_EDITOR=true git commit --amend -git review -R -t merge/release-tag + git review -s + git checkout master + git reset --hard origin/master + git merge -s ours $TAG + # Get a Change-Id + GIT_EDITOR=true git commit --amend + git review -R -t merge/release-tag +fi diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index d9d038f20a..77c76add0c 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -271,8 +271,6 @@ jobs: branch: ^(?!stable/(folsom|grizzly)).*$ - name: manuals-upstream-translation-update branch: ^master$ - - name: ^.*-merge-release-tags$ - branch: milestone-proposed - name: gate-hacking-python33 voting: false - name: gate-hacking-pypy