opendev/system-config
Code Issues Proposed changes

Merge "Move the milestone-proposed logic to tag script"

Browse Source
This commit is contained in:
Jenkins 2013-10-19 15:19:35 +00:00 committed by Gerrit Code Review
commit e7260de708
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/jenkins/files/slave_scripts/merge_tags.sh
View File

@ -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

2
modules/openstack_project/files/zuul/layout.yaml
View File

@ -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