diff --git a/e2e/config.go b/e2e/config.go index 544a1b30b..2066c6924 100644 --- a/e2e/config.go +++ b/e2e/config.go @@ -18,6 +18,8 @@ var ( OdfClusterUninstall bool // OdfClusterServiceVersion is the name of odf csv OdfClusterServiceVersion string + // OdfDepsClusterServiceVersion is the name of the odf-dependency csv + OdfDepsClusterServiceVersion string // OcsClusterServiceVersion is the name of ocs csv OcsClusterServiceVersion string // OcsClientClusterServiceVersion is the name of ocs-client csv @@ -53,6 +55,7 @@ func init() { flag.BoolVar(&OdfOperatorInstall, "odf-operator-install", true, "Install the ODF operator before starting tests") flag.BoolVar(&OdfClusterUninstall, "odf-operator-uninstall", true, "Uninstall the ODF operator after test completion") flag.StringVar(&OdfClusterServiceVersion, "odf-cluster-service-version", "", "The ODF CSV name which needs to verified") + flag.StringVar(&OdfDepsClusterServiceVersion, "odf-deps-cluster-service-version", "", "The ODF deps CSV name which needs to verified") flag.StringVar(&OcsClusterServiceVersion, "ocs-cluster-service-version", "", "The OCS CSV name which needs to verified") 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") @@ -93,6 +96,10 @@ func verifyFlags() { panic("odf-cluster-service-version is not provided") } + if OdfDepsClusterServiceVersion == "" { + panic("odf-deps-cluster-service-version is not provided") + } + if OcsClusterServiceVersion == "" { panic("ocs-cluster-service-version is not provided") } diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh index c7780d0c0..e01e07f4f 100755 --- a/hack/e2e-test.sh +++ b/hack/e2e-test.sh @@ -8,6 +8,7 @@ cd e2e/odf && ${GINKGO} build && ./odf.test \ --odf-operator-install=${ODF_OPERATOR_INSTALL} \ --odf-operator-uninstall=${ODF_OPERATOR_UNINSTALL} \ --odf-cluster-service-version=odf-operator.v${VERSION} \ + --odf-deps-cluster-service-version=odf-dependencies.v${VERSION} \ --ocs-cluster-service-version=${OCS_SUBSCRIPTION_STARTINGCSV} \ --ocs-client-cluster-service-version=${OCS_CLIENT_SUBSCRIPTION_STARTINGCSV} \ --nooba-cluster-service-version=${NOOBAA_SUBSCRIPTION_STARTINGCSV} \