update e2e test to take opm version as a parameter

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

Makefile

@@ -251,7 +251,7 @@ GINKGO_OPTS += -v -randomize-suites -race -trace --show-node-events $(if $(E2E_F
 
 .PHONY: e2e
 e2e: #HELP Run e2e tests against a cluster running OLM (params: $E2E_TEST_NS (operator), $E2E_INSTALL_NS (operator-lifecycle-manager), $E2E_CATALOG_NS (operator-lifecycle-manager), $E2E_TIMEOUT (90m), $E2E_FLAKE_ATTEMPTS (1), $TEST(undefined))
-	$(GO_TEST_ENV) $(GINKGO) -timeout $(E2E_TIMEOUT) $(GINKGO_OPTS) ./test/e2e -- -namespace=$(E2E_TEST_NS) -olmNamespace=$(E2E_INSTALL_NS) -catalogNamespace=$(E2E_CATALOG_NS) $(E2E_OPTS)
+	$(GO_TEST_ENV) $(GINKGO) -timeout $(E2E_TIMEOUT) $(GINKGO_OPTS) ./test/e2e -- -namespace=$(E2E_TEST_NS) -olmNamespace=$(E2E_INSTALL_NS) -catalogNamespace=$(E2E_CATALOG_NS) -opmVersion=$(OPERATOR_REGISTRY_VERSION) $(E2E_OPTS)
 
 .PHONY: e2e-local
 e2e-local: e2e-build kind-create deploy e2e

test/e2e/catalog_e2e_test.go

@@ -49,6 +49,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 		c                   operatorclient.ClientInterface
 		crc                 versioned.Interface
 		packageserverClient *packageserverclientset.Clientset
+		testCatalogImage    string
 	)
 
 	BeforeEach(func() {
@@ -67,6 +68,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 		c = ctx.Ctx().KubeClient()
 		crc = ctx.Ctx().OperatorClient()
 		packageserverClient = packageserverclientset.NewForConfigOrDie(ctx.Ctx().RESTConfig())
+		testCatalogImage = fmt.Sprintf("quay.io/olmtest/test-catalog:v%s", testOpmVersion)
 	})
 
 	AfterEach(func() {
@@ -704,7 +706,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 			},
 			Spec: v1alpha1.CatalogSourceSpec{
 				SourceType: v1alpha1.SourceTypeGrpc,
-				Image:      communityOperatorsImage,
+				Image:      testCatalogImage,
 				GrpcPodConfig: &v1alpha1.GrpcPodConfig{
 					SecurityContextConfig: v1alpha1.Restricted,
 				},
@@ -764,7 +766,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 			},
 			Spec: v1alpha1.CatalogSourceSpec{
 				SourceType: v1alpha1.SourceTypeGrpc,
-				Image:      communityOperatorsImage,
+				Image:      testCatalogImage,
 				GrpcPodConfig: &v1alpha1.GrpcPodConfig{
 					SecurityContextConfig: v1alpha1.Restricted,
 					ExtractContent: &v1alpha1.ExtractContentConfig{
@@ -1075,7 +1077,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 			},
 			Spec: v1alpha1.CatalogSourceSpec{
 				SourceType: v1alpha1.SourceTypeGrpc,
-				Image:      catSrcImage + ":1.0.0-with-ListBundles-method",
+				Image:      fmt.Sprintf("%s:1.0.0-with-ListBundles-method-%s", catSrcImage, testOpmVersion),
 				GrpcPodConfig: &v1alpha1.GrpcPodConfig{
 					SecurityContextConfig: v1alpha1.Restricted,
 				},
@@ -1126,8 +1128,7 @@ var _ = Describe("Starting CatalogSource e2e tests", func() {
 			if err != nil {
 				return err
 			}
-			existingSource.Spec.Image = catSrcImage + ":2.0.0-with-ListBundles-method"
-
+			existingSource.Spec.Image = fmt.Sprintf("%s:2.0.0-with-ListBundles-method-%s", catSrcImage, testOpmVersion)
 			source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Update(context.Background(), existingSource, metav1.UpdateOptions{})
 			return err
 		}).Should(Succeed())

test/e2e/e2e_test.go

@@ -38,10 +38,10 @@ var (
 	catalogNamespace = flag.String(
 		"catalogNamespace", "", "namespace where the global catalog content is stored")
 
-	communityOperators = flag.String(
-		"communityOperators",
-		"quay.io/operatorhubio/catalog:latest",
-		"reference to upstream-community-operators image",
+	opmVersion = flag.String(
+		"opmVersion",
+		"latest",
+		"opm version used by test images",
 	)
 
 	dummyImage = flag.String(
@@ -71,11 +71,11 @@ var (
 			"Note that this flag will override the kubeconfig flag.",
 	)
 
-	testdataDir             = ""
-	testNamespace           = ""
-	operatorNamespace       = ""
-	communityOperatorsImage = ""
-	globalCatalogNamespace  = ""
+	testdataDir            = ""
+	testNamespace          = ""
+	operatorNamespace      = ""
+	testOpmVersion         = ""
+	globalCatalogNamespace = ""
 )
 
 func TestEndToEnd(t *testing.T) {
@@ -104,7 +104,7 @@ var _ = BeforeSuite(func() {
 
 	testNamespace = *namespace
 	operatorNamespace = *olmNamespace
-	communityOperatorsImage = *communityOperators
+	testOpmVersion = *opmVersion
 	globalCatalogNamespace = *catalogNamespace
 	testdataDir = *testdataPath
 	deprovision = ctx.MustProvision(ctx.Ctx())