OCPBUGS-30620: csi-operator: clean up legacy test manifests (#49655)

* csi-operator: use test manifests from top-level directory

* csi-operator: build test images from common Dockerfile.test

ci-operator/config/openshift/csi-operator/openshift-csi-operator-master.yaml

@@ -33,10 +33,10 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-disk-csi-driver-operator
-- dockerfile_path: Dockerfile.aws-ebs.test
+- dockerfile_path: Dockerfile.test
   from: src
   to: aws-ebs-csi-driver-operator-test
-- dockerfile_path: Dockerfile.azure-disk.test
+- dockerfile_path: Dockerfile.test
   from: src
   to: azure-disk-csi-driver-operator-test
 - dockerfile_path: Dockerfile.azure-file
@@ -48,7 +48,7 @@ images:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
   to: azure-file-csi-driver-operator
-- dockerfile_path: Dockerfile.azure-file.test
+- dockerfile_path: Dockerfile.test
   from: src
   to: azure-file-csi-driver-operator-test
 promotion:

ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh

@@ -3,12 +3,16 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ -d /go/src/github.com/openshift/csi-operator/legacy/ ]; then
-    echo "Using legacy csi directory"
+if [ -d /go/src/github.com/openshift/csi-operator/test/e2e/aws-ebs/ ]; 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}
+elif [ -d /go/src/github.com/openshift/csi-operator/legacy/ ]; then
+    echo "Using csi-operator repo legacy dir"
     cd /go/src/github.com/openshift/csi-operator/legacy/aws-ebs-csi-driver-operator
     cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
 else
-    echo "Using regular csi directory"
+    echo "Using aws-ebs-csi-driver-operator repo"
     cd /go/src/github.com/openshift/aws-ebs-csi-driver-operator
     cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
 fi

ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh

@@ -3,12 +3,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ -d /go/src/github.com/openshift/csi-operator/legacy/ ]; then
-    echo "Using legacy csi directory"
-    cd /go/src/github.com/openshift/csi-operator/legacy/azure-disk-csi-driver-operator
-    cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
+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-disk/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
 else
-    echo "Using regular csi directory"
+    echo "Using azure-file-csi-driver-operator repo"
     cd /go/src/github.com/openshift/azure-disk-csi-driver-operator
     cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
 fi

ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh

@@ -3,12 +3,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ -d /go/src/github.com/openshift/csi-operator/legacy/ ]; then
-    echo "Using legacy csi directory"
-    cd /go/src/github.com/openshift/csi-operator/legacy/azure-file-csi-driver-operator
-    cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
+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}
 else
-    echo "Using regular csi directory"
+    echo "Using azure-file-csi-driver-operator repo"
     cd /go/src/github.com/openshift/azure-file-csi-driver-operator
     cp test/e2e/manifest.yaml ${SHARED_DIR}/${TEST_CSI_DRIVER_MANIFEST}
 fi