Merge "Fix deploy template tests on Rocky and earlier"
diff --git a/ironic_tempest_plugin/tests/api/admin/test_allocations.py b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
index 4e48374..a6e8e9c 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_allocations.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_allocations.py
@@ -10,8 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import random
-
+from oslo_utils import uuidutils
from tempest import config
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
@@ -37,7 +36,7 @@
# Generate a resource class to prevent parallel tests from clashing
# with each other.
- self.resource_class = 'x-small-%d' % random.randrange(1024)
+ self.resource_class = uuidutils.generate_uuid()
_, self.chassis = self.create_chassis()
_, self.node = self.create_node(self.chassis['uuid'],
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d37a135..aff85eb 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,10 +6,7 @@
check:
jobs:
# NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
- # marking ironic-standalone non voting until we can run ansible
- # with python3 interpreter on remote machines
- - ironic-standalone:
- voting: false
+ - ironic-standalone
- ironic-dsvm-standalone-rocky
- ironic-dsvm-standalone-queens
- ironic-dsvm-standalone-pike:
@@ -40,9 +37,7 @@
gate:
queue: ironic
jobs:
- # removing ironic-standalone from gate until we can run ansible
- # with python3 interpreter on remote machines
- # - ironic-standalone
+ - ironic-standalone
- ironic-dsvm-standalone-rocky
- ironic-dsvm-standalone-queens
- ironic-tempest-functional-python3