openstack
/
devstack-gate
Code Issues Proposed changes

Cleaned up code from Icehouse and Juno logic 

There are no such branches for devstack anymore, so keeping the code
that supports them in gate doesn't make sense.

Change-Id: I2d7b7845b31e860ee9e8b64c581768711fa73a78
This commit is contained in:
Ihar Hrachyshka 2017-02-22 07:11:43 +00:00
parent 72cc599a97
commit 728ee0c2ca
3 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devstack-vm-gate-wrap.sh
View File

@ -263,9 +263,9 @@ export DEVSTACK_PROJECT_FROM_GIT=${DEVSTACK_PROJECT_FROM_GIT:-}
# for a stable branch we want to both try to upgrade forward n => n+1 as
# well as upgrade from last n-1 => n.
#
# i.e. stable/juno:
# pullup means stable/icehouse => stable/juno
# forward means stable/juno => master (or stable/kilo if that's out)
# i.e. stable/ocata:
# pullup means stable/newton => stable/ocata
# forward means stable/ocata => master (or stable/pike if that's out)
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-}
# the branch name for selecting grenade branches
@ -304,13 +304,7 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
# forward upgrades are an attempt to migrate up from an
# existing stable branch to the next release.
forward)
if [[ "$GRENADE_BASE_BRANCH" == "stable/icehouse" ]]; then
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_NEW_BRANCH="stable/juno"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then
export GRENADE_OLD_BRANCH="stable/juno"
export GRENADE_NEW_BRANCH="stable/kilo"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/kilo" ]]; then
if [[ "$GRENADE_BASE_BRANCH" == "stable/kilo" ]]; then
export GRENADE_OLD_BRANCH="stable/kilo"
export GRENADE_NEW_BRANCH="stable/liberty"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then
@ -331,13 +325,7 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
# pullup upgrades are our normal upgrade test. Can you upgrade
# to the current patch from the last stable.
pullup)
if [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then
export GRENADE_OLD_BRANCH="stable/icehouse"
export GRENADE_NEW_BRANCH="stable/juno"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/kilo" ]]; then
export GRENADE_OLD_BRANCH="stable/juno"
export GRENADE_NEW_BRANCH="stable/kilo"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then
if [[ "$GRENADE_BASE_BRANCH" == "stable/liberty" ]]; then
export GRENADE_OLD_BRANCH="stable/kilo"
export GRENADE_NEW_BRANCH="stable/liberty"
elif [[ "$GRENADE_BASE_BRANCH" == "stable/mitaka" ]]; then

18
devstack-vm-gate.sh
View File

@ -486,24 +486,6 @@ EOF
else
echo "GRENADE_PHASE=target" >> "$localrc_file"
fi
# services deployed with mod wsgi cannot be upgraded or migrated
# until https://launchpad.net/bugs/1365105 is resolved.
case $GRENADE_NEW_BRANCH in
"stable/icehouse")
;&
"stable/juno")
echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
;;
"stable/kilo")
# while both juno and kilo can run under wsgi, they
# can't run a code only upgrade because the
# configuration assumes copying python files around
# during config stage. This might be addressed by
# keystone team later, hence separate comment and code
# block.
echo "KEYSTONE_USE_MOD_WSGI=False" >> "$localrc_file"
;;
esac
echo "CEILOMETER_USE_MOD_WSGI=False" >> "$localrc_file"
fi

8
features.yaml
View File

@ -6,8 +6,6 @@ config:
mitaka: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
liberty: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
kilo: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
juno: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
icehouse: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
# This can be used by functional jobs that only want their dependencies installed
# and don't need to incur the overhead of installing all services in the process.
no_services: [default]
@ -56,8 +54,8 @@ config:
branches:
# The value of ""default" is the name of the "trunk" branch
default: master
# Normalized branch names only here, e.g. stable/icehouse => icehouse
allowed: [master, ocata, newton, mitaka, liberty, kilo, juno, icehouse]
# Normalized branch names only here, e.g. stable/ocata => ocata
allowed: [master, ocata, newton, mitaka, liberty, kilo]
primary:
default:
@ -83,8 +81,6 @@ primary:
nova:
base:
services: [n-api, n-cauth, n-cond, n-cpu, n-crt, n-net, n-novnc, n-obj, n-sch]
icehouse:
compute-ext:
nova-md:
base: