From 7b843c32bb8b64261b5cc08dccebe46ca0539d79 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 27 Apr 2018 20:49:21 -0700 Subject: [PATCH] undercloud-upgrade: deploy n-1 first then upgrade The current undercloud upgrade job deploys an undercloud from master so upgrade was never actually tested. This patch finds out which release we want to test and provide the right featureset file. Co-authored-by: Jose Luis Franco Change-Id: I3c9d2396988bd3125740f0054c66e8243e85f437 --- scripts/oooq_common_functions.sh | 25 ------------------------- toci_gate_test-oooq.sh | 3 ++- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh index e7fe88ad1..75931a428 100644 --- a/scripts/oooq_common_functions.sh +++ b/scripts/oooq_common_functions.sh @@ -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 -} diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index 8093f0957..5c2a3a3f4 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -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