Pick tempest 32.0

https://docs.openstack.org/releasenotes/tempest/unreleased.html

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

diff --git a/docker/core/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch b/docker/core/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch
index df4e0e9..d312dd3 100644 (file)
--- a/docker/core/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch
+++ b/docker/core/Fix-of-wrong-parsing-of-flavour-name-and-disk_over_c.patch
@@ -1,4 +1,4 @@
-From 6a7db50238e8478ca2056901bf47f99356b282ea Mon Sep 17 00:00:00 2001
+From 4a3ff9b843e20c34fd74f7afb971991176b6ca73 Mon Sep 17 00:00:00 2001
 From: jskunda <jskunda@redhat.com>
 Date: Wed, 15 Nov 2023 15:03:12 +0100
 Subject: [PATCH 1/2] Fix of wrong parsing of flavour name and disk_over_commit
@@ -16,14 +16,14 @@ before using this parameter.
 
 Change-Id: I8f03751815021ef6d335c1d90b3f183e178ce7dc
 ---
- .../scenario/test_network_advanced_server_ops.py | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
+ .../scenario/test_network_advanced_server_ops.py  | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
-index b48ac3c86..59a6575ed 100644
+index e630e2940..73fce18a3 100644
 --- a/tempest/scenario/test_network_advanced_server_ops.py
 +++ b/tempest/scenario/test_network_advanced_server_ops.py
-@@ -202,7 +202,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
+@@ -206,7 +206,7 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
              self.assertEqual(resize_flavor, server['flavor']['id'])
          else:
              flavor = self.flavors_client.show_flavor(resize_flavor)['flavor']
@@ -32,11 +32,10 @@ index b48ac3c86..59a6575ed 100644
              for key in ['ram', 'vcpus', 'disk']:
                  self.assertEqual(flavor[key], server['flavor'][key])
          self._wait_server_status_and_check_network_connectivity(
-@@ -252,9 +252,19 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
-         block_migration = (CONF.compute_feature_enabled.
-                            block_migration_for_live_migration)
-         old_host = self.get_host_for_server(server['id'])
-+
+@@ -261,9 +261,18 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
+             floating_ip['floating_ip_address'])
+         self.useFixture(downtime_meter)
+ 
 +        migration_kwargs = {'host': None, 'block_migration': block_migration}
 +
 +        # check if microversion is less than 2.25 because of

diff --git a/docker/core/Fix-str-to-str-comparison-in-live-migration-test.patch b/docker/core/Fix-str-to-str-comparison-in-live-migration-test.patch
index 6e6dcea..3e25b1f 100644 (file)
--- a/docker/core/Fix-str-to-str-comparison-in-live-migration-test.patch
+++ b/docker/core/Fix-str-to-str-comparison-in-live-migration-test.patch
@@ -1,4 +1,4 @@
-From c39481191cf7c60e0741d825edc325522aba2a1c Mon Sep 17 00:00:00 2001
+From 45644f2f3ff64412ec5d930fe9cfdee6b9067fde Mon Sep 17 00:00:00 2001
 From: Martin Kopec <mkopec@redhat.com>
 Date: Thu, 18 Apr 2024 13:23:29 +0200
 Subject: [PATCH 2/2] Fix str to str comparison in live migration test
@@ -9,24 +9,23 @@ operation that does not work as intended. Let's fix that by using
 the tempest module created for comparing string microversions.
 
 Change-Id: Id6d18c93e8637d797404a62a23d3fcc61208fd4c
-(cherry picked from commit ba5cb852b8fb1b34a6ce31a4995b6635522f4381)
 ---
  tempest/scenario/test_network_advanced_server_ops.py | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
-index 59a6575ed..d3175771c 100644
+index 73fce18a3..9861540af 100644
 --- a/tempest/scenario/test_network_advanced_server_ops.py
 +++ b/tempest/scenario/test_network_advanced_server_ops.py
-@@ -18,6 +18,7 @@ import testtools
- from tempest.common import utils
+@@ -20,6 +20,7 @@ from tempest.common import utils
+ from tempest.common.utils import net_downtime
  from tempest.common import waiters
  from tempest import config
 +from tempest.lib.common import api_version_request
  from tempest.lib import decorators
  from tempest.scenario import manager
  
-@@ -258,8 +259,11 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
+@@ -266,8 +267,11 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
          # check if microversion is less than 2.25 because of
          # disk_over_commit is depracted since compute api version 2.25
          # if min_microversion is None, it runs on version < 2.25
@@ -35,7 +34,7 @@ index 59a6575ed..d3175771c 100644
 +        api_v = api_version_request.APIVersionRequest('2.25')
          if (CONF.compute.min_microversion is None or
 -            CONF.compute.min_microversion < 2.25):
-+            min_v < api_v):
++                min_v < api_v):
              migration_kwargs['disk_over_commit'] = False
  
          self.admin_servers_client.live_migrate_server(

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 3a44fad..5065a7a 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -8,7 +8,7 @@ xtesting===1.0.0
 git+https://github.com/PyCQA/bandit@3d0824676974e7e2e9635c10bc4f12e261f1dbdf#egg=bandit
 bandit===1.7.0
 ruamel.yaml.jinja2==0.2.2
--e git+https://opendev.org/openstack/tempest@30.1.0#egg=tempest
+-e git+https://opendev.org/openstack/tempest@32.0.0#egg=tempest
 -e git+https://opendev.org/openstack/rally.git@3.4.0#egg=rally
 git+https://opendev.org/openstack/rally-openstack.git@2.3.0#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@2ffa85af2bff3438b6b23034b6ec6ee1de481090#egg=xrally-kubernetes