diff --git a/files/slave_scripts/merge_tags.sh b/files/slave_scripts/merge_tags.sh new file mode 100755 index 0000000..b6a741b --- /dev/null +++ b/files/slave_scripts/merge_tags.sh @@ -0,0 +1,27 @@ +#!/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. + +TAG=$1 + +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