From af939e90bc23a52bcbf1540b5d6a866f8bae954d Mon Sep 17 00:00:00 2001
From: suchita-g <sgatfane@redhat.com>
Date: Tue, 14 Nov 2023 01:27:59 +0530
Subject: [PATCH] PR for Running from jenkins for provider-client

Signed-off-by: suchita-g <sgatfane@redhat.com>
---
 .../client_bm_upi_1az_rhcos_nvme_3m_3w.yaml   | 12 ++++++++++
 .../provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml | 13 ++++++++++
 tests/conftest.py                             | 24 +++++++++----------
 ...eate_scale_pods_and_pvcs_using_kube_job.py |  5 ++++
 4 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 conf/deployment/fusion_hci_pc/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml
 create mode 100644 conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml

diff --git a/conf/deployment/fusion_hci_pc/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml b/conf/deployment/fusion_hci_pc/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml
new file mode 100644
index 000000000000..2e4b525f5d20
--- /dev/null
+++ b/conf/deployment/fusion_hci_pc/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml
@@ -0,0 +1,12 @@
+---
+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+  local_storage: true
+ENV_DATA:
+  platform: 'baremetal'
+  cluster_type: 'provider'
+  cluster_namespace: "openshift-storage-client"
+  deployment_type: 'upi'
+  worker_replicas: 3
+  mon_type: 'hostpath'
+  osd_type: 'nvme'
diff --git a/conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml b/conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml
new file mode 100644
index 000000000000..418915b662b8
--- /dev/null
+++ b/conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml
@@ -0,0 +1,13 @@
+---
+DEPLOYMENT:
+  allow_lower_instance_requirements: false
+  local_storage: true
+ENV_DATA:
+  platform: 'baremetal'
+  cluster_type: 'provider'
+  cluster_namespace: "openshift-storage"
+  deployment_type: 'upi'
+  worker_replicas: 3
+  master_replicas: 3
+  mon_type: 'hostpath'
+  osd_type: 'nvme'
diff --git a/tests/conftest.py b/tests/conftest.py
index 2dd59757939b..4f97d19debad 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -131,7 +131,7 @@
     skipif_ocp_version,
     skipif_ocs_version,
     TimeoutSampler,
-    skipif_upgraded_from,
+    # skipif_upgraded_from,
     update_container_with_mirrored_image,
     skipif_ui_not_support,
     run_cmd,
@@ -311,9 +311,9 @@ def pytest_collection_modifyitems(session, config, items):
         for item in items[:]:
             skipif_ocp_version_marker = item.get_closest_marker("skipif_ocp_version")
             skipif_ocs_version_marker = item.get_closest_marker("skipif_ocs_version")
-            skipif_upgraded_from_marker = item.get_closest_marker(
-                "skipif_upgraded_from"
-            )
+            # skipif_upgraded_from_marker = item.get_closest_marker(
+            #    "skipif_upgraded_from"
+            # )
             skipif_no_kms_marker = item.get_closest_marker("skipif_no_kms")
             skipif_ui_not_support_marker = item.get_closest_marker(
                 "skipif_ui_not_support"
@@ -344,14 +344,14 @@ def pytest_collection_modifyitems(session, config, items):
                     log.debug(f"Test: {item} will be skipped due to {skip_condition}")
                     items.remove(item)
                     continue
-            if skipif_upgraded_from_marker:
-                skip_args = skipif_upgraded_from_marker.args
-                if skipif_upgraded_from(skip_args[0]):
-                    log.debug(
-                        f"Test: {item} will be skipped because the OCS cluster is"
-                        f" upgraded from one of these versions: {skip_args[0]}"
-                    )
-                    items.remove(item)
+            # if skipif_upgraded_from_marker:
+            #    skip_args = skipif_upgraded_from_marker.args
+            #    if skipif_upgraded_from(skip_args[0]):
+            #        log.debug(
+            #            f"Test: {item} will be skipped because the OCS cluster is"
+            #            f" upgraded from one of these versions: {skip_args[0]}"
+            #        )
+            #        items.remove(item)
             if skipif_no_kms_marker:
                 try:
                     if not is_kms_enabled(dont_raise=True):
diff --git a/tests/e2e/workloads/test_create_scale_pods_and_pvcs_using_kube_job.py b/tests/e2e/workloads/test_create_scale_pods_and_pvcs_using_kube_job.py
index 958592b7e400..3f04d816052e 100644
--- a/tests/e2e/workloads/test_create_scale_pods_and_pvcs_using_kube_job.py
+++ b/tests/e2e/workloads/test_create_scale_pods_and_pvcs_using_kube_job.py
@@ -13,8 +13,11 @@
     skipif_external_mode,
     ipi_deployment_required,
     ms_provider_and_consumer_required,
+    hci_provider_and_client_required,
     skipif_ms_provider_and_consumer,
+    # skipif_hci_provider_and_client,
     ms_consumer_required,
+    # hci_client_required,
     skipif_bm,
     magenta_squad,
 )
@@ -67,6 +70,7 @@ def test_create_scale_pods_and_pvcs_using_kube_job(
         log.info("The resources created successfully using the kube job")
 
     @ms_provider_and_consumer_required
+    @hci_provider_and_client_required
     def test_create_scale_pods_and_pvcs_using_kube_job_ms(
         self, create_scale_pods_and_pvcs_using_kube_job
     ):
@@ -121,6 +125,7 @@ def test_create_scale_pods_and_pvcs_with_ms_consumer(
 @tier1
 @ignore_leftovers
 @ms_provider_and_consumer_required
+@hci_provider_and_client_required
 class TestCreateScalePodsAndPvcsUsingKubeJobWithMSConsumers(ManageTest):
     """
     Test create scale pods and PVCs using a kube job with MS consumers