openstack
/
tripleo-ci
Code Issues Proposed changes

Preparing TripleO CI to test upgrades to Queens 

Update the code to test upgrades between stable/ocata and stable/pike,
and stable/pike to master (queens).

Change-Id: I61afed141d611b4b6b5ad40b3d48e9ea2346d1e2
This commit is contained in:
Emilien Macchi 2017-08-30 14:49:42 -07:00
parent 3ef026abc3
commit 97f53309c6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/deploy.sh
View File

@ -577,9 +577,11 @@ fi
if [ "$UNDERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
# Reset or unset STABLE_RELEASE so that we upgrade to the next major
# version
if [ "$STABLE_RELEASE" = "ocata" ]; then
# TODO: switch STABLE_RELEASE to pike when released
if [ "$STABLE_RELEASE" = "pike" ]; then
# TODO: switch STABLE_RELEASE to queens when released
export STABLE_RELEASE=""
elif [ "$STABLE_RELEASE" = "ocata" ]; then
export STABLE_RELEASE="pike"
elif [ "$STABLE_RELEASE" = "mitaka" ]; then
export STABLE_RELEASE="newton"
elif [ "$STABLE_RELEASE" = "newton" ]; then

2
scripts/oooq_common_functions.sh
View File

@ -5,7 +5,7 @@ function previous_release_from {
case "$RELEASE" in
''|master)
# NOTE: we need to update this when we cut a stable branch
echo "ocata"
echo "pike"
;;
queens)
echo "pike"

6
toci_gate_test-orig.sh
View File

@ -120,12 +120,14 @@ if [[ $TOCI_JOBTYPE =~ upgrades ]]; then
# We deploy a master Undercloud and an Overcloud with the
# previous release. The pingtest is disable because it won't
# work with the few services deployed.
if [ "$STABLE_RELEASE" = "pike" ]; then
if [ "$STABLE_RELEASE" = "queens" ]; then
UPGRADE_RELEASE=pike
elif [ "$STABLE_RELEASE" = "pike" ]; then
UPGRADE_RELEASE=ocata
elif [ "$STABLE_RELEASE" = "ocata" ]; then
UPGRADE_RELEASE=newton
elif [ -z $STABLE_RELEASE ]; then
UPGRADE_RELEASE=ocata
UPGRADE_RELEASE=pike
fi
fi