From b219d0664438808279aab105b1b8bea3fe645bb2 Mon Sep 17 00:00:00 2001 From: James Parker Date: Thu, 6 Jun 2024 20:05:10 +0000 Subject: [PATCH] Revert "Evalute adding serial decorator to tests" This reverts commit ff141126db4bd96843367b6bee386fd8e463b018. Reason for revert: Serial changes were at class level and not on a per test level when evaluating upstream. Change-Id: Ib5607eefde5a97b535f8f544775cbb250355ed0c --- .zuul.yaml | 2 ++ whitebox_tempest_plugin/api/compute/base.py | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index eba1913a..bcfa5362 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -47,6 +47,7 @@ - ^test-requirements.txt$ vars: tox_envlist: all + tempest_concurrency: 1 tempest_test_regex: ^whitebox_tempest_plugin\. # NOTE(jparker) in order for guest to boot via UEFI, the host will need the # open source implementation of UEFI for VMs via the OVMF package. In @@ -152,6 +153,7 @@ - ^whitebox_tempest_plugin/api/compute/(?!test_rbd_direct_download).*py$ vars: tox_envlist: all + tempest_concurrency: 1 compute_node_template_name: whitebox-devstack-ceph-multinode.yaml.j2 devstack_plugins: whitebox-tempest-plugin: https://opendev.org/openstack/whitebox-tempest-plugin.git diff --git a/whitebox_tempest_plugin/api/compute/base.py b/whitebox_tempest_plugin/api/compute/base.py index 87e93cf4..9ba1c00f 100644 --- a/whitebox_tempest_plugin/api/compute/base.py +++ b/whitebox_tempest_plugin/api/compute/base.py @@ -37,11 +37,6 @@ LOG = logging.getLogger(__name__) class BaseWhiteboxComputeTest(base.BaseV2ComputeAdminTest): - # Decorator support for serial does not land into tempest until 34.0.0. - # Explicitly setting _serial to True instead of using the decorator to - # avoid clashing with downstream execution. - _serial = True - def create_test_server(self, *args, **kwargs): """Whitebox is able to completely fill its compute hosts because it runs with things like PCI devices and dedicated CPUs. Because of that