From 4808c72a39fa4a2191c800a98ae0caf931d5ea85 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Sun, 11 Mar 2018 12:21:30 +0000 Subject: [PATCH] Move 4byte_asn scenario test to basic dir Since a separate job has not been created [0], move the scenario test into the basic directory so that it will be executed there. Set TEMPEST_CONCURRENCY=1 for the basic scenario job in order to avoid resource collisions. [0] https://review.openstack.org/529256 Change-Id: Idbf2739a585473fdf1d364ad1ee263ad359fd750 --- .../tests/tempest/scenario/4byte_asn/__init__.py | 0 .../tempest/scenario/{4byte_asn => basic}/test_4byte_asn.py | 0 .../run.yaml | 2 ++ 3 files changed, 2 insertions(+) delete mode 100644 neutron_dynamic_routing/tests/tempest/scenario/4byte_asn/__init__.py rename neutron_dynamic_routing/tests/tempest/scenario/{4byte_asn => basic}/test_4byte_asn.py (100%) diff --git a/neutron_dynamic_routing/tests/tempest/scenario/4byte_asn/__init__.py b/neutron_dynamic_routing/tests/tempest/scenario/4byte_asn/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/neutron_dynamic_routing/tests/tempest/scenario/4byte_asn/test_4byte_asn.py b/neutron_dynamic_routing/tests/tempest/scenario/basic/test_4byte_asn.py similarity index 100% rename from neutron_dynamic_routing/tests/tempest/scenario/4byte_asn/test_4byte_asn.py rename to neutron_dynamic_routing/tests/tempest/scenario/basic/test_4byte_asn.py diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml index 697458c1..a0c5b9b3 100644 --- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml +++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml @@ -43,6 +43,8 @@ DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin" export DEVSTACK_LOCAL_CONFIG + # NOTE(frickler): Some tests are failing when running in parallel, likely due collisions in the docker setup + export TEMPEST_CONCURRENCY=1 function gate_hook { bash -xe $BASE/new/neutron-dynamic-routing/neutron_dynamic_routing/tests/contrib/gate_hook.sh dsvm-scenario