Skip to content

Commit c19a811

Browse files
exdxawgreene
authored andcommitted
fix: use busybox csv for polling e2e test
1 parent 4b9ef2c commit c19a811

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

test/e2e/catalog_e2e_test.go

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ func TestCatalogImageUpdate(t *testing.T) {
733733

734734
// ensure registry pod is ready before attempting port-forwarding
735735
_ = awaitPod(t, c, testNamespace, registryName, podReady)
736-
736+
737737
err = registryPortForward(testNamespace)
738738
if err != nil {
739739
t.Fatalf("port-forwarding local registry: %s", err)
@@ -780,8 +780,8 @@ func TestCatalogImageUpdate(t *testing.T) {
780780
defer cleaner.NotifyTestComplete(t, true)
781781

782782
sourceName := genName("catalog-")
783-
packageName := "etcd"
784-
channelName := "clusterwide-alpha"
783+
packageName := "busybox"
784+
channelName := "alpha"
785785

786786
// Create gRPC CatalogSource using an external registry image and poll interval
787787
var image string
@@ -918,7 +918,7 @@ func TestCatalogImageUpdate(t *testing.T) {
918918
require.NoError(t, err, "error awaiting registry pod")
919919

920920
subChecker := func(sub *v1alpha1.Subscription) bool {
921-
return sub.Status.InstalledCSV == "etcdoperator.v0.9.2-clusterwide"
921+
return sub.Status.InstalledCSV == "busybox.v2.0.0"
922922
}
923923
// Wait for the Subscription to succeed
924924
subscription, err = fetchSubscription(t, crc, testNamespace, subscriptionName, subChecker)
@@ -931,17 +931,13 @@ func TestCatalogImageUpdate(t *testing.T) {
931931

932932
// check version of running csv to ensure the latest version (0.9.2) was installed onto the cluster
933933
v := csv.Spec.Version
934-
etcdVersion := semver.Version{
935-
Major: 0,
936-
Minor: 9,
937-
Patch: 2,
938-
Pre: []semver.PRVersion{
939-
{
940-
VersionStr: "clusterwide",
941-
},
942-
},
934+
busyboxVersion := semver.Version{
935+
Major: 2,
936+
Minor: 0,
937+
Patch: 0,
943938
}
944-
if !reflect.DeepEqual(v, version.OperatorVersion{Version: etcdVersion}) {
939+
940+
if !reflect.DeepEqual(v, version.OperatorVersion{Version: busyboxVersion}) {
945941
t.Errorf("latest version of operator not installed: catalog souce update failed")
946942
}
947943
}

0 commit comments

Comments
 (0)