@@ -733,7 +733,6 @@ 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
-
737
736
err = registryPortForward (testNamespace )
738
737
if err != nil {
739
738
t .Fatalf ("port-forwarding local registry: %s" , err )
@@ -780,8 +779,8 @@ func TestCatalogImageUpdate(t *testing.T) {
780
779
defer cleaner .NotifyTestComplete (t , true )
781
780
782
781
sourceName := genName ("catalog-" )
783
- packageName := "etcd "
784
- channelName := "clusterwide- alpha"
782
+ packageName := "busybox "
783
+ channelName := "alpha"
785
784
786
785
// Create gRPC CatalogSource using an external registry image and poll interval
787
786
var image string
@@ -918,7 +917,7 @@ func TestCatalogImageUpdate(t *testing.T) {
918
917
require .NoError (t , err , "error awaiting registry pod" )
919
918
920
919
subChecker := func (sub * v1alpha1.Subscription ) bool {
921
- return sub .Status .InstalledCSV == "etcdoperator.v0.9.2-clusterwide "
920
+ return sub .Status .InstalledCSV == "busybox.v2.0.0 "
922
921
}
923
922
// Wait for the Subscription to succeed
924
923
subscription , err = fetchSubscription (t , crc , testNamespace , subscriptionName , subChecker )
@@ -931,17 +930,13 @@ func TestCatalogImageUpdate(t *testing.T) {
931
930
932
931
// check version of running csv to ensure the latest version (0.9.2) was installed onto the cluster
933
932
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
- },
933
+ busyboxVersion := semver.Version {
934
+ Major : 2 ,
935
+ Minor : 0 ,
936
+ Patch : 0 ,
943
937
}
944
- if ! reflect .DeepEqual (v , version.OperatorVersion {Version : etcdVersion }) {
938
+
939
+ if ! reflect .DeepEqual (v , version.OperatorVersion {Version : busyboxVersion }) {
945
940
t .Errorf ("latest version of operator not installed: catalog souce update failed" )
946
941
}
947
942
}
0 commit comments