openstack
/
tripleo-ci
Code Issues Proposed changes

Re-enable temprevert/cherry-pick/pin functionality 

When we do tempreverts now, we need to ensure we signal to delorean
that it needs to rebuild the affected package.

Change-Id: I3e36398091357fadc6ff0f4e1eef5d673d3041f1
This commit is contained in:
Ben Nemec 2016-09-14 17:30:17 +00:00
parent 964628d775
commit cdc73c8585
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/common_functions.sh
View File

@ -16,6 +16,7 @@ function temprevert(){
# Abort on fail so we're not left in a conflict state
git revert --no-edit $2 || git revert --abort || true
popd
DELOREAN_BUILD_REFS="${DELOREAN_BUILD_REFS:-} $1"
}
# Pin to a commit for tripleo ci
@ -33,6 +34,7 @@ function pin(){
pushd $TRIPLEO_ROOT/$1
git reset --hard $2
popd
DELOREAN_BUILD_REFS="${DELOREAN_BUILD_REFS:-} $1"
}
# Cherry-pick a commit for tripleo ci
@ -55,6 +57,7 @@ function cherrypick(){
# Abort on fail so we're not left in a conflict state
git cherry-pick FETCH_HEAD || git cherry-pick --abort
popd
DELOREAN_BUILD_REFS="${DELOREAN_BUILD_REFS:-} $1"
# Export a DIB_REPOREF variable as well
export DIB_REPOREF_${PROJ_NAME//-/_}=$REFSPEC
@ -248,7 +251,7 @@ function postci(){
}
function delorean_build_and_serve {
DELOREAN_BUILD_REFS=
DELOREAN_BUILD_REFS=${DELOREAN_BUILD_REFS:-}
for PROJFULLREF in $ZUUL_CHANGES ; do
PROJ=$(filterref $PROJFULLREF)
# If ci is being run for a change to ci its ok not to have a ci produced repository

3
toci_instack_osinfra.sh
View File

@ -47,6 +47,9 @@ sudo iptables -I INPUT -p tcp --dport 8766 -j ACCEPT
trap "[ \$? != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT
# Tempreverts/cherry-picks/pins go here. For example:
# temprevert tripleo-common af27127508eabf2b6873713e5e1507fa92b5f5b3 1623606
delorean_build_and_serve
# Since we've moved a few commands from this spot before the wget, we need to

3
toci_instack_ovb.sh
View File

@ -56,6 +56,9 @@ sudo yum -y install wget python-simplejson yum-plugin-priorities
trap "[ \$? != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^^ && echo 'See postci.txt in the logs directory for debugging details'; postci 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' > $WORKSPACE/logs/postci.log 2>&1" EXIT
# Tempreverts/cherry-picks/pins go here. For example:
# temprevert tripleo-common af27127508eabf2b6873713e5e1507fa92b5f5b3 1623606
delorean_build_and_serve
# Since we've moved a few commands from this spot before the wget, we need to