ci: update e2e tests to include rook subscription

Update e2e tests to include rook subscription and rook csv while installing odf-operator Signed-off-by: Nikhil-Ladha <[email protected]>
red-hat-storage · Mar 18, 2024 · 5df17e7 · 5df17e7
1 parent e2e1a46
commit 5df17e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/e2e/config.go b/e2e/config.go
@@ -24,6 +24,8 @@ var (
 	NoobaClusterServiceVersion string
 	// CsiaddonsClusterServiceVersion is the name of Csiaddons csv
 	CsiaddonsClusterServiceVersion string
+	// RookClusterServiceVersion is the name of Rook csv
+	RookClusterServiceVersion string
 )
 
 var (
@@ -46,13 +48,15 @@ func init() {
 	flag.StringVar(&OcsClusterServiceVersion, "ocs-cluster-service-version", "", "The OCS CSV name which needs to verified")
 	flag.StringVar(&NoobaClusterServiceVersion, "nooba-cluster-service-version", "", "The Nooba CSV name which needs to verified")
 	flag.StringVar(&CsiaddonsClusterServiceVersion, "csiaddons-cluster-service-version", "", "The CSI Addon CSV name which needs to verified")
+	flag.StringVar(&RookClusterServiceVersion, "rook-cluster-service-version", "", "The Rook CSV name which needs to verified")
 	flag.Parse()
 
 	verifyFlags()
 
 	// A list of names of all the csvs that should be installed
 	CsvNames = []string{OdfClusterServiceVersion, OcsClusterServiceVersion,
-		NoobaClusterServiceVersion, CsiaddonsClusterServiceVersion}
+		RookClusterServiceVersion, NoobaClusterServiceVersion,
+		CsiaddonsClusterServiceVersion}
 
 	dm, err := deploymanager.NewDeployManager()
 	if err != nil {
@@ -86,4 +90,8 @@ func verifyFlags() {
 	if CsiaddonsClusterServiceVersion == "" {
 		panic("csiaddons-cluster-service-version is not provided")
 	}
+
+	if RookClusterServiceVersion == "" {
+		panic("rook-cluster-service-version is not provided")
+	}
 }
diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
@@ -10,4 +10,5 @@ cd e2e/odf && ${GINKGO} build && ./odf.test \
     --odf-cluster-service-version=odf-operator.v${VERSION} \
     --ocs-cluster-service-version=${OCS_SUBSCRIPTION_STARTINGCSV} \
     --nooba-cluster-service-version=${NOOBAA_SUBSCRIPTION_STARTINGCSV} \
-    --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV}
+    --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV} \
+    --rook-cluster-service-version=${ROOK_SUBSCRIPTION_STARTINGCSV}