From ea9c5e6bb8466906c94ca1d728082715e6211264 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 16 Oct 2014 08:54:31 -0700 Subject: [PATCH] Havana branches are dead, remove havana from d-g We EOLed, tagged, then deleted the stable/havana branches everywhere. Clean havana out of devstack-gate as this config is no longer necessary. Note this adds Juno specific test-features.sh tests because the havana tests are no longer needed but we should continue to test that we generate the proper feature lists for our stable branches. Change-Id: Iea93ac03a9729cf6fe75a6410de4dec2c531f8d2 --- devstack-vm-gate-wrap.sh | 15 +++------------ devstack-vm-gate.sh | 9 --------- features.yaml | 7 +------ test-features.sh | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 37 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index c0a55abb..89e470a9 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -247,10 +247,7 @@ GRENADE_BASE_BRANCH=${OVERRIDE_ZUUL_BRANCH:-${ZUUL_BRANCH}} if [[ "$DEVSTACK_GATE_GRENADE" == "pullup" ]]; then export DEVSTACK_GATE_TEMPEST=1 - if [[ "$GRENADE_BASE_BRANCH" == "stable/icehouse" ]]; then - export GRENADE_OLD_BRANCH="stable/havana" - export GRENADE_NEW_BRANCH="stable/icehouse" - elif [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then + if [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then export GRENADE_OLD_BRANCH="stable/icehouse" export GRENADE_NEW_BRANCH="stable/juno" else # master @@ -260,10 +257,7 @@ if [[ "$DEVSTACK_GATE_GRENADE" == "pullup" ]]; then elif [[ "$DEVSTACK_GATE_GRENADE" == "partial-ncpu" ]]; then export DEVSTACK_GATE_TEMPEST=1 export DO_NOT_UPGRADE_SERVICES=[n-cpu] - if [[ "$GRENADE_BASE_BRANCH" == "stable/icehouse" ]]; then - export GRENADE_OLD_BRANCH="stable/havana" - export GRENADE_NEW_BRANCH="stable/icehouse" - elif [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then + if [[ "$GRENADE_BASE_BRANCH" == "stable/juno" ]]; then export GRENADE_OLD_BRANCH="stable/icehouse" export GRENADE_NEW_BRANCH="stable/juno" else # master @@ -272,10 +266,7 @@ elif [[ "$DEVSTACK_GATE_GRENADE" == "partial-ncpu" ]]; then fi elif [[ "$DEVSTACK_GATE_GRENADE" == "forward" ]]; then export DEVSTACK_GATE_TEMPEST=1 - if [[ "$GRENADE_BASE_BRANCH" == "stable/havana" ]]; then - export GRENADE_OLD_BRANCH="stable/havana" - export GRENADE_NEW_BRANCH="stable/icehouse" - elif [[ "$GRENADE_BASE_BRANCH" == "stable/icehouse" ]]; then + 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 diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 381acb2f..4d3c8030 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -74,15 +74,6 @@ function setup_localrc { echo "Q_DVR_MODE=dvr_snat" >>localrc fi - if [[ "$LOCALRC_BRANCH" == "stable/havana" ]]; then - # we don't want to enable services for grenade that don't have upgrade support - # otherwise they can break grenade, especially when they are projects like - # ceilometer which inject code in other projects - if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then - SKIP_EXERCISES=${SKIP_EXERCISES},swift,client-args - fi - fi - cat <>localrc USE_SCREEN=False DEST=$BASE/$LOCALRC_OLDNEW diff --git a/features.yaml b/features.yaml index b8fdf3b7..36a64a5e 100644 --- a/features.yaml +++ b/features.yaml @@ -3,7 +3,6 @@ config: master: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone, heat, trove, sahara] juno: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone, heat, trove, sahara] icehouse: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone, heat, trove] - havana: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone, heat] # 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] @@ -45,7 +44,7 @@ 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, juno, icehouse, havana] + allowed: [master, juno, icehouse] features: default: @@ -55,8 +54,6 @@ features: ceilometer: base: services: [ceilometer-acompute, ceilometer-acentral, ceilometer-collector, ceilometer-api, ceilometer-alarm-notifier, ceilometer-alarm-evaluator, ceilometer-anotification] - havana: - rm-services: [ceilometer-alarm-notifier, ceilometer-alarm-evaluator, ceilometer-anotification] glance: base: @@ -73,8 +70,6 @@ features: nova: base: services: [n-api, n-cond, n-cpu, n-crt, n-net, n-obj, n-sch] - havana: - rm-compute-ext: icehouse: compute-ext: diff --git a/test-features.sh b/test-features.sh index 3e53b63a..507de2c7 100755 --- a/test-features.sh +++ b/test-features.sh @@ -24,11 +24,11 @@ TEMPEST_HEAT_SLOW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,h GRENADE_NEW_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification" -GRENADE_HAVANA_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acentral,ceilometer-acompute,ceilometer-api,ceilometer-collector" +GRENADE_JUNO_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification" GRENADE_ICEHOUSE_MASTER="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,n-net,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification" -TEMPEST_FULL_HAVANA="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,n-net" +TEMPEST_FULL_JUNO="n-api,n-crt,n-obj,n-cpu,n-sch,n-cond,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,tempest,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,trove,tr-api,tr-tmgr,tr-cond,n-net,sahara" # Utility function for tests function assert_list_equal { @@ -55,9 +55,9 @@ function test_full_feature_ec { assert_list_equal $TEMPEST_FULL_MASTER $results } -function test_full_havana { - local results=$(DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/havana) - assert_list_equal $TEMPEST_FULL_HAVANA $results +function test_full_juno { + local results=$(DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/juno) + assert_list_equal $TEMPEST_FULL_JUNO $results } function test_neutron_master { @@ -75,9 +75,9 @@ function test_grenade_new_master { assert_list_equal $GRENADE_NEW_MASTER $results } -function test_grenade_havana_master { - local results=$(DEVSTACK_GATE_GRENADE=pullup DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/havana) - assert_list_equal $GRENADE_HAVANA_MASTER $results +function test_grenade_juno_master { + local results=$(DEVSTACK_GATE_GRENADE=pullup DEVSTACK_GATE_TEMPEST=1 ./test-matrix.py -b stable/juno) + assert_list_equal $GRENADE_JUNO_MASTER $results } function test_grenade_icehouse_master { @@ -90,9 +90,9 @@ test_full_feature_ec test_neutron_master test_heat_slow_master test_grenade_new_master -test_grenade_havana_master +test_grenade_juno_master test_grenade_icehouse_master -test_full_havana +test_full_juno if [[ "$ERRORS" -ne 0 ]]; then echo "Errors detected, job failed"