openstack/project-config
Code Issues Proposed changes

Change proposals fall back on proposed branches

Browse Source 
During the RC period for a project, there may already be a stable
branch for the release on the triggering project and a proposed
branch on the target project. If so, we want stable changes proposed
to the proposed branch. That's not confusing!

Change-Id: I488bb9ff63daf9d012e41dbaa178b1656eaeffad
This commit is contained in:
Jeremy Stanley
2015-04-10 14:38:13 +00:00
parent 5de7f86aa4
commit a09f0255f7
1 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
jenkins/scripts/propose_update.sh
View File

@ -25,11 +25,10 @@ else
TOPIC="openstack/openstack-manuals"
fi
USERNAME="proposal-bot"
BRANCH=$ZUUL_REF
ALL_SUCCESS=0
if [ -z "$BRANCH" ] ; then
echo "No branch set, exiting."
if [ -z "$ZUUL_REF" ] ; then
echo "No ZUUL_REF set, exiting."
exit 1
fi
@ -39,38 +38,49 @@ git config gitreview.username "proposal-bot"
for PROJECT in $(cat projects.txt); do
change_id=""
# See if there is an open change in the openstack/requirements topic
# If so, get the change id for the existing change for use in the
# commit msg.
change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME branch:$BRANCH)
previous=$(echo "$change_info" | grep "^ number:" | awk '{print $2}')
if [ "x${previous}" != "x" ] ; then
change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')
# read return a non zero value when it reaches EOF. Because we use a
# heredoc here it will always reach EOF and return a nonzero value.
# Disable -e temporarily to get around the read.
# The reason we use read is to allow for multiline variable content
# and variable interpolation. Simply double quoting a string across
# multiple lines removes the newlines.
set +e
read -d '' COMMIT_MSG <<EOF
$INITIAL_COMMIT_MSG
Change-Id: $change_id
EOF
set -e
else
COMMIT_MSG=$INITIAL_COMMIT_MSG
fi
PROJECT_DIR=$(basename $PROJECT)
rm -rf $PROJECT_DIR
git clone ssh://$USERNAME@review.openstack.org:29418/$PROJECT.git
pushd $PROJECT_DIR
# make sure the project even has this branch
if git branch -a | grep -q "^ remotes/origin/$BRANCH$" ; then
# check whether the project has this branch or a suitable fallback
BRANCH=""
if git branch -a | grep -q "^ remotes/origin/$ZUUL_REF$" ; then
BRANCH=$ZUUL_REF
elif echo $ZUUL_REF | grep -q "^stable/" ; then
FALLBACK=`echo $ZUUL_REF | sed s,^stable/,proposed/,`
if git branch -a | grep -q "^ remotes/origin/$FALLBACK$" ; then
BRANCH=$FALLBACK
fi
fi
# don't bother with this project if there's not a usable branch
if [ -n "$BRANCH" ] ; then
change_id=""
# See if there is an open change in the openstack/requirements topic
# If so, get the change id for the existing change for use in the
# commit msg.
change_info=$(ssh -p 29418 $USERNAME@review.openstack.org gerrit query --current-patch-set status:open project:$PROJECT topic:$TOPIC owner:$USERNAME branch:$BRANCH)
previous=$(echo "$change_info" | grep "^ number:" | awk '{print $2}')
if [ "x${previous}" != "x" ] ; then
change_id=$(echo "$change_info" | grep "^change" | awk '{print $2}')
# read return a non zero value when it reaches EOF. Because we use a
# heredoc here it will always reach EOF and return a nonzero value.
# Disable -e temporarily to get around the read.
# The reason we use read is to allow for multiline variable content
# and variable interpolation. Simply double quoting a string across
# multiple lines removes the newlines.
set +e
read -d '' COMMIT_MSG <<EOF
$INITIAL_COMMIT_MSG
Change-Id: $change_id
EOF
set -e
else
COMMIT_MSG=$INITIAL_COMMIT_MSG
fi
git checkout -B ${BRANCH} -t origin/${BRANCH}
# Need to set the git config in each repo as we shouldn't
# set it globally for the Jenkins user on the slaves.