Merge "undercloud-upgrade: deploy n-1 first then upgrade"
This commit is contained in:
commit
4c2f10e2fc
|
@ -88,28 +88,3 @@ function run_with_timeout {
|
|||
/usr/bin/timeout --preserve-status ${TIME_FOR_COMMAND}m ${COMMAND}
|
||||
}
|
||||
|
||||
function next_release_from {
|
||||
local release="${1:-master}"
|
||||
case "${release}" in
|
||||
# NOTE: we need to add a new release when we cut a stable branch
|
||||
''|master)
|
||||
echo "master"
|
||||
;;
|
||||
queens)
|
||||
echo "master"
|
||||
;;
|
||||
pike)
|
||||
echo "queens"
|
||||
;;
|
||||
ocata)
|
||||
echo "pike"
|
||||
;;
|
||||
newton)
|
||||
echo "ocata"
|
||||
;;
|
||||
*)
|
||||
echo "UNKNOWN_RELEASE"
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
|
@ -138,7 +138,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||
TAGS="$TAGS,overcloud-update"
|
||||
elif is_featureset undercloud_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
|
||||
TAGS="$TAGS,undercloud-upgrade"
|
||||
export UPGRADE_RELEASE=$(next_release_from "${QUICKSTART_RELEASE}")
|
||||
export UPGRADE_RELEASE=$QUICKSTART_RELEASE
|
||||
export QUICKSTART_RELEASE=$(previous_release_mixed_upgrade_case "${UPGRADE_RELEASE}")
|
||||
fi
|
||||
# Set UPGRADE_RELEASE if applicable
|
||||
if [ -n "${MIXED_UPGRADE_TYPE}" ]; then
|
||||
|
|
Loading…
Reference in New Issue