Merge "CI: Increment jobs for 2025.1 release"
diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
index a0bcfc3..e3a9a58 100644
--- a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
@@ -178,6 +178,9 @@
# CUSTOM_ prefix. Normalise it.
node_resource_class = node['resource_class']
node_resource_class = node_resource_class.upper()
+ node_resource_class = node_resource_class.translate(
+ str.maketrans(" -.:", "____", "!@#$%^&*()+=/\\?<>|\"'")
+ )
node_resource_class = 'CUSTOM_' + node_resource_class
self.assertEqual(resource_class, node_resource_class)
diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py
index b347431..1afd667 100644
--- a/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py
+++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py
@@ -118,6 +118,7 @@
clients=self.os_primary,
keypair=keypair,
net_id=network['id'],
+ fixed_ip='10.0.100.101',
)
fixed_ip1 = instance1['addresses'][network['name']][0]['addr']
floating_ip1 = self.create_floating_ip(
@@ -132,7 +133,8 @@
clients=self.os_alt,
key_name=alt_keypair['name'],
flavor=CONF.compute.flavor_ref_alt,
- networks=[{'uuid': alt_network['id']}]
+ networks=[{'uuid': alt_network['id'],
+ 'fixed_ip': '10.0.100.102'}],
)
else:
# Create BM
@@ -140,6 +142,7 @@
keypair=alt_keypair,
clients=self.os_alt,
net_id=alt_network['id'],
+ fixed_ip='10.0.100.102',
)
fixed_ip2 = alt_instance['addresses'][alt_network['name']][0]['addr']
alt_floating_ip = self.create_floating_ip(