Disable a buggy test

This issue is related to:
* https://bugs.launchpad.net/neutron/+bug/2033887: the patches
  previously merged in the Neutron repository [1][2] should be
  reverted.
* https://bugs.launchpad.net/neutron/+bug/2024160: this issue
  is still present.

Change-Id: Idbb1bb87d2cb0df29e4c339d810b5e1ea142d547
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 1b8c3c6..b362e42 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -8,6 +8,7 @@ COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-tes
 COPY 9df662e053.patch /tmp/9df662e053.patch
 COPY Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch /tmp/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch
 COPY Fix-str-to-str-comparison-in-live-migration-test.patch /tmp/Fix-str-to-str-comparison-in-live-migration-test.patch
+COPY Fix-the-unstable_test-syntax-for-test_live_migration.patch /tmp/Fix-the-unstable_test-syntax-for-test_live_migration.patch
 RUN apk -U upgrade && \
     apk --no-cache add --update \
         python3 py3-wheel libffi openssl libjpeg-turbo py3-pip bash \
@@ -47,11 +48,13 @@ RUN apk -U upgrade && \
         patch -p1 < /tmp/Create-new-server-in-test_create_backup.patch && \
         patch -p1 < /tmp/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch && \
         patch -p1 < /tmp/Fix-str-to-str-comparison-in-live-migration-test.patch && \
+        patch -p1 < /tmp/Fix-the-unstable_test-syntax-for-test_live_migration.patch && \
         git commit -a -m "Backport critical bugfixes" && \
         rm ~/.gitconfig) && \
     rm -r /src/requirements/.git /src/functest/.git /tmp/9df662e053.patch /tmp/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch \
         /tmp/Fix-str-to-str-comparison-in-live-migration-test.patch \
         /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch \
+        /tmp/Fix-the-unstable_test-syntax-for-test_live_migration.patch \
         /tmp/Create-new-server-in-test_create_backup.patch && \
     mkdir -p /etc/xtesting && \
     cp /src/functest/functest/ci/logging.ini /etc/xtesting/ && \

diff --git a/docker/core/Fix-the-unstable_test-syntax-for-test_live_migration.patch b/docker/core/Fix-the-unstable_test-syntax-for-test_live_migration.patch
new file mode 100644 (file)
index 0000000..b74505f
--- /dev/null
+++ b/docker/core/Fix-the-unstable_test-syntax-for-test_live_migration.patch
@@ -0,0 +1,35 @@
+From 839e900510a47056f885ff86cc31cb7096862f53 Mon Sep 17 00:00:00 2001
+From: Ghanshyam Mann <gmann@ghanshyammann.com>
+Date: Fri, 15 Sep 2023 10:23:01 -0700
+Subject: [PATCH] Fix the unstable_test syntax for
+ test_live_migration_with_trunk
+
+test_live_migration_with_trunk test was marked
+as unstable in
+- https://review.opendev.org/c/openstack/tempest/+/895167
+
+but it used the wrong syntax for unstable_test
+decorator.
+
+Change-Id: I8f4f3cafe8265984470bf45a9d85b3c9f765a251
+---
+ tempest/api/compute/admin/test_live_migration.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tempest/api/compute/admin/test_live_migration.py b/tempest/api/compute/admin/test_live_migration.py
+index 2826f56bc..96990bf87 100644
+--- a/tempest/api/compute/admin/test_live_migration.py
++++ b/tempest/api/compute/admin/test_live_migration.py
+@@ -253,6 +253,9 @@ class LiveMigrationTest(LiveMigrationTestBase):
+         port = self.ports_client.show_port(port_id)['port']
+         return port['status'] == 'ACTIVE'
+ 
++    @decorators.unstable_test(bug='2024160')
++    @decorators.unstable_test(bug='2033887')
++    @decorators.attr(type='multinode')
+     @decorators.idempotent_id('0022c12e-a482-42b0-be2d-396b5f0cffe3')
+     @utils.requires_ext(service='network', extension='trunk')
+     @utils.services('network')
+-- 
+2.51.0
+