@@ -733,7 +733,7 @@ func TestCatalogImageUpdate(t *testing.T) {
733
733
734
734
// ensure registry pod is ready before attempting port-forwarding
735
735
_ = awaitPod (t , c , testNamespace , registryName , podReady )
736
-
736
+
737
737
err = registryPortForward (testNamespace )
738
738
if err != nil {
739
739
t .Fatalf ("port-forwarding local registry: %s" , err )
@@ -780,8 +780,8 @@ func TestCatalogImageUpdate(t *testing.T) {
780
780
defer cleaner .NotifyTestComplete (t , true )
781
781
782
782
sourceName := genName ("catalog-" )
783
- packageName := "etcd "
784
- channelName := "clusterwide- alpha"
783
+ packageName := "busybox "
784
+ channelName := "alpha"
785
785
786
786
// Create gRPC CatalogSource using an external registry image and poll interval
787
787
var image string
@@ -918,7 +918,7 @@ func TestCatalogImageUpdate(t *testing.T) {
918
918
require .NoError (t , err , "error awaiting registry pod" )
919
919
920
920
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 "
922
922
}
923
923
// Wait for the Subscription to succeed
924
924
subscription , err = fetchSubscription (t , crc , testNamespace , subscriptionName , subChecker )
@@ -931,17 +931,13 @@ func TestCatalogImageUpdate(t *testing.T) {
931
931
932
932
// check version of running csv to ensure the latest version (0.9.2) was installed onto the cluster
933
933
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 ,
943
938
}
944
- if ! reflect .DeepEqual (v , version.OperatorVersion {Version : etcdVersion }) {
939
+
940
+ if ! reflect .DeepEqual (v , version.OperatorVersion {Version : busyboxVersion }) {
945
941
t .Errorf ("latest version of operator not installed: catalog souce update failed" )
946
942
}
947
943
}
0 commit comments