From 2988a538254a512a562e5f263009072286761553 Mon Sep 17 00:00:00 2001
From: Vishakha Kathole <vkathole@redhat.com>
Date: Wed, 10 Jan 2024 18:21:20 +0530
Subject: [PATCH] change in secrets

Signed-off-by: Vishakha Kathole <vkathole@redhat.com>
---
 tests/cross_functional/conftest.py                | 15 ++++++++++-----
 tests/cross_functional/kcs/test_noobaa_rebuild.py |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/cross_functional/conftest.py b/tests/cross_functional/conftest.py
index 2b83665869b2..78de2e7b7283 100644
--- a/tests/cross_functional/conftest.py
+++ b/tests/cross_functional/conftest.py
@@ -6,6 +6,7 @@
 import pytest
 
 
+from ocs_ci.utility import version
 from concurrent.futures import ThreadPoolExecutor
 from threading import Event
 from ocs_ci.framework import config
@@ -141,17 +142,21 @@ def factory(
             kind="secret", namespace=config.ENV_DATA["cluster_namespace"]
         )
         secrets = [
-            "noobaa-root-master-key",
             "noobaa-admin",
             "noobaa-operator",
             "noobaa-db",
             "noobaa-server",
             "noobaa-endpoints",
         ]
-        if is_kms_enabled():
-            secrets = [
-                secret for secret in secrets if secret != "noobaa-root-master-key"
-            ]
+        if (
+            version.get_semantic_ocs_version_from_config() >= version.VERSION_4_14
+            and not is_kms_enabled()
+        ):
+            secrets.extend(
+                ["noobaa-root-master-key-backend", "noobaa-root-master-key-volume"]
+            )
+        elif not is_kms_enabled():
+            secrets.append("noobaa-root-master-key")
         secrets_yaml = [
             ocp_secret_obj.get(resource_name=f"{secret}") for secret in secrets
         ]
diff --git a/tests/cross_functional/kcs/test_noobaa_rebuild.py b/tests/cross_functional/kcs/test_noobaa_rebuild.py
index f15afbfd615b..ab2ebd7479f3 100644
--- a/tests/cross_functional/kcs/test_noobaa_rebuild.py
+++ b/tests/cross_functional/kcs/test_noobaa_rebuild.py
@@ -152,7 +152,8 @@ def test_noobaa_rebuild(self, bucket_factory):
             )
         else:
             dep_ocp.exec_oc_cmd(
-                "delete secrets noobaa-admin noobaa-endpoints noobaa-operator noobaa-server noobaa-root-master-key"
+                "delete secrets noobaa-admin noobaa-endpoints noobaa-operator noobaa-server "
+                "noobaa-root-master-key-backend noobaa-root-master-key-volume"
             )
 
         # Scale back noobaa-operator deployment