Merge pull request #1444 from exdx/fix/fix-catalog-polling-test

fix: use busybox csv for catalog polling e2e test

Author: openshift-merge-robot

test/e2e/catalog_e2e_test.go

@@ -774,8 +774,8 @@ var _ = Describe("Catalog", func() {
 		defer cleaner.NotifyTestComplete(GinkgoT(), true)
 
 		sourceName := genName("catalog-")
-		packageName := "etcd"
-		channelName := "clusterwide-alpha"
+		packageName := "busybox"
+		channelName := "alpha"
 
 		// Create gRPC CatalogSource using an external registry image and poll interval
 		var image string
@@ -912,7 +912,7 @@ var _ = Describe("Catalog", func() {
 		require.NoError(GinkgoT(), err, "error awaiting registry pod")
 
 		subChecker := func(sub *v1alpha1.Subscription) bool {
-			return sub.Status.InstalledCSV == "etcdoperator.v0.9.2-clusterwide"
+			return sub.Status.InstalledCSV == "busybox.v2.0.0"
 		}
 		// Wait for the Subscription to succeed
 		subscription, err = fetchSubscription(GinkgoT(), crc, testNamespace, subscriptionName, subChecker)
@@ -925,17 +925,12 @@ var _ = Describe("Catalog", func() {
 
 		// check version of running csv to ensure the latest version (0.9.2) was installed onto the cluster
 		v := csv.Spec.Version
-		etcdVersion := semver.Version{
-			Major: 0,
-			Minor: 9,
-			Patch: 2,
-			Pre: []semver.PRVersion{
-				{
-					VersionStr: "clusterwide",
-				},
-			},
+		busyboxVersion := semver.Version{
+			Major: 2,
+			Minor: 0,
+			Patch: 0,
 		}
-		if !reflect.DeepEqual(v, version.OperatorVersion{Version: etcdVersion}) {
+		if !reflect.DeepEqual(v, version.OperatorVersion{Version: busyboxVersion}) {
 			GinkgoT().Errorf("latest version of operator not installed: catalog souce update failed")
 		}
 	})