opendev/system-config
Code Issues Proposed changes

Merge "Add proposed/* branches support to merge_tags.sh"

Browse Source
This commit is contained in:
Jenkins 2014-07-01 23:26:13 +00:00 committed by Gerrit Code Review
commit dd519c6fb2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/files/slave_scripts/merge_tags.sh
View File

@ -14,8 +14,11 @@
TAG=$1
if $(git tag --contains origin/milestone-proposed | grep "^$TAG$" >/dev/null)
# Only merge release tag if it's not on a stable branch
if $(git branch -r --contains "$TAG" | grep "stable/" >/dev/null)
then
echo "Tag $TAG was pushed to a stable branch, ignoring."
else
git config user.name "OpenStack Proposal Bot"
git config user.email "openstack-infra@lists.openstack.org"
git config gitreview.username "proposal-bot"