stop merging tags from stable branches into master
As discussed on the mailing list [1], merging tags between branches confuses the history as reno sees it and results in invalid release notes builds. [1] http://lists.openstack.org/pipermail/openstack-dev/2016-June/096895.html Change-Id: Ie09158ca0d522905b229251564ff5141e59e2b6c Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
parent
d43808d88f
commit
7119efe40d
@ -43,24 +43,6 @@
|
||||
excludes: ''
|
||||
- console-log
|
||||
|
||||
- job-template:
|
||||
name: '{name}-merge-release-tags'
|
||||
|
||||
builders:
|
||||
- print-template-name:
|
||||
template-name: "{template-name}"
|
||||
- revoke-sudo
|
||||
- gerrit-git-prep
|
||||
- shell: |
|
||||
#!/bin/bash -xe
|
||||
TAG=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'`
|
||||
/usr/local/jenkins/slave_scripts/merge_tags.sh $TAG
|
||||
|
||||
publishers:
|
||||
- console-log
|
||||
|
||||
node: 'proposal'
|
||||
|
||||
|
||||
# Publish releasenotes to docs.openstack.org/releasenotes/. This is
|
||||
# always published from master branch.
|
||||
@ -126,7 +108,6 @@
|
||||
jobs:
|
||||
- '{name}-docs'
|
||||
- '{name}-docs-tags-only'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
|
||||
- job-group:
|
||||
|
@ -5702,7 +5702,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-apparmor
|
||||
@ -5797,7 +5796,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-bugdaystats
|
||||
@ -5846,7 +5844,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-ceph
|
||||
@ -5869,7 +5866,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-cgit
|
||||
@ -5905,7 +5901,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-ciwatch
|
||||
@ -5941,7 +5936,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-designate
|
||||
@ -5964,7 +5958,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-diskimage_builder
|
||||
@ -6013,7 +6006,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-elastic_recheck
|
||||
@ -6127,7 +6119,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-gnocchi
|
||||
@ -6150,7 +6141,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-grafyaml
|
||||
@ -6212,7 +6202,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-horizon
|
||||
@ -6235,7 +6224,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-hound
|
||||
@ -6311,7 +6299,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-jeepyb
|
||||
@ -6373,7 +6360,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-kibana
|
||||
@ -6461,7 +6447,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-mailman
|
||||
@ -6497,7 +6482,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-mediawiki
|
||||
@ -6560,7 +6544,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-monasca
|
||||
@ -6591,7 +6574,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-mysql_backup
|
||||
@ -6635,7 +6617,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-nodepool
|
||||
@ -6671,7 +6652,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-octavia
|
||||
@ -6694,7 +6674,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-odsreg
|
||||
@ -6751,7 +6730,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-openstack-guide
|
||||
@ -6868,7 +6846,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-os_client_config
|
||||
@ -6904,7 +6881,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-ovn
|
||||
@ -6927,7 +6903,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-pacemaker
|
||||
@ -6950,7 +6925,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-packagekit
|
||||
@ -7064,7 +7038,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-redis
|
||||
@ -7139,7 +7112,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-setproxy
|
||||
@ -7287,7 +7259,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-tacker
|
||||
@ -7310,7 +7281,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-tempest
|
||||
@ -7333,7 +7303,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-tmpreaper
|
||||
@ -7371,7 +7340,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-trove
|
||||
@ -7394,7 +7362,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-ulimit
|
||||
@ -7482,7 +7449,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-vswitch
|
||||
@ -7505,7 +7471,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-watcher
|
||||
@ -7528,7 +7493,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-yum
|
||||
@ -7577,7 +7541,6 @@
|
||||
- '{name}-branch-tarball'
|
||||
- '{name}-tarball'
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- project:
|
||||
name: puppet-zuul
|
||||
|
@ -1,60 +0,0 @@
|
||||
#!/bin/bash -xe
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
source /usr/local/jenkins/slave_scripts/common.sh
|
||||
|
||||
TAG=$1
|
||||
|
||||
# Only merge release tag if it's on a stable branch
|
||||
if ! $(git branch -r --contains "$TAG" | grep "stable/" >/dev/null); then
|
||||
echo "Tag $TAG was not pushed to a stable branch, ignoring."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Make sure the tag does not correspond to a patch release
|
||||
if ! echo $TAG|grep '^[0-9]\+\.[0-9]\+\(\.0\|\)$'; then
|
||||
echo "Triggered on patch release $TAG tag, ignoring."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
setup_git
|
||||
|
||||
git review -s
|
||||
git remote update
|
||||
git checkout master
|
||||
git reset --hard origin/master
|
||||
MASTER_MINOR=$(git describe|cut -d. -f-2)
|
||||
TAG_MINOR=$(echo $TAG | cut -d. -f-2)
|
||||
|
||||
# If the tag is for an earlier version than master's, skip
|
||||
if [ "$(echo $(echo -e "$MASTER_MINOR\n$TAG_MINOR"|sort -V))" \
|
||||
\!= "$MASTER_MINOR $TAG_MINOR" ]; then
|
||||
echo "Skipping $TAG which sorts before master's $MASTER_MINOR version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
COMMIT_MSG="Merge tag '$TAG'
|
||||
|
||||
This is a null-merge of the $TAG release tag back into the master
|
||||
branch so that the $TAG tag will appear in the git commit history of
|
||||
the master branch. It contains no actual changes to the master branch,
|
||||
regardless of how our code review system's UI represents it. Please
|
||||
ask in #openstack-infra if you have any questions, and otherwise try
|
||||
to merge this as quickly as possible to avoid later conflicts on the
|
||||
master branch."
|
||||
|
||||
git merge -m "$COMMIT_MSG" -s ours $TAG
|
||||
# Get a Change-Id
|
||||
GIT_EDITOR=true git commit --amend
|
||||
git review -R -y -t merge/release-tag
|
@ -653,7 +653,6 @@ project-templates:
|
||||
release:
|
||||
- '{name}-tarball':
|
||||
- '{name}-announce-release'
|
||||
- '{name}-merge-release-tags'
|
||||
|
||||
- name: release-notes-jobs
|
||||
check:
|
||||
|
@ -47,7 +47,7 @@ def set_node_options(item, job, params):
|
||||
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
|
||||
# Pass tags through for subunit2sql
|
||||
params['JOB_TAGS'] = ' '.join(sorted(job.tags))
|
||||
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(.*?)-(rdo-promote|constraints-.*|updates?|update-(liberty|mitaka)|plugins-list|openstack-constraints))$' # noqa
|
||||
proposal_re = r'^.*(propose|upstream)-(.*?)-(rdo-promote|constraints-.*|updates?|update-(liberty|mitaka)|plugins-list|openstack-constraints)$' # noqa
|
||||
release_re = r'^.*-(forge|jenkinsci|mavencentral|pypi-(both|wheel)|npm)-upload$'
|
||||
hook_re = r'^hook-(.*?)-(rtfd)$'
|
||||
wheel_re = r'^wheel-(build|release)-.*$'
|
||||
|
Loading…
Reference in New Issue
Block a user