Merge "Use the main introspection test instead of the smoke one"
diff --git a/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py b/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
index 8ae92e9..f97316d 100644
--- a/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
+++ b/ironic_tempest_plugin/tests/scenario/test_introspection_basic.py
@@ -57,6 +57,7 @@
interval=self.wait_provisioning_state_interval)
@decorators.idempotent_id('03bf7990-bee0-4dd7-bf74-b97ad7b52a4b')
+ @decorators.attr(type='smoke')
@utils.services('compute', 'image', 'network')
def test_baremetal_introspection(self):
"""This smoke test case follows this set of operations:
@@ -144,33 +145,3 @@
# verify nodes status and provision state
for node_id in self.node_ids:
self.verify_introspection_aborted(node_id)
-
-
-class InspectorSmokeTest(introspection_manager.InspectorScenarioTest):
-
- @decorators.idempotent_id('a702d1f1-88e4-42ce-88ef-cba2d9e3312e')
- @decorators.attr(type='smoke')
- @utils.services('object_storage')
- def test_baremetal_introspection(self):
- """This smoke test case follows this very basic set of operations:
-
- * Fetches expected properties from baremetal flavor
- * Removes all properties from one node
- * Sets the node to manageable state
- * Inspects the node
- * Sets the node to available state
-
- """
- # NOTE(dtantsur): we can't silently skip this test because it runs in
- # grenade with several other tests, and we won't have any indication
- # that it was not run.
- assert self.node_ids, "No available nodes"
- node_id = next(iter(self.node_ids))
- self.introspect_node(node_id)
-
- # settle down introspection
- self.wait_for_introspection_finished([node_id])
- self.wait_provisioning_state(
- node_id, 'manageable',
- timeout=CONF.baremetal_introspection.ironic_sync_timeout,
- interval=self.wait_provisioning_state_interval)
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7b84ec7..a1f312c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -12,9 +12,6 @@
- ironic-tempest-dsvm-ironic-inspector-queens
- ironic-tempest-dsvm-ironic-inspector-pike
- ironic-tempest-dsvm-ironic-inspector-ocata
- - ironic-inspector-grenade-dsvm
- - ironic-inspector-grenade-dsvm-queens
- - ironic-inspector-grenade-dsvm-pike
gate:
jobs:
- ironic-dsvm-standalone
@@ -28,6 +25,3 @@
- ironic-tempest-dsvm-ironic-inspector-queens
- ironic-tempest-dsvm-ironic-inspector-pike
- ironic-tempest-dsvm-ironic-inspector-ocata
- - ironic-inspector-grenade-dsvm
- - ironic-inspector-grenade-dsvm-queens
- - ironic-inspector-grenade-dsvm-pike
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 9f3d1db..7a9150a 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -38,13 +38,3 @@
name: ironic-tempest-dsvm-ironic-inspector-ocata
parent: ironic-tempest-dsvm-ironic-inspector
override-checkout: stable/ocata
-
-- job:
- name: ironic-inspector-grenade-dsvm-queens
- parent: ironic-inspector-grenade-dsvm
- override-checkout: stable/queens
-
-- job:
- name: ironic-inspector-grenade-dsvm-pike
- parent: ironic-inspector-grenade-dsvm
- override-checkout: stable/pike