diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index f8e2a50ea8..fd6ba67d7e 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -98,8 +98,8 @@ export PROJECTS="openstack/python-ceilometerclient $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - # NOTE(sileht): in liberty and kilo telemetry-alarming was in ceilometer code tree - if [[ "$ZUUL_BRANCH" != "stable/kilo" && "$ZUUL_BRANCH" != "stable/liberty" ]] ; then + # NOTE(sileht): in liberty telemetry-alarming was in ceilometer code tree + if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then export PROJECTS="openstack/aodh $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" fi @@ -145,13 +145,11 @@ gnocchi_branch= if [ "$ZUUL_PROJECT" == "openstack/gnocchi" ]; then case "$ZUUL_BRANCH" in - "stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;; "stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;; "stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;; esac else case "$ZUUL_BRANCH" in - "stable/kilo") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.2";; "stable/liberty") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/1.3";; "stable/mitaka") export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1";; esac diff --git a/jenkins/jobs/congress.yaml b/jenkins/jobs/congress.yaml index 41b656eb2c..243ec6b920 100644 --- a/jenkins/jobs/congress.yaml +++ b/jenkins/jobs/congress.yaml @@ -17,7 +17,7 @@ ENABLED_SERVICES+=key,g-api,g-reg, ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cauth, # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then ENABLED_SERVICES+=n-obj, fi ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat, @@ -40,11 +40,11 @@ export PROJECTS="openstack/murano-dashboard $PROJECTS" export PROJECTS="openstack/python-muranoclient $PROJECTS" - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then + # Liberty version uses the older 'hooks' approach to adding # the congress plugin ENABLED_SERVICES+=,congress - # Kilo/Liberty doesn't support tempest plugin + # Liberty doesn't support tempest plugin export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0 export DEVSTACK_GATE_TEMPEST_REGEX="congress" function pre_test_hook {{ diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index 8ab1139fce..cb5a4bc856 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -120,8 +120,8 @@ export PROJECTS="openstack/designate-dashboard $PROJECTS" export PROJECTS="openstack/designate-tempest-plugin $PROJECTS" - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then + # Liberty version uses the older 'hooks' approach to adding # the Designate plugin function gate_hook {{ @@ -193,8 +193,8 @@ export PROJECTS="openstack/python-designateclient $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS" - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then + # Liberty version uses the older 'hooks' approach to adding # the Designate plugin function gate_hook {{ diff --git a/jenkins/jobs/ec2-api.yaml b/jenkins/jobs/ec2-api.yaml index 28e4b650b3..c6d06df679 100644 --- a/jenkins/jobs/ec2-api.yaml +++ b/jenkins/jobs/ec2-api.yaml @@ -30,18 +30,8 @@ export DEVSTACK_GATE_NEUTRON=0 fi - if [ "$ZUUL_BRANCH" = "stable/kilo" ] ; then - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - function post_test_hook {{ - source $BASE/new/devstack/accrc/admin/admin - cd /opt/stack/new/ec2-api/ - ./ec2api/tests/contrib/post_test_hook.sh - }} - export -f post_test_hook - else - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX="ec2api.tests.functional" - fi + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="ec2api.tests.functional" cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/jenkins/jobs/gnocchi.yaml b/jenkins/jobs/gnocchi.yaml index 4baa583595..19f6896d77 100644 --- a/jenkins/jobs/gnocchi.yaml +++ b/jenkins/jobs/gnocchi.yaml @@ -23,7 +23,6 @@ fi case "$ZUUL_BRANCH" in - "stable/1.0"|"stable/1.1"|"stable/1.2") export OVERRIDE_ZUUL_BRANCH=stable/kilo ;; "stable/1.3") export OVERRIDE_ZUUL_BRANCH=stable/liberty ;; "stable/2.0"|"stable/2.1") export OVERRIDE_ZUUL_BRANCH=stable/mitaka ;; esac diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 44784acd9b..b047b8e610 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -78,7 +78,7 @@ services+=,ceilometer-collector,ceilometer-api services+=,ceilometer-anotification # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then services+=,n-obj, fi export HEAT_BUILD_PIP_MIRROR=True @@ -88,19 +88,14 @@ export DEVSTACK_GATE_INSTALL_TESTONLY=1 export KEEP_LOCALRC=1 export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - if [[ "$ZUUL_BRANCH" == "stable/kilo" ]]; then - services+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier - services+=,q-vpn - else - export PROJECTS="openstack/aodh $PROJECTS" - export PROJECTS="openstack/zaqar $PROJECTS" - export PROJECTS="openstack/python-zaqarclient $PROJECTS" - export PROJECTS="openstack/neutron-vpnaas $PROJECTS" - services+=,aodh-api,aodh-alarm-evaluator,aodh-alarm-notifier - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas" - fi + export PROJECTS="openstack/aodh $PROJECTS" + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" + export PROJECTS="openstack/neutron-vpnaas $PROJECTS" + services+=,aodh-api,aodh-alarm-evaluator,aodh-alarm-notifier + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar git://git.openstack.org/openstack/zaqar" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas git://git.openstack.org/openstack/neutron-vpnaas" if [ "{lbaasversion}" = "lbaasv2" ]; then # Enable LBaaS V2 plugin @@ -246,7 +241,7 @@ OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then OVERRIDE_ENABLED_SERVICES+=,n-obj fi export OVERRIDE_ENABLED_SERVICES diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index 0e40a87ebf..d82a937237 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -24,7 +24,7 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi # tempest-lib support was added in Mitaka. Fall back to tempest for other stable branches. - if [ "$ZUUL_BRANCH" == "stable/kilo" -o "$ZUUL_BRANCH" == "stable/liberty" ] ; then + if [ "$ZUUL_BRANCH" == "stable/liberty" ] ; then export DEVSTACK_GATE_TEMPEST_REGEX='baremetal' else export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index f698f13bf2..f6f09739e6 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -27,7 +27,7 @@ # branches below are dropped. Prior to Newton, the API Tempest tests are # invoked explicitly and thus we need the following variables set. From # Newton onward, everything is taken care of by the Tempest plugin framework - if [ "$ZUUL_BRANCH" == "stable/kilo" -o "$ZUUL_BRANCH" == "stable/liberty" -o "$ZUUL_BRANCH" == "stable/mitaka" ] ; then + if [ "$ZUUL_BRANCH" == "stable/liberty" -o "$ZUUL_BRANCH" == "stable/mitaka" ] ; then export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1 else @@ -157,22 +157,12 @@ fi function gate_hook {{ - if [[ -e $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh ]]; then - bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional - else - # Before kilo - bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/gate_hook.sh - fi + bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional }} export -f gate_hook function post_test_hook {{ - if [[ -e $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh ]]; then - bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional{python} - else - # Before kilo - bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh - fi + bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional{python} }} export -f post_test_hook diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index c514770d62..c9031269c7 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -81,7 +81,7 @@ ENABLED_SERVICES+=heat,h-api,h-api-cfn,h-api-cw,h-eng, ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond, # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then ENABLED_SERVICES+=n-obj, fi ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object, @@ -157,8 +157,8 @@ DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally" export DEVSTACK_LOCAL_CONFIG - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then - # Kilo/Liberty version uses the older 'hooks' approach to adding + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then + # Liberty version uses the older 'hooks' approach to adding # the Designate plugin function gate_hook {{ @@ -303,17 +303,9 @@ ENABLED_SERVICES=h-api,h-api-cfn,h-api-cw,h-eng,heat, export DEVSTACK_LOCAL_CONFIG="enable_plugin rally git://git.openstack.org/openstack/rally" - if [[ $ZUUL_BRANCH =~ "kilo" ]]; then - # Kilo version uses 'hooks' approach that requires explicit - # enabling of services. - # todo(freerunner): Remove this ugly workaround when kilo support will be - # todo(freerunner): dropped off. - ENABLED_SERVICES+=,murano,murano-api,murano-engine - else - # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run - # and below provided link should not be used. - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano" - fi + # Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run + # and below provided link should not be used. + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin murano git://git.openstack.org/openstack/murano" export ENABLED_SERVICES @@ -789,7 +781,7 @@ ENABLED_SERVICES+=g-api,g-reg, ENABLED_SERVICES+=n-api,n-crt,n-cpu,n-sch,n-cond, # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then ENABLED_SERVICES+=n-obj, fi ENABLED_SERVICES+=s-proxy,s-account,s-container,s-object, @@ -816,12 +808,7 @@ ENABLED_SERVICES+=heat,h-api,h-api-cfn,h-api-cw,h-eng, fi if [ $DEVSTACK_GATE_SAHARA -ne 0 ]; then - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - ENABLED_SERVICES+=sahara, - else - # Sahara was moved out of DevStack as plugin after Kilo - DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara git://git.openstack.org/openstack/sahara" - fi + DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara git://git.openstack.org/openstack/sahara" fi export ENABLED_SERVICES export DEVSTACK_LOCAL_CONFIG @@ -857,7 +844,7 @@ export PYTHONUNBUFFERED=true services=key,mysql,rabbit,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,q-agt,q-dhcp,q-l3,q-meta,q-svc # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "$ZUUL_BRANCH" == "stable/liberty" ]]; then services+=,n-obj, fi export OVERRIDE_ENABLED_SERVICES=$services diff --git a/jenkins/jobs/sahara.yaml b/jenkins/jobs/sahara.yaml index f14ae91480..6474b74dfb 100644 --- a/jenkins/jobs/sahara.yaml +++ b/jenkins/jobs/sahara.yaml @@ -20,13 +20,8 @@ export DEVSTACK_GATE_EXERCISES=0 export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_NEUTRON=1 - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - # Sahara was moved out of DevStack as plugin after Kilo - export DEVSTACK_GATE_SAHARA=1 - else - export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" - fi - if [[ ! "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara" + if [[ ! "stable/liberty" =~ $ZUUL_BRANCH ]]; then # sahara-dashboard was split out from Horizon after Liberty export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard" fi @@ -191,13 +186,8 @@ export DEVSTACK_LOCAL_CONFIG="export TEMPEST_PLUGINS='/opt/stack/new/sahara-tests'" export PROJECTS="openstack/sahara-tests $PROJECTS" - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - # Sahara was moved out of DevStack as plugin after Kilo - export DEVSTACK_GATE_SAHARA=1 - else - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara git://git.openstack.org/openstack/sahara" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" - fi + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara git://git.openstack.org/openstack/sahara" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE @@ -230,18 +220,13 @@ export PYTHONUNBUFFERED=true OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,sahara # n-obj has been removed from mitaka - if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + if [[ "stable/liberty" =~ $ZUUL_BRANCH ]]; then OVERRIDE_ENABLED_SERVICES+=,n-obj, fi export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara" export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin heat https://git.openstack.org/openstack/heat" - # in liberty, vpnaas switched to a new service name - if [[ $ZUUL_BRANCH == "stable/kilo" ]]; then - OVERRIDE_ENABLED_SERVICES+=,q-vpn, - else - export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" - export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" - fi + export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" + export GRENADE_PLUGINRC+=$'\n'"enable_grenade_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" export OVERRIDE_ENABLED_SERVICES export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=0 diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml index 41bd899b2b..e3b2d2d80d 100644 --- a/jenkins/jobs/trove.yaml +++ b/jenkins/jobs/trove.yaml @@ -49,12 +49,7 @@ export ENABLED_SERVICES export PYTHONUNBUFFERED=true - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - # Trove was moved out of DevStack as plugin after Kilo - export DEVSTACK_GATE_TROVE=1 - else - export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" - fi + export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" export PROJECTS="openstack/python-troveclient $PROJECTS" export PROJECTS="openstack/trove-dashboard $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT=python-troveclient @@ -146,12 +141,7 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - if [[ "stable/kilo" =~ $ZUUL_BRANCH ]]; then - # Trove was moved out of DevStack as plugin after Kilo - export DEVSTACK_GATE_TROVE=1 - else - export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" - fi + export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove" export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_FULL=1 export DEVSTACK_GATE_NEUTRON=1