summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-01 07:19:31 +0000
committerGerrit Code Review <review@openstack.org>2018-05-01 07:19:31 +0000
commit4c2f10e2fc9d2ef443dd5d9a07730856e00145c1 (patch)
tree6b48f30488718622417caf92c015e198abd15406
parent96492c2e637fb56958eda85d95c7022634b11f2d (diff)
parent7b843c32bb8b64261b5cc08dccebe46ca0539d79 (diff)
Merge "undercloud-upgrade: deploy n-1 first then upgrade"
-rw-r--r--scripts/oooq_common_functions.sh25
-rwxr-xr-xtoci_gate_test-oooq.sh3
2 files changed, 2 insertions, 26 deletions
diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh
index e7fe88a..75931a4 100644
--- a/scripts/oooq_common_functions.sh
+++ b/scripts/oooq_common_functions.sh
@@ -88,28 +88,3 @@ function run_with_timeout {
88 /usr/bin/timeout --preserve-status ${TIME_FOR_COMMAND}m ${COMMAND} 88 /usr/bin/timeout --preserve-status ${TIME_FOR_COMMAND}m ${COMMAND}
89} 89}
90 90
91function 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}
diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh
index 8093f09..5c2a3a3 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
138 TAGS="$TAGS,overcloud-update" 138 TAGS="$TAGS,overcloud-update"
139 elif is_featureset undercloud_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then 139 elif is_featureset undercloud_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
140 TAGS="$TAGS,undercloud-upgrade" 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 fi 143 fi
143 # Set UPGRADE_RELEASE if applicable 144 # Set UPGRADE_RELEASE if applicable
144 if [ -n "${MIXED_UPGRADE_TYPE}" ]; then 145 if [ -n "${MIXED_UPGRADE_TYPE}" ]; then