From 1d4c7d438ab31bc3f9c50b76484e6419dbf2218e Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 1 Sep 2026 17:52:29 +0200
Subject: [PATCH] Revert "STOR-3090: Select ocp-manifest vs ocp-manifest-long
 for CSI OCP test manifests (#83463)"

This reverts commit 3673beb9027b8b53425ebf081adcf041ecb62770.
---
 .../conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh | 8 ++------
 .../storage-conf-csi-azure-disk-commands.sh               | 8 ++------
 .../storage-conf-csi-azure-file-commands.sh               | 8 ++------
 .../conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh   | 8 ++------
 .../csi-aws-efs/storage-create-csi-aws-efs-commands.sh    | 8 ++------
 5 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh b/ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh
index 43ae9dfd737d0..acbdb3e1e8141 100644
--- a/ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh
+++ b/ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh
@@ -7,12 +7,8 @@ if [ -d /go/src/github.com/openshift/csi-operator/ ]; then
     echo "Using csi-operator repo"
     cd /go/src/github.com/openshift/csi-operator
     cp test/e2e/aws-ebs/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
-    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ]; then
-        if [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
-            cp test/e2e/aws-ebs/ocp-manifest-long.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        else
-            cp test/e2e/aws-ebs/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        fi
+    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ] && [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
+        cp test/e2e/aws-ebs/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
         echo "Using OCP specific manifest ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}:"
         cat ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
     fi
diff --git a/ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh b/ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh
index c9f4671df717d..25b73e00d58a1 100644
--- a/ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh
+++ b/ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh
@@ -12,12 +12,8 @@ if [ -d /go/src/github.com/openshift/csi-operator/ ]; then
         cp test/e2e/azure-disk/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
     fi
 
-    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ]; then
-        if [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
-            cp test/e2e/azure-disk/ocp-manifest-long.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        else
-            cp test/e2e/azure-disk/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        fi
+    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ] && [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
+        cp test/e2e/azure-disk/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
         echo "Using OCP specific manifest ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}:"
         cat ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
     fi
diff --git a/ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh b/ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh
index 7281de6710437..7a99678d291df 100644
--- a/ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh
+++ b/ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh
@@ -7,12 +7,8 @@ if [ -d /go/src/github.com/openshift/csi-operator/ ]; then
     echo "Using csi-operator repo"
     cd /go/src/github.com/openshift/csi-operator
     cp test/e2e/azure-file/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
-    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ]; then
-        if [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
-            cp test/e2e/azure-file/ocp-manifest-long.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        else
-            cp test/e2e/azure-file/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-        fi
+    if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ] && [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
+        cp test/e2e/azure-file/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
         echo "Using OCP specific manifest ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}:"
         cat ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
     fi
diff --git a/ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh b/ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh
index b6a7cb4443fa7..b75f6a3c796e6 100644
--- a/ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh
+++ b/ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh
@@ -34,12 +34,8 @@ if [ -f "test/e2e/${GCPPD}/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}" ]; then
     cat ${SHARED_DIR}/${TEST_VOLUME_ATTRIBUTES_CLASS_MANIFEST}
 fi
 
-if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ]; then
-    if [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
-        cp test/e2e/${GCPPD}/ocp-manifest-long.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-    else
-        cp test/e2e/${GCPPD}/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-    fi
+if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ] && [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
+    cp test/e2e/${GCPPD}/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
     echo "Using OCP specific manifest ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}:"
     cat ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
 fi
diff --git a/ci-operator/step-registry/storage/create/csi-aws-efs/storage-create-csi-aws-efs-commands.sh b/ci-operator/step-registry/storage/create/csi-aws-efs/storage-create-csi-aws-efs-commands.sh
index 8caf4d7f3ac42..fee64cea6ade3 100644
--- a/ci-operator/step-registry/storage/create/csi-aws-efs/storage-create-csi-aws-efs-commands.sh
+++ b/ci-operator/step-registry/storage/create/csi-aws-efs/storage-create-csi-aws-efs-commands.sh
@@ -71,12 +71,8 @@ EOF
 
 echo "Created cluster CSI driver object"
 
-if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ]; then
-    if [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
-        cp /usr/share/aws-efs-csi-driver/ocp-manifest-long.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-    else
-        cp /usr/share/aws-efs-csi-driver/ocp-manifest.yaml ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
-    fi
+if [ -n "${TEST_OCP_CSI_DRIVER_MANIFEST}" ] && [ "${ENABLE_LONG_CSI_CERTIFICATION_TESTS}" = "true" ]; then
+    cp /usr/share/aws-efs-csi-driver/ocp-manifest.yaml  ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
     echo "Using OCP specific manifest ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}:"
     cat ${SHARED_DIR}/${TEST_OCP_CSI_DRIVER_MANIFEST}
 fi