From aa1e59dcc5447ad96f534fe1ab909cdc27c517ad Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 13 Feb 2014 16:43:49 -0800 Subject: [PATCH] Support grenade-svm-rolling rename to *-partial-ncpu I273b82fe2bb449d497f565fe1e2e14e4ea0a59e9 added support for a rolling upgrade test, we have decided to call it partial-ncpu instead, also grenade now takes a list of services to hold back (Ifb733ee2fe0c5bba61b43ae19dca7040c12f7893). Related devstack-infra/config patch: Ic680502d4dcc0a8677749bc38bf57b6c76c881f7 Change-Id: Icdf43128539e5eee24e47f81b236cede31755a00 --- devstack-vm-gate-wrap.sh | 5 ++--- devstack-vm-gate.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 6ebb192c..bd457636 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -184,9 +184,8 @@ export TEMPEST_CONCURRENCY=${TEMPEST_CONCURRENCY:-${DEFAULT_CONCURRENCY}} # DGGF=1 means stable/havana => master (or stable/icehouse if that's out) export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0} export DEVSTACK_GATE_GRENADE_FORWARD=${DEVSTACK_GATE_GRENADE_FORWARD:-0} -# DGGR=1 means do a rolling upgrade, where the resulting state is mix of -# new and old services. -export DEVSTACK_GATE_GRENADE_ROLLING=${DEVSTACK_GATE_GRENADE_ROLLING:-0} +# DGGPN=1 means upgrade everything but n-cpu. +export DEVSTACK_GATE_GRENADE_PARTIAL_NCPU=${DEVSTACK_GATE_GRENADE_PARTIAL_NCPU:-0} if [ "$DEVSTACK_GATE_GRENADE" -eq "1" ]; then export DEVSTACK_GATE_TEMPEST=1 diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 91fc9849..5b584c94 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -214,8 +214,8 @@ EOF else echo "GRENADE_PHASE=target" >> localrc fi - if [ "$DEVSTACK_GATE_GRENADE_ROLLING" -eq "1" ]; then - echo "NOVA_COMPUTE_ROLLING_UPGRADE=True" >> localrc + if [ "$DEVSTACK_GATE_GRENADE_PARTIAL_NCPU" -eq "1" ]; then + echo "DO_NOT_UPGRADE_SERVICES=[n-cpu]" >> localrc fi else # Grenade needs screen, so only turn this off if we aren't