[System Test] verify cluster-wide-encryption key at clusterfull, noobaa rebuild and after noobaa db recovery

conf/deployment/ibmcloud/ibm_cloud_managed_3az_0m_3w_vpc_cluster.yaml

@@ -0,0 +1,30 @@
+# This is the config for IBM cloud ROKS deployment
+# for 3 AZ setup.
+---
+ENV_DATA:
+  platform: 'ibm_cloud'
+  deployment_type: 'managed'
+  region: 'eu-de'
+  zone: 'eu-de-3'
+  provider: "vpc-gen2"
+  worker_instance_type: "bx2.16x64"
+  master_replicas: 0
+  worker_replicas: 3
+  worker_availability_zones:
+    - 'eu-de-1'
+    - 'eu-de-2'
+    - 'eu-de-3'
+  rhel_workers: true
+  # Following values needs to be set in separate config and passed to ocs-ci in
+  # order to deploy OCP/OCS cluster on IBM Cloud
+  # vpc_id: VPC ID PLACEHOLDER
+  # subnet_id: SUBNET ID PLACEHOLDER
+  # cos_instance: COS INSTANCE PLACEHOLDER
+#AUTH:
+#  ibmcloud:
+#    api_key: IBM CLOUD API KEY PLACEHOLDER
+#    account_id: ACCOUNT ID PLACEHOLDER
+#    ibm_cos_access_key_id: KEY PLACEHOLDER
+#    ibm_cos_secret_access_key: SECRET PLACEHOLDER
+#DEPLOYMENT:
+#  ocs_secret_dockerconfigjson: BASE64 OF QUAY SECRET PLACEHOLDER

conf/deployment/ibmcloud/ibm_cloud_vpc_cluster.yaml

@@ -10,6 +10,8 @@ ENV_DATA:
   worker_instance_type: "bx2.16x64"
   master_replicas: 0
   worker_replicas: 3
+  worker_availability_zones:
+    - 'eu-de-3'
   rhel_workers: true
   # Following values needs to be set in separate config and passed to ocs-ci in
   # order to deploy OCP/OCS cluster on IBM Cloud

conf/examples/acm_hub_unreleased_image.yaml

@@ -1,3 +1,3 @@
 ---
 ENV_DATA:
-  acm_unreleased_image: "2.11.0-DOWNSTREAM-2024-05-09-04-23-50"
+  acm_unreleased_image: "2.12.0-DOWNSTREAM-2024-09-06-20-41-34"

conf/examples/submariner_unreleased_image.yaml

@@ -1,3 +1,3 @@
 ---
 ENV_DATA:
-  submariner_unreleased_image: "722673"
+  submariner_unreleased_image: "815324"

conf/ocsci/cluster_namespace_openshift_storage.yaml

@@ -0,0 +1,2 @@
+ENV_DATA:
+  cluster_namespace: "openshift-storage"

conf/ocsci/submariner_downstream.yaml

@@ -1,3 +1,3 @@
 ENV_DATA:
   submariner_source: "downstream"
-  subctl_version: "subctl-rhel9:v0.17"
+  subctl_version: "subctl-rhel9:v0.18"

docs/getting_started.md

@@ -4,7 +4,7 @@
 
 ## Prerequisites
 
-1. Python version >= 3.9.18
+1. Python version >= 3.9.18 < 3.12
 2. Following dependency packages for fedora/centos for successfully installing modules in virtualenv
    - gcc, git, openssl-devel, python3-devel or python specific version packages
    depends on Python version installed e.g. python39-devel (or similar packages for ubuntu).

docs/supported_platforms.md

@@ -86,6 +86,13 @@ But an example is pasted also here:
 ENV_DATA:
   vpc_id: VPC ID PLACEHOLDER
   subnet_id: SUBNET ID PLACEHOLDER
+  # Subnet id from dict below will be used if user defines worker_availability_zones
+  # This is for multi zone deployment support. So If you have worker_availability_zones and
+  # subnet_ids_per_zone defined in credential conf it will be used instead of subnet_id.
+  subnet_ids_per_zone:
+    "eu-de-1": "PLACEHOLDER_SUBNET_ID"
+    "eu-de-2": "PLACEHOLDER_SUBNET_ID"
+    "eu-de-3": "PLACEHOLDER_SUBNET_ID"
   cos_instance: COS INSTANCE PLACEHOLDER
 AUTH:
   ibmcloud:

ocs_ci/deployment/deployment.py

@@ -1550,13 +1550,9 @@ def deploy_ocs_via_operator(self, image=None):
         performance_profile = config.ENV_DATA.get("performance_profile")
         if performance_profile:
             cluster_data["spec"]["resourceProfile"] = performance_profile
-        # Bluestore-rdr for RDR greenfield deployments: 4.14 onwards until 4.16
+        # Bluestore-rdr for RDR greenfield deployments: 4.14 onwards
         if (
-            (
-                version.VERSION_4_14
-                <= version.get_semantic_ocs_version_from_config()
-                <= version.VERSION_4_16
-            )
+            (version.get_semantic_ocs_version_from_config() >= version.VERSION_4_14)
             and config.multicluster
             and (config.MULTICLUSTER.get("multicluster_mode") == "regional-dr")
             and config.ENV_DATA.get("rdr_osd_deployment_mode")
@@ -2068,13 +2064,9 @@ def deploy_ocs(self):
                     update_ntp_compute_nodes()
                 assert ceph_health_check(namespace=self.namespace, tries=60, delay=10)
 
-        # In case of RDR, check for bluestore-rdr on osds: 4.14 onwards until 4.16
+        # In case of RDR, check for bluestore-rdr on osds: 4.14 onwards
         if (
-            (
-                version.VERSION_4_14
-                <= version.get_semantic_ocs_version_from_config()
-                <= version.VERSION_4_16
-            )
+            (version.get_semantic_ocs_version_from_config() >= version.VERSION_4_14)
             and config.multicluster
             and (config.MULTICLUSTER.get("multicluster_mode") == "regional-dr")
             and config.ENV_DATA.get("rdr_osd_deployment_mode")
@@ -3750,8 +3742,8 @@ def deploy(self):
             logger.info("Creating Resource DataProtectionApplication")
             run_cmd(f"oc create -f {constants.DPA_DISCOVERED_APPS_PATH}")
         # Only on the active hub enable managedserviceaccount-preview
-        acm_version = get_acm_version()
         config.switch_acm_ctx()
+        acm_version = get_acm_version()
         logger.info("Getting S3 Secret name from Ramen Config")
         secret_names = self.meta_obj.get_s3_secret_names()
         for secret_name in secret_names:

ocs_ci/framework/conf/default_config.yaml

@@ -271,6 +271,9 @@ ENV_DATA:
   multus_destination_route: "192.168.252.0/24"
   multus_delete_csi_holder_pods: False
 
+  #RDR Green field
+  rdr_osd_deployment_mode: "greenfield"
+
   # Assisted Installer related settings
 
 # This section is related to upgrade

ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml

@@ -11,6 +11,6 @@ DEPLOYMENT:
 ENV_DATA:
   # TODO: replace with 4.17 once template is available
   vm_template: "rhcos-417.94.202405291927-0-vmware.x86_64"
-  acm_hub_channel: release-2.11
-  acm_version: "2.11"
-  submariner_version: "0.17.0"
+  acm_hub_channel: release-2.12
+  acm_version: "2.12"
+  submariner_version: "0.19.0"

ocs_ci/framework/conf/ocp_version/ocp-4.18-config.yaml

@@ -11,6 +11,6 @@ DEPLOYMENT:
 ENV_DATA:
   # TODO: replace with 4.18 once template is available
   vm_template: "rhcos-417.94.202407010929-0-vmware.x86_64"
-  acm_hub_channel: release-2.11
-  acm_version: "2.11"
-  submariner_version: "0.17.0"
+  acm_hub_channel: release-2.12
+  acm_version: "2.12"
+  submariner_version: "0.19.0"