From b0239e9055311364f8ed084f316cca73d87d8aef Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 5 Jul 2017 16:17:55 +0200 Subject: [PATCH] Remove mitaka specific cases in jobs Remove special treatment for mitaka in jobs where the repo has now the stable/mitaka branch retired. Change-Id: I1af11cf22c145bb96e93485460cca277287c88ca --- jenkins/jobs/ceilometer.yaml | 14 ++--------- jenkins/jobs/heat.yaml | 17 +------------ jenkins/jobs/ironic.yaml | 1 - jenkins/jobs/manila.yaml | 2 +- jenkins/jobs/networking-midonet.yaml | 35 +++----------------------- jenkins/jobs/neutron-fwaas.yaml | 20 ++++----------- jenkins/jobs/neutron-vpnaas.yaml | 9 ++----- jenkins/jobs/neutron.yaml | 9 ++----- jenkins/jobs/rally.yaml | 9 +++---- jenkins/jobs/senlin.yaml | 6 +---- jenkins/jobs/tacker.yaml | 37 ++++++++++++---------------- 11 files changed, 37 insertions(+), 122 deletions(-) diff --git a/jenkins/jobs/ceilometer.yaml b/jenkins/jobs/ceilometer.yaml index 4b1cceb73b..2194a12a5a 100644 --- a/jenkins/jobs/ceilometer.yaml +++ b/jenkins/jobs/ceilometer.yaml @@ -142,7 +142,7 @@ export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 - if [ "$ZUUL_BRANCH" == "stable/mitaka" ] || [ "$ZUUL_BRANCH" == "stable/newton" ] ; then + if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then export DEVSTACK_GATE_TEMPEST=0 else export DEVSTACK_GATE_TEMPEST=1 @@ -158,11 +158,6 @@ # which Gnocchi version can be used with other OpenStack # components and the reverse. case "$ZUUL_BRANCH" in - "stable/mitaka") - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" - export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1" - export PROJECTS="$PROJECTS openstack/gnocchi" - ;; "stable/newton") export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" @@ -225,7 +220,7 @@ export DEVSTACK_GATE_HEAT=1 export DEVSTACK_GATE_NEUTRON=1 - if [ "$ZUUL_BRANCH" == "stable/mitaka" ] || [ "$ZUUL_BRANCH" == "stable/newton" ] ; then + if [ "$ZUUL_BRANCH" == "stable/newton" ] ; then export DEVSTACK_GATE_TEMPEST=0 else export DEVSTACK_GATE_TEMPEST=1 @@ -238,11 +233,6 @@ export PROJECTS="openstack/devstack-plugin-{plugin} $PROJECTS" case "$ZUUL_BRANCH" in - "stable/mitaka") - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" - export OVERRIDE_GNOCCHI_PROJECT_BRANCH="stable/2.1" - export PROJECTS="$PROJECTS openstack/gnocchi" - ;; "stable/newton") export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" diff --git a/jenkins/jobs/heat.yaml b/jenkins/jobs/heat.yaml index 880fc17a49..9c6bf7ae63 100644 --- a/jenkins/jobs/heat.yaml +++ b/jenkins/jobs/heat.yaml @@ -51,7 +51,7 @@ services+=,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt # placement services mandatory for nova from ocata - if [[ ! "stable/mitaka stable/newton" =~ $ZUUL_BRANCH ]]; then + if [[ "stable/newton" != $ZUUL_BRANCH ]]; then services+=,placement-api,placement-client fi @@ -67,11 +67,6 @@ services+=,s-proxy,s-object,s-container,s-account fi - # enable heat services for mitaka (no devstack plugin available) - if [[ "$ZUUL_BRANCH" == "stable/mitaka" ]]; then - services+=,h-api,h-api-cfn,h-api-cw,h-eng - fi - if [[ ! "stable/newton stable/ocata" =~ $ZUUL_BRANCH ]]; then services+=,q-trunk fi @@ -181,11 +176,6 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - # enable heat services for mitaka (no devstack plugin available) - if [[ "$ZUUL_BRANCH" == "stable/mitaka" ]]; then - export ENABLED_SERVICES+=,h-api,h-api-cfn,h-api-cw,h-eng - fi - function post_test_hook {{ # Configure and run functional tests $BASE/new/python-heatclient/heatclient/tests/functional/hooks/post_test_hook.sh @@ -221,11 +211,6 @@ export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - # enable heat services for mitaka (no devstack plugin available) - if [[ "$ZUUL_BRANCH" == "stable/mitaka" ]]; then - ENABLED_SERVICES+=,h-api,h-api-cfn,h-api-cw,h-eng - fi - export ENABLED_SERVICES export DEVSTACK_GATE_NEUTRON=1 diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index ee3ad989c5..1e7325db2d 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -301,7 +301,6 @@ # Pull in the EARLY variables injected by the optional builders source ironic-vars-early - # devstack plugin didn't exist until mitaka export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" # Ensure the ironic-EXTRA-vars file exists diff --git a/jenkins/jobs/manila.yaml b/jenkins/jobs/manila.yaml index 5fe1241817..e60d133eb7 100644 --- a/jenkins/jobs/manila.yaml +++ b/jenkins/jobs/manila.yaml @@ -164,7 +164,7 @@ OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt # Enable mandatory placement services for nova starting with ocata - if [[ ! "stable/mitaka stable/newton" =~ $ZUUL_BRANCH ]]; then + if [[ "stable/newton" != $ZUUL_BRANCH ]]; then OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client fi fi diff --git a/jenkins/jobs/networking-midonet.yaml b/jenkins/jobs/networking-midonet.yaml index 0b6d2924e5..a095b201e9 100644 --- a/jenkins/jobs/networking-midonet.yaml +++ b/jenkins/jobs/networking-midonet.yaml @@ -31,37 +31,10 @@ export PROJECTS="openstack/networking-l2gw $PROJECTS" export PROJECTS="openstack/tap-as-a-service $PROJECTS" - BRANCH=${{OVERRIDE_ZUUL_BRANCH:-$ZUUL_BRANCH}} - if [[ ! "stable/mitaka" =~ $BRANCH ]]; then - function gate_hook {{ - bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh {midonet-plugin} - }} - export -f gate_hook - else - # Note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True" - - if [[ {midonet-plugin} = v2 ]]; then - # Enable MidoNet v2 architecture - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_SERVICE_PLUGIN_CLASSES=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin" - else - # ml2 - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_TYPE_DRIVERS=midonet,uplink" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=midonet" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin" - fi - fi - + function gate_hook {{ + bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh {midonet-plugin} + }} + export -f gate_hook export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/jenkins/jobs/neutron-fwaas.yaml b/jenkins/jobs/neutron-fwaas.yaml index 16b0641930..09d9186c66 100644 --- a/jenkins/jobs/neutron-fwaas.yaml +++ b/jenkins/jobs/neutron-fwaas.yaml @@ -69,12 +69,8 @@ if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - if [[ "$ZUUL_BRANCH" != "stable/mitaka" ]]; then - # Note the actual url here is somewhat irrelevant because it - # caches in nodepool, however make it a valid url for - # documentation purposes. - export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas" - fi + export DEVSTACK_LOCAL_CONFIG="enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas" + function gate_hook {{ bash -xe $BASE/new/neutron-fwaas/neutron_fwaas/tests/contrib/gate_hook_tempest.sh {fwaas-version} }} @@ -86,9 +82,7 @@ export ENABLED_SERVICES="q-fwaas" fi - if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then - export -f gate_hook - fi + export -f gate_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -130,9 +124,7 @@ export DEVSTACK_GATE_TOPOLOGY="multinode" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas" - if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then - export -f gate_hook - fi + export -f gate_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -177,9 +169,7 @@ export DEVSTACK_GATE_TOPOLOGY="multinode" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas git://git.openstack.org/openstack/neutron-fwaas" - if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then - export -f gate_hook - fi + export -f gate_hook 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/neutron-vpnaas.yaml b/jenkins/jobs/neutron-vpnaas.yaml index 0ff6915b9e..9c2dac4a74 100644 --- a/jenkins/jobs/neutron-vpnaas.yaml +++ b/jenkins/jobs/neutron-vpnaas.yaml @@ -158,13 +158,8 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - if [ "$ZUUL_BRANCH" == "stable/liberty" -o "$ZUUL_BRANCH" == "stable/mitaka" ] ; then - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - else - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX="^neutron_vpnaas.tests.tempest.api\." - fi + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="^neutron_vpnaas.tests.tempest.api\." function gate_hook {{ bash -xe $BASE/new/neutron-vpnaas/neutron_vpnaas/tests/contrib/gate_hook.sh api{which} diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml index 286fd35123..0ea84e7d9a 100644 --- a/jenkins/jobs/neutron.yaml +++ b/jenkins/jobs/neutron.yaml @@ -51,13 +51,8 @@ # 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/mitaka" ] ; then - export DEVSTACK_GATE_TEMPEST_NOTESTS=1 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - else - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.api\." - fi + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.api\." function gate_hook {{ bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api{which} diff --git a/jenkins/jobs/rally.yaml b/jenkins/jobs/rally.yaml index 385c06b937..70a0bd1d54 100644 --- a/jenkins/jobs/rally.yaml +++ b/jenkins/jobs/rally.yaml @@ -142,12 +142,9 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum https://git.openstack.org/openstack/magnum" fi if [ $DEVSTACK_GATE_TELEMETRY -ne 0 ]; then - # panko exists for Newton+ only - if [[ ! "stable/mitaka" =~ $ZUUL_BRANCH ]]; then - export PROJECTS="openstack/panko $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" - export ENABLED_SERVICES+=panko-api, - fi + export PROJECTS="openstack/panko $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko" + export ENABLED_SERVICES+=panko-api, export PROJECTS="openstack/ceilometer $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" export PROJECTS="openstack/gnocchi $PROJECTS" diff --git a/jenkins/jobs/senlin.yaml b/jenkins/jobs/senlin.yaml index 1f3356e43f..9366c23a4b 100644 --- a/jenkins/jobs/senlin.yaml +++ b/jenkins/jobs/senlin.yaml @@ -34,7 +34,7 @@ services+=,g-api,g-reg services+=,n-api,n-cpu,n-cond,n-sch,n-crt # placement services mandatory for nova from ocata - if [[ ! "stable/mitaka stable/newton" =~ $ZUUL_BRANCH ]]; then + if [[ "stable/newton" != $ZUUL_BRANCH ]]; then services+=,placement-api,placement-client fi services+=,c-sch,c-api,c-vol,c-bak @@ -47,10 +47,6 @@ export SENLIN_BACKEND="openstack_test" else export SENLIN_BACKEND="openstack" - # Enable heat for mitaka (no devstack plugin available) - if [[ "$ZUUL_BRANCH" == "stable/mitaka" ]]; then - services+=,h-api,h-api-cfn,h-api-cw,h-eng - fi export PROJECTS="openstack/heat $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" diff --git a/jenkins/jobs/tacker.yaml b/jenkins/jobs/tacker.yaml index b13e1d80e6..b5f6b61d61 100644 --- a/jenkins/jobs/tacker.yaml +++ b/jenkins/jobs/tacker.yaml @@ -22,28 +22,23 @@ export PROJECTS="openstack/tacker-horizon $PROJECTS" export PROJECTS="openstack/python-tackerclient $PROJECTS" export DEVSTACK_LOCAL_CONFIG="" - case "$ZUUL_BRANCH" in - stable/mitaka) :;; - *) + export DEVSTACK_LOCAL_CONFIG+=$'\n'"SFC_UPDATE_OVS=False" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" + export PROJECTS="openstack/heat $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" + export PROJECTS="openstack/aodh $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer" + export PROJECTS="openstack/ceilometer $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-sfc http://git.trystack.cn/openstack/networking-sfc" + export PROJECTS="openstack/networking-sfc $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mistral git://git.openstack.org/openstack/mistral" + export PROJECTS="openstack/mistral $PROJECTS" + export PROJECTS="openstack/mistral-dashboard $PROJECTS" + export PROJECTS="openstack/python-mistralclient $PROJECTS" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican git://git.openstack.org/openstack/barbican" + export PROJECTS="openstack/barbican $PROJECTS" + export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"SFC_UPDATE_OVS=False" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat" - export PROJECTS="openstack/heat $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh" - export PROJECTS="openstack/aodh $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer" - export PROJECTS="openstack/ceilometer $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-sfc http://git.trystack.cn/openstack/networking-sfc" - export PROJECTS="openstack/networking-sfc $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin mistral git://git.openstack.org/openstack/mistral" - export PROJECTS="openstack/mistral $PROJECTS" - export PROJECTS="openstack/mistral-dashboard $PROJECTS" - export PROJECTS="openstack/python-mistralclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican git://git.openstack.org/openstack/barbican" - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - - esac export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin tacker git://git.openstack.org/openstack/tacker" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE