Browse Source

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 <jfrancoa@redhat.com>
Change-Id: I3c9d2396988bd3125740f0054c66e8243e85f437
master
Emilien Macchi 1 year ago
parent
commit
7b843c32bb
2 changed files with 2 additions and 26 deletions
  1. 0
    25
      scripts/oooq_common_functions.sh
  2. 2
    1
      toci_gate_test-oooq.sh

+ 0
- 25
scripts/oooq_common_functions.sh View File

@@ -88,28 +88,3 @@ function run_with_timeout {
88 88
     /usr/bin/timeout --preserve-status ${TIME_FOR_COMMAND}m ${COMMAND}
89 89
 }
90 90
 
91
-function next_release_from {
92
-    local release="${1:-master}"
93
-    case "${release}" in
94
-            # NOTE: we need to add a new release when we cut a stable branch
95
-        ''|master)
96
-            echo "master"
97
-            ;;
98
-        queens)
99
-            echo "master"
100
-            ;;
101
-        pike)
102
-            echo "queens"
103
-            ;;
104
-        ocata)
105
-            echo "pike"
106
-            ;;
107
-        newton)
108
-            echo "ocata"
109
-            ;;
110
-        *)
111
-            echo "UNKNOWN_RELEASE"
112
-            return 1
113
-            ;;
114
-    esac
115
-}

+ 2
- 1
toci_gate_test-oooq.sh View File

@@ -138,7 +138,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
138 138
                 TAGS="$TAGS,overcloud-update"
139 139
             elif is_featureset undercloud_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
140 140
                 TAGS="$TAGS,undercloud-upgrade"
141
-                export UPGRADE_RELEASE=$(next_release_from "${QUICKSTART_RELEASE}")
141
+                export UPGRADE_RELEASE=$QUICKSTART_RELEASE
142
+                export QUICKSTART_RELEASE=$(previous_release_mixed_upgrade_case "${UPGRADE_RELEASE}")
142 143
             fi
143 144
             # Set UPGRADE_RELEASE if applicable
144 145
             if [ -n "${MIXED_UPGRADE_TYPE}" ]; then

Loading…
Cancel
Save