diff --git a/e2e/config.go b/e2e/config.go index 197f74340..544a1b30b 100644 --- a/e2e/config.go +++ b/e2e/config.go @@ -26,6 +26,8 @@ var ( NoobaClusterServiceVersion string // CsiaddonsClusterServiceVersion is the name of Csiaddons csv CsiaddonsClusterServiceVersion string + // CephCsiClusterServiceVersion is the name of Csiaddons csv + CephCsiClusterServiceVersion string // RookClusterServiceVersion is the name of Rook csv RookClusterServiceVersion string // PrometheusClusterService version is the name of the Prometheus csv @@ -55,6 +57,7 @@ func init() { flag.StringVar(&OcsClientClusterServiceVersion, "ocs-client-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(&CephCsiClusterServiceVersion, "cephcsi-cluster-service-version", "", "The CEPH CSI 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.StringVar(&RecipeClusterServiceVersion, "recipe-cluster-service-version", "", "The Recipe CSV name which needs to verified") @@ -63,9 +66,11 @@ func init() { verifyFlags() // A list of names of all the csvs that should be installed - CsvNames = []string{OdfClusterServiceVersion, OcsClusterServiceVersion, OcsClientClusterServiceVersion, + CsvNames = []string{OdfClusterServiceVersion, + OcsClusterServiceVersion, OcsClientClusterServiceVersion, RookClusterServiceVersion, NoobaClusterServiceVersion, - CsiaddonsClusterServiceVersion, PrometheusClusterServiceVersion, RecipeClusterServiceVersion} + CsiaddonsClusterServiceVersion, CephCsiClusterServiceVersion, + PrometheusClusterServiceVersion, RecipeClusterServiceVersion} dm, err := deploymanager.NewDeployManager() if err != nil { @@ -104,6 +109,10 @@ func verifyFlags() { panic("csiaddons-cluster-service-version is not provided") } + if CephCsiClusterServiceVersion == "" { + panic("cephcsi-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 index 011573525..c7780d0c0 100755 --- a/hack/e2e-test.sh +++ b/hack/e2e-test.sh @@ -12,6 +12,7 @@ cd e2e/odf && ${GINKGO} build && ./odf.test \ --ocs-client-cluster-service-version=${OCS_CLIENT_SUBSCRIPTION_STARTINGCSV} \ --nooba-cluster-service-version=${NOOBAA_SUBSCRIPTION_STARTINGCSV} \ --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV} \ + --cephcsi-cluster-service-version=${CEPHCSI_SUBSCRIPTION_STARTINGCSV} \ --rook-cluster-service-version=${ROOK_SUBSCRIPTION_STARTINGCSV} \ --prometheus-cluster-service-version=${PROMETHEUS_SUBSCRIPTION_STARTINGCSV} \ --recipe-cluster-service-version=${RECIPE_SUBSCRIPTION_STARTINGCSV}