ci: update e2e test to include prometheus subscription and csv

Signed-off-by: Kaustav Majumder <[email protected]>
red-hat-storage · Mar 21, 2024 · 61e4eac · 61e4eac
1 parent 097beef
commit 61e4eac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/e2e/config.go b/e2e/config.go
@@ -26,6 +26,8 @@ var (
 	CsiaddonsClusterServiceVersion string
 	// RookClusterServiceVersion is the name of Rook csv
 	RookClusterServiceVersion string
+	// PrometheusClusterService version is the name of the Prometheus csv
+	PrometheusClusterServiceVersion string
 )
 
 var (
@@ -49,14 +51,15 @@ func init() {
 	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.StringVar(&PrometheusClusterServiceVersion, "prometheus-cluster-service-version", "", "The Prometheus 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,
 		RookClusterServiceVersion, NoobaClusterServiceVersion,
-		CsiaddonsClusterServiceVersion}
+		CsiaddonsClusterServiceVersion, PrometheusClusterServiceVersion}
 
 	dm, err := deploymanager.NewDeployManager()
 	if err != nil {
@@ -94,4 +97,8 @@ func verifyFlags() {
 	if RookClusterServiceVersion == "" {
 		panic("rook-cluster-service-version is not provided")
 	}
+
+	if PrometheusClusterServiceVersion == "" {
+		panic("prometheus-cluster-service-version is not provided")
+	}
 }
diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
@@ -11,4 +11,5 @@ cd e2e/odf && ${GINKGO} build && ./odf.test \
     --ocs-cluster-service-version=${OCS_SUBSCRIPTION_STARTINGCSV} \
     --nooba-cluster-service-version=${NOOBAA_SUBSCRIPTION_STARTINGCSV} \
     --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV} \
-    --rook-cluster-service-version=${ROOK_SUBSCRIPTION_STARTINGCSV}
+    --rook-cluster-service-version=${ROOK_SUBSCRIPTION_STARTINGCSV} \
+    --prometheus-cluster-service-version=${PROMETHEUS_SUBSCRIPTION_STARTINGCSV}