summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2018-04-27 20:49:21 -0700
committerJose Luis Franco Arza <jfrancoa@redhat.com>2018-04-30 11:43:32 +0200
commit7b843c32bb8b64261b5cc08dccebe46ca0539d79 (patch)
tree79c749de566804e5fef77c5dd4ad5ea4ccda45f9
parentccd6fe62a09d41e301731996fb263b3aa67800f3 (diff)
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
Notes
Notes (review): Code-Review+2: Emilien Macchi <emilien@redhat.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Verified-1: RDO Third Party CI <dmsimard+rdothirdparty@redhat.com> Workflow+1: Emilien Macchi <emilien@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 01 May 2018 07:19:31 +0000 Reviewed-on: https://review.openstack.org/564970 Project: openstack-infra/tripleo-ci Branch: refs/heads/master
-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