e2e: hack commit

Signed-off-by: Praveen M <[email protected]>
ceph · Feb 26, 2025 · 42f6446 · 42f6446
1 parent c514a47
commit 42f6446
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -92,4 +92,8 @@ func handleFlags() {
 		testNFS = testCephFS
 		deployNFS = deployCephFS
 	}
+
+	if operatorDeployment {
+		cephCSINamespace = "ceph-csi-operator-system"
+	}
 }
diff --git a/scripts/deploy-ceph-csi-operator.sh b/scripts/deploy-ceph-csi-operator.sh
@@ -4,14 +4,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 # shellcheck disable=SC1091
 [ ! -e "${SCRIPT_DIR}"/utils.sh ] || source "${SCRIPT_DIR}"/utils.sh
 
-<<<<<<< Updated upstream
-OPERATOR_VERSION=${OPERATOR_VERSION:-"main"}
-=======
-# shellcheck disable=SC1091
-source "${SCRIPT_DIR}/../build.env"
-
 OPERATOR_VERSION="main"
->>>>>>> Stashed changes
 OPERATOR_URL="https://raw.githubusercontent.com/ceph/ceph-csi-operator/${OPERATOR_VERSION}"
 
 # operator deployment files