Add support to reuse tests in upgrade and install scenarios (#697)

Author: dbasunag

conftest.py

@@ -244,11 +244,17 @@ def _add_upgrade_test(_item: Item, _upgrade_deployment_modes: list[str]) -> bool
             _item=item, _upgrade_deployment_modes=upgrade_deployment_modes
         ):
             pre_upgrade_tests.append(item)
+            # Add support to be able to reuse tests in both upgrade and fresh install scenarios
+            if "install" in item.keywords:
+                non_upgrade_tests.append(item)
 
         elif "post_upgrade" in item.keywords and _add_upgrade_test(
             _item=item, _upgrade_deployment_modes=upgrade_deployment_modes
         ):
             post_upgrade_tests.append(item)
+            # Add support to be able to reuse tests in both upgrade and fresh install scenarios
+            if "install" in item.keywords:
+                non_upgrade_tests.append(item)
 
         else:
             non_upgrade_tests.append(item)

pytest.ini

@@ -22,6 +22,7 @@ markers =
     downstream_only: Tests that are specific to downstream
     cluster_health: Tests that verifies that cluster is healthy to begin testing
     skip_must_gather: Tests that does not require must-gather for triaging
+    install: Tests that are relevant for install scenario. To be used with upgrade marker, to indicate tests that are valid for both install and upgrade
 
     # Model server
     modelmesh: Mark tests which are model mesh tests

tests/model_registry/model_catalog/test_default_model_catalog.py

@@ -77,6 +77,8 @@ def test_config_map_exists(self: Self, model_catalog_config_map: ConfigMap):
             ),
         ],
     )
+    @pytest.mark.post_upgrade
+    @pytest.mark.install
     def test_model_catalog_resources_exists(
         self: Self, admin_client: DynamicClient, model_registry_namespace: str, resource_name: Any
     ):