Skip to content

Commit 31b8b47

Browse files
Zoltan SzaboZoltan Szabo
Zoltan Szabo
authored and
Zoltan Szabo
committed
ACM-19143: removed obsolete image versions from subsystem test
1 parent dc2d35a commit 31b8b47

9 files changed

+85
-136
lines changed

‎subsystem/agent_based_installer_client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var _ = Describe("RegisterClusterAndInfraEnv", func() {
2727
Expect(registerClusterErr).NotTo(HaveOccurred())
2828
Expect(network.GetApiVipById(&common.Cluster{Cluster: *modelCluster}, 0)).To(Equal("1.2.3.8"))
2929
Expect(network.GetIngressVipById(&common.Cluster{Cluster: *modelCluster}, 0)).To(Equal("1.2.3.9"))
30-
Expect(modelCluster.OpenshiftVersion).To(ContainSubstring("4.15.0"))
30+
Expect(modelCluster.OpenshiftVersion).To(ContainSubstring("4.16.0"))
3131
Expect(modelCluster.CPUArchitecture).To(Equal("x86_64"))
3232
Expect(modelCluster.Name).To(Equal("test-cluster"))
3333

@@ -49,7 +49,7 @@ var _ = Describe("RegisterClusterAndInfraEnv", func() {
4949
Expect(registerClusterErr).NotTo(HaveOccurred())
5050
Expect(network.GetApiVipById(&common.Cluster{Cluster: *modelCluster}, 0)).To(Equal("1.2.3.8"))
5151
Expect(network.GetIngressVipById(&common.Cluster{Cluster: *modelCluster}, 0)).To(Equal("1.2.3.9"))
52-
Expect(modelCluster.OpenshiftVersion).To(ContainSubstring("4.15.0"))
52+
Expect(modelCluster.OpenshiftVersion).To(ContainSubstring("4.16.0"))
5353
Expect(modelCluster.CPUArchitecture).To(Equal("x86_64"))
5454
Expect(modelCluster.InstallConfigOverrides).To(Equal(`{"fips": true}`))
5555
Expect(modelCluster.Name).To(Equal("test-cluster"))

‎subsystem/cluster_test.go

+36-60
Large diffs are not rendered by default.

‎subsystem/cluster_v2_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ var _ = Describe("[V2ClusterTests] multiarch", func() {
541541
clusterReq, err := utils_test.TestContext.User2BMClient.Installer.V2RegisterCluster(ctx, &installer.V2RegisterClusterParams{
542542
NewClusterParams: &models.ClusterCreateParams{
543543
Name: swag.String("test-cluster"),
544-
OpenshiftVersion: swag.String("4.12-multi"),
544+
OpenshiftVersion: swag.String("4.16-multi"),
545545
PullSecret: swag.String(fmt.Sprintf(psTemplate, utils_test.FakePS2)),
546546
BaseDNSDomain: "example.com",
547547
UserManagedNetworking: swag.Bool(true),
@@ -580,7 +580,7 @@ var _ = Describe("[V2ClusterTests] multiarch", func() {
580580
_, err := utils_test.TestContext.UserBMClient.Installer.RegisterInfraEnv(context.Background(), &installer.RegisterInfraEnvParams{
581581
InfraenvCreateParams: &models.InfraEnvCreateParams{
582582
Name: swag.String("test-infra-env"),
583-
OpenshiftVersion: "4.12",
583+
OpenshiftVersion: "4.16",
584584
PullSecret: swag.String(pullSecret),
585585
SSHAuthorizedKey: swag.String(utils_test.SshPublicKey),
586586
ImageType: models.ImageTypeMinimalIso,

‎subsystem/feature_support_levels_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ var _ = Describe("Feature support levels API", func() {
102102
})
103103

104104
Context("Update cluster", func() {
105-
It("Update umn true won't fail on 4.13 with multi release without infra-env", func() {
106-
cluster, err := registerNewCluster("4.13-multi", common.MultiCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
105+
It("Update umn true won't fail on 4.16 with multi release without infra-env", func() {
106+
cluster, err := registerNewCluster("4.16-multi", common.MultiCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
107107
Expect(err).NotTo(HaveOccurred())
108108
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.MultiCPUArchitecture))
109109

@@ -116,13 +116,13 @@ var _ = Describe("Feature support levels API", func() {
116116
Expect(err).NotTo(HaveOccurred())
117117
})
118118

119-
It("Update umn true fail on 4.13 with s390x with infra-env", func() {
120-
expectedError := "cannot use Cluster Managed Networking because it's not compatible with the s390x architecture on version 4.13"
121-
cluster, err := registerNewCluster("4.13-multi", common.S390xCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
119+
It("Update umn true fail on 4.16 with s390x with infra-env", func() {
120+
expectedError := "cannot use Cluster Managed Networking because it's not compatible with the s390x architecture on version 4.16"
121+
cluster, err := registerNewCluster("4.16-multi", common.S390xCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
122122
Expect(err).NotTo(HaveOccurred())
123123
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.MultiCPUArchitecture))
124124

125-
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.13", "s390x")
125+
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.16", "s390x")
126126
Expect(err).NotTo(HaveOccurred())
127127
Expect(infraEnv.Payload.CPUArchitecture).To(Equal("s390x"))
128128

@@ -138,8 +138,8 @@ var _ = Describe("Feature support levels API", func() {
138138
})
139139

140140
It("Create infra-env after updating OLM operators on s390x architecture ", func() {
141-
expectedError := "cannot use OpenShift Virtualization because it's not compatible with the s390x architecture on version 4.13"
142-
cluster, err := registerNewCluster("4.13-multi", common.S390xCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
141+
expectedError := "cannot use OpenShift Virtualization because it's not compatible with the s390x architecture on version 4.16"
142+
cluster, err := registerNewCluster("4.16-multi", common.S390xCPUArchitecture, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
143143
Expect(err).NotTo(HaveOccurred())
144144
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.MultiCPUArchitecture))
145145

@@ -155,13 +155,13 @@ var _ = Describe("Feature support levels API", func() {
155155
})
156156
Expect(err).ToNot(HaveOccurred())
157157

158-
_, err = registerNewInfraEnv(cluster.Payload.ID, "4.13", "s390x")
158+
_, err = registerNewInfraEnv(cluster.Payload.ID, "4.16", "s390x")
159159
err2 := err.(*installer.RegisterInfraEnvBadRequest)
160160
ExpectWithOffset(1, *err2.Payload.Reason).To(ContainSubstring(expectedError))
161161
})
162162
Context("UpdateInfraEnv", func() {
163163
It("Update ppc64le infra env minimal iso without cluster", func() {
164-
infraEnv, err := registerNewInfraEnv(nil, "4.12", models.ClusterCPUArchitecturePpc64le)
164+
infraEnv, err := registerNewInfraEnv(nil, "4.16", models.ClusterCPUArchitecturePpc64le)
165165
Expect(err).ToNot(HaveOccurred())
166166
Expect(common.ImageTypeValue(infraEnv.Payload.Type)).ToNot(Equal(models.ImageTypeMinimalIso))
167167

@@ -174,10 +174,10 @@ var _ = Describe("Feature support levels API", func() {
174174
Expect(common.ImageTypeValue(updatedInfraEnv.Payload.Type)).To(Equal(models.ImageTypeMinimalIso))
175175
})
176176
It("Update ppc64le infra env minimal iso with cluster", func() {
177-
cluster, err := registerNewCluster("4.12", models.ClusterCPUArchitecturePpc64le, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
177+
cluster, err := registerNewCluster("4.16", models.ClusterCPUArchitecturePpc64le, models.ClusterHighAvailabilityModeFull, swag.Bool(true))
178178
Expect(err).NotTo(HaveOccurred())
179179

180-
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.12", models.ClusterCPUArchitecturePpc64le)
180+
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.16", models.ClusterCPUArchitecturePpc64le)
181181
Expect(err).ToNot(HaveOccurred())
182182
Expect(common.ImageTypeValue(infraEnv.Payload.Type)).ToNot(Equal(models.ImageTypeMinimalIso))
183183

@@ -190,10 +190,10 @@ var _ = Describe("Feature support levels API", func() {
190190
Expect(common.ImageTypeValue(updatedInfraEnv.Payload.Type)).To(Equal(models.ImageTypeMinimalIso))
191191
})
192192
It("Update s390x infra env minimal iso with cluster - fail", func() {
193-
cluster, err := registerNewCluster("4.12", "s390x", models.ClusterHighAvailabilityModeFull, swag.Bool(true))
193+
cluster, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeFull, swag.Bool(true))
194194
Expect(err).NotTo(HaveOccurred())
195195

196-
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.12", models.ClusterCPUArchitectureS390x)
196+
infraEnv, err := registerNewInfraEnv(cluster.Payload.ID, "4.16", models.ClusterCPUArchitectureS390x)
197197
Expect(err).ToNot(HaveOccurred())
198198
Expect(common.ImageTypeValue(infraEnv.Payload.Type)).ToNot(Equal(models.ImageTypeMinimalIso))
199199

@@ -204,41 +204,41 @@ var _ = Describe("Feature support levels API", func() {
204204
}})
205205
Expect(err).To(HaveOccurred())
206206
err2 := err.(*installer.UpdateInfraEnvBadRequest)
207-
ExpectWithOffset(1, *err2.Payload.Reason).To(ContainSubstring("cannot use Minimal ISO because it's not compatible with the s390x architecture on version 4.12"))
207+
ExpectWithOffset(1, *err2.Payload.Reason).To(ContainSubstring("cannot use Minimal ISO because it's not compatible with the s390x architecture on version 4.16"))
208208
})
209209
})
210210
})
211211

212212
Context("Register cluster", func() {
213-
It("Register cluster won't fail on 4.13 with s390x", func() {
214-
cluster, err := registerNewCluster("4.13", "s390x", models.ClusterHighAvailabilityModeFull, swag.Bool(true))
213+
It("Register cluster won't fail on 4.16 with s390x", func() {
214+
cluster, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeFull, swag.Bool(true))
215215
Expect(err).NotTo(HaveOccurred())
216216
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.S390xCPUArchitecture))
217217
})
218218

219-
It("Register cluster won't fail on 4.13 with s390x without UMN", func() {
220-
cluster, err := registerNewCluster("4.13", "s390x", models.ClusterHighAvailabilityModeFull, nil)
219+
It("Register cluster won't fail on 4.16 with s390x without UMN", func() {
220+
cluster, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeFull, nil)
221221
Expect(err).NotTo(HaveOccurred())
222222
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.S390xCPUArchitecture))
223223
})
224224

225-
It("SNO with s390x 4.10 fails on architecture- failure", func() {
225+
It("SNO with s390x 4.16 fails on architecture- failure", func() {
226226
expectedError := "Requested CPU architecture s390x is not available"
227-
_, err := registerNewCluster("4.10", "s390x", models.ClusterHighAvailabilityModeNone, swag.Bool(true))
227+
_, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeNone, swag.Bool(true))
228228
Expect(err).To(HaveOccurred())
229229
err2 := err.(*installer.V2RegisterClusterBadRequest)
230230
ExpectWithOffset(1, *err2.Payload.Reason).To(ContainSubstring(expectedError))
231231
})
232-
It("SNO with s390x fails on SNO isn't compatible with architecture success on 4.13", func() {
233-
cluster, err := registerNewCluster("4.13", "s390x", models.ClusterHighAvailabilityModeNone, nil)
232+
It("SNO with s390x fails on SNO isn't compatible with architecture success on 4.16", func() {
233+
cluster, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeNone, nil)
234234
Expect(err).NotTo(HaveOccurred())
235235
Expect(cluster.Payload.CPUArchitecture).To(Equal(common.S390xCPUArchitecture))
236236
Expect(swag.StringValue(cluster.Payload.HighAvailabilityMode)).To(Equal(models.ClusterHighAvailabilityModeNone))
237237

238238
})
239-
It("SNO with s390x fails on SNO isn't compatible with architecture on 4.12 - failure", func() {
240-
expectedError := "cannot use Single Node OpenShift because it's not compatible with the s390x architecture on version 4.12"
241-
_, err := registerNewCluster("4.12", "s390x", models.ClusterHighAvailabilityModeNone, swag.Bool(true))
239+
It("SNO with s390x fails on SNO isn't compatible with architecture on 4.16 - failure", func() {
240+
expectedError := "cannot use Single Node OpenShift because it's not compatible with the s390x architecture on version 4.16"
241+
_, err := registerNewCluster("4.16", "s390x", models.ClusterHighAvailabilityModeNone, swag.Bool(true))
242242
Expect(err).To(HaveOccurred())
243243
err2 := err.(*installer.V2RegisterClusterBadRequest)
244244
ExpectWithOffset(1, *err2.Payload.Reason).To(ContainSubstring(expectedError))

‎subsystem/host_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ var _ = Describe("Host tests", func() {
3030
cluster, err = utils_test.TestContext.UserBMClient.Installer.V2RegisterCluster(ctx, &installer.V2RegisterClusterParams{
3131
NewClusterParams: &models.ClusterCreateParams{
3232
Name: swag.String("test-cluster"),
33-
OpenshiftVersion: swag.String(VipAutoAllocOpenshiftVersion),
33+
OpenshiftVersion: swag.String(defaultOpenshiftVersion),
3434
PullSecret: swag.String(pullSecret),
35-
VipDhcpAllocation: swag.Bool(true),
35+
VipDhcpAllocation: swag.Bool(false),
3636
},
3737
})
3838
Expect(err).NotTo(HaveOccurred())

‎subsystem/infra_env_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ var _ = Describe("Infra_Env", func() {
361361
Expect(contents).To(ContainSubstring("eth0"))
362362
},
363363
Entry("ocp versions greater than/ equal to MinimalVersionForNmstatectl", common.MinimalVersionForNmstatectl),
364-
Entry("ocp versions less than MinimalVersionForNmstatectl", "4.12"),
365364
)
366365

367366
It("download infra-env files invalid filename option", func() {

‎subsystem/operators_test.go

+9-32
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ var _ = Describe("Operators endpoint tests", func() {
133133
ClusterNetworks: []*models.ClusterNetwork{{Cidr: models.Subnet(clusterCIDR), HostPrefix: 23}},
134134
ServiceNetworks: []*models.ServiceNetwork{{Cidr: models.Subnet(serviceCIDR)}},
135135
Name: swag.String("test-cluster"),
136-
OpenshiftVersion: swag.String(VipAutoAllocOpenshiftVersion),
136+
OpenshiftVersion: swag.String(defaultOpenshiftVersion),
137137
PullSecret: swag.String(pullSecret),
138138
SSHPublicKey: utils_test.SshPublicKey,
139139
VipDhcpAllocation: swag.Bool(true),
140-
NetworkType: swag.String(models.ClusterCreateParamsNetworkTypeOpenShiftSDN),
140+
NetworkType: swag.String(models.ClusterCreateParamsNetworkTypeOVNKubernetes),
141141
},
142142
})
143143
Expect(err).NotTo(HaveOccurred())
@@ -267,7 +267,7 @@ var _ = Describe("Operators endpoint tests", func() {
267267
It("LSO as ODF dependency on Z CPU architecture", func() {
268268
// Register cluster with ppc64le CPU architecture
269269
cluster := registerNewCluster(
270-
"4.13.0",
270+
"4.16.0",
271271
models.ClusterHighAvailabilityModeFull,
272272
nil,
273273
swag.String(models.ClusterCPUArchitectureS390x),
@@ -280,7 +280,7 @@ var _ = Describe("Operators endpoint tests", func() {
280280
infraEnvParams := installer.RegisterInfraEnvParams{
281281
InfraenvCreateParams: &models.InfraEnvCreateParams{
282282
Name: swag.String("infra-env-1"),
283-
OpenshiftVersion: "4.13.0",
283+
OpenshiftVersion: "4.16.0",
284284
ClusterID: cluster.Payload.ID,
285285
PullSecret: swag.String(fmt.Sprintf(psTemplate, utils_test.FakePS2)),
286286
SSHAuthorizedKey: swag.String(utils_test.SshPublicKey),
@@ -338,7 +338,7 @@ var _ = Describe("Operators endpoint tests", func() {
338338

339339
It("LSO as ODF dependency on ARM arch", func() {
340340
cluster := registerNewCluster(
341-
"4.13-multi",
341+
"4.16-multi",
342342
models.ClusterHighAvailabilityModeFull,
343343
nil,
344344
swag.String(models.ClusterCPUArchitectureArm64),
@@ -350,7 +350,7 @@ var _ = Describe("Operators endpoint tests", func() {
350350
infraEnvParams := installer.RegisterInfraEnvParams{
351351
InfraenvCreateParams: &models.InfraEnvCreateParams{
352352
Name: swag.String("infra-env-1"),
353-
OpenshiftVersion: "4.13.0",
353+
OpenshiftVersion: "4.16.0",
354354
ClusterID: cluster.Payload.ID,
355355
PullSecret: swag.String(fmt.Sprintf(psTemplate, utils_test.FakePS2)),
356356
SSHAuthorizedKey: swag.String(utils_test.SshPublicKey),
@@ -380,7 +380,7 @@ var _ = Describe("Operators endpoint tests", func() {
380380

381381
It("should lvm installed as cnv dependency", func() {
382382
cluster := registerNewCluster(
383-
"4.12.0",
383+
"4.16.0",
384384
models.ClusterHighAvailabilityModeNone,
385385
[]*models.OperatorCreateParams{{Name: cnv.Operator.Name}},
386386
nil,
@@ -408,9 +408,9 @@ var _ = Describe("Operators endpoint tests", func() {
408408
))
409409
})
410410

411-
It("should lvm have right subscription name on 4.12", func() {
411+
It("should lvm have right subscription name on 4.16", func() {
412412
cluster := registerNewCluster(
413-
"4.12.0",
413+
"4.16.0",
414414
models.ClusterHighAvailabilityModeNone,
415415
[]*models.OperatorCreateParams{{Name: cnv.Operator.Name}},
416416
nil,
@@ -430,29 +430,6 @@ var _ = Describe("Operators endpoint tests", func() {
430430

431431
Expect(operatorSubscriptionName).To(Equal(lvm.LvmsSubscriptionName))
432432
})
433-
434-
It("should lvm have right subscription name on 4.11", func() {
435-
cluster := registerNewCluster(
436-
"4.11",
437-
models.ClusterHighAvailabilityModeNone,
438-
[]*models.OperatorCreateParams{{Name: lvm.Operator.Name}},
439-
nil,
440-
nil,
441-
)
442-
ops, err := utils_test.TestContext.Agent2BMClient.Operators.V2ListOfClusterOperators(ctx, opclient.NewV2ListOfClusterOperatorsParams().WithClusterID(*cluster.Payload.ID))
443-
444-
Expect(err).ToNot(HaveOccurred())
445-
446-
var operatorSubscriptionName string
447-
for _, op := range ops.GetPayload() {
448-
if op.Name == "lvm" {
449-
operatorSubscriptionName = op.SubscriptionName
450-
break
451-
}
452-
}
453-
454-
Expect(operatorSubscriptionName).To(Equal(lvm.LvmoSubscriptionName))
455-
})
456433
})
457434

458435
Context("Monitored operators", func() {

‎subsystem/subsystem_suite_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ var log *logrus.Logger
3434
var wiremock *utils_test.WireMock
3535
var kubeClient k8sclient.Client
3636
var openshiftVersion string = "4.11"
37-
var snoVersion string = "4.11"
38-
var multiarchOpenshiftVersion string = "4.11.0-multi"
39-
var dualstackVipsOpenShiftVersion string = "4.12.0"
40-
var VipAutoAllocOpenshiftVersion string = "4.14.0"
41-
var SDNNetworkTypeOpenshiftVersion string = "4.14.0"
37+
var snoVersion string = "4.16"
38+
var defaultOpenshiftVersion string = "4.16"
39+
var multiarchOpenshiftVersion string = "4.16.0-multi"
4240
var pullSecret = "{\"auths\":{\"cloud.openshift.com\":{\"auth\":\"dXNlcjpwYXNzd29yZAo=\",\"email\":\"[email protected]\"}}}" // #nosec
4341

4442
const (
@@ -144,7 +142,7 @@ func init() {
144142
client.New(badAgentClientCfg),
145143
pollDefaultInterval,
146144
pollDefaultTimeout,
147-
VipAutoAllocOpenshiftVersion,
145+
defaultOpenshiftVersion,
148146
)
149147

150148
if Options.AuthType == auth.TypeRHSSO {

‎subsystem/utils_test/subsystem_test_context.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -698,11 +698,10 @@ func (t *SubsystemTestContext) GetDefaultVmwareInventory(cidr string) *models.In
698698
func (t *SubsystemTestContext) RegisterCluster(ctx context.Context, client *client.AssistedInstall, clusterName string, pullSecret string) (strfmt.UUID, error) {
699699
var cluster, err = client.Installer.V2RegisterCluster(ctx, &installer.V2RegisterClusterParams{
700700
NewClusterParams: &models.ClusterCreateParams{
701-
Name: swag.String(clusterName),
702-
OpenshiftVersion: swag.String(t.vipAutoAllocOpenshiftVersion),
703-
PullSecret: swag.String(pullSecret),
704-
BaseDNSDomain: "example.com",
705-
VipDhcpAllocation: swag.Bool(true),
701+
Name: swag.String(clusterName),
702+
OpenshiftVersion: swag.String(t.vipAutoAllocOpenshiftVersion),
703+
PullSecret: swag.String(pullSecret),
704+
BaseDNSDomain: "example.com",
706705
},
707706
})
708707
if err != nil {

0 commit comments

Comments
 (0)