Skip to content

Commit 64cf435

Browse files
committed
more tests
1 parent f7e9ec0 commit 64cf435

File tree

1 file changed

+49
-47
lines changed

1 file changed

+49
-47
lines changed

test/e2e/capi_test.go

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -335,58 +335,60 @@ var _ = Describe("Running the Cluster API E2E tests", func() {
335335
})
336336
}
337337

338-
Context("Running the workload cluster upgrade spec [K8s-Upgrade]", func() {
339-
capi_e2e.ClusterUpgradeConformanceSpec(ctx, func() capi_e2e.ClusterUpgradeConformanceSpecInput {
340-
return capi_e2e.ClusterUpgradeConformanceSpecInput{
341-
E2EConfig: e2eConfig,
342-
ClusterctlConfigPath: clusterctlConfigPath,
343-
BootstrapClusterProxy: bootstrapClusterProxy,
344-
ArtifactFolder: artifactFolder,
345-
SkipCleanup: skipCleanup,
346-
SkipConformanceTests: true,
347-
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
348-
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
349-
},
350-
}
338+
for range 3 {
339+
Context("Running the workload cluster upgrade spec [K8s-Upgrade]", func() {
340+
capi_e2e.ClusterUpgradeConformanceSpec(ctx, func() capi_e2e.ClusterUpgradeConformanceSpecInput {
341+
return capi_e2e.ClusterUpgradeConformanceSpecInput{
342+
E2EConfig: e2eConfig,
343+
ClusterctlConfigPath: clusterctlConfigPath,
344+
BootstrapClusterProxy: bootstrapClusterProxy,
345+
ArtifactFolder: artifactFolder,
346+
SkipCleanup: skipCleanup,
347+
SkipConformanceTests: true,
348+
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
349+
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
350+
},
351+
}
352+
})
351353
})
352-
})
353354

354-
Context("Running KCP upgrade in a HA cluster [K8s-Upgrade]", func() {
355-
capi_e2e.ClusterUpgradeConformanceSpec(context.TODO(), func() capi_e2e.ClusterUpgradeConformanceSpecInput {
356-
return capi_e2e.ClusterUpgradeConformanceSpecInput{
357-
E2EConfig: e2eConfig,
358-
ClusterctlConfigPath: clusterctlConfigPath,
359-
BootstrapClusterProxy: bootstrapClusterProxy,
360-
ArtifactFolder: artifactFolder,
361-
ControlPlaneMachineCount: ptr.To[int64](3),
362-
WorkerMachineCount: ptr.To[int64](0),
363-
SkipCleanup: skipCleanup,
364-
SkipConformanceTests: true,
365-
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
366-
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
367-
},
368-
}
355+
Context("Running KCP upgrade in a HA cluster [K8s-Upgrade]", func() {
356+
capi_e2e.ClusterUpgradeConformanceSpec(context.TODO(), func() capi_e2e.ClusterUpgradeConformanceSpecInput {
357+
return capi_e2e.ClusterUpgradeConformanceSpecInput{
358+
E2EConfig: e2eConfig,
359+
ClusterctlConfigPath: clusterctlConfigPath,
360+
BootstrapClusterProxy: bootstrapClusterProxy,
361+
ArtifactFolder: artifactFolder,
362+
ControlPlaneMachineCount: ptr.To[int64](3),
363+
WorkerMachineCount: ptr.To[int64](0),
364+
SkipCleanup: skipCleanup,
365+
SkipConformanceTests: true,
366+
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
367+
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
368+
},
369+
}
370+
})
369371
})
370-
})
371372

372-
Context("Running KCP upgrade in a HA cluster using scale in rollout [K8s-Upgrade]", func() {
373-
capi_e2e.ClusterUpgradeConformanceSpec(context.TODO(), func() capi_e2e.ClusterUpgradeConformanceSpecInput {
374-
return capi_e2e.ClusterUpgradeConformanceSpecInput{
375-
E2EConfig: e2eConfig,
376-
ClusterctlConfigPath: clusterctlConfigPath,
377-
BootstrapClusterProxy: bootstrapClusterProxy,
378-
ArtifactFolder: artifactFolder,
379-
ControlPlaneMachineCount: ptr.To[int64](3),
380-
WorkerMachineCount: ptr.To[int64](0),
381-
SkipCleanup: skipCleanup,
382-
SkipConformanceTests: true,
383-
Flavor: ptr.To("kcp-scale-in"),
384-
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
385-
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
386-
},
387-
}
373+
Context("Running KCP upgrade in a HA cluster using scale in rollout [K8s-Upgrade]", func() {
374+
capi_e2e.ClusterUpgradeConformanceSpec(context.TODO(), func() capi_e2e.ClusterUpgradeConformanceSpecInput {
375+
return capi_e2e.ClusterUpgradeConformanceSpecInput{
376+
E2EConfig: e2eConfig,
377+
ClusterctlConfigPath: clusterctlConfigPath,
378+
BootstrapClusterProxy: bootstrapClusterProxy,
379+
ArtifactFolder: artifactFolder,
380+
ControlPlaneMachineCount: ptr.To[int64](3),
381+
WorkerMachineCount: ptr.To[int64](0),
382+
SkipCleanup: skipCleanup,
383+
SkipConformanceTests: true,
384+
Flavor: ptr.To("kcp-scale-in"),
385+
ControlPlaneWaiters: clusterctl.ControlPlaneWaiters{
386+
WaitForControlPlaneInitialized: EnsureControlPlaneInitialized,
387+
},
388+
}
389+
})
388390
})
389-
})
391+
}
390392
})
391393

392394
func getPreInitFunc(ctx context.Context) func(proxy framework.ClusterProxy) {

0 commit comments

Comments
 (0)