Skip to content

Commit 5f560f8

Browse files
chrischdichrischdi
committed
e2e: make timeout for VerifyMachinesReady configurable
1 parent 218546b commit 5f560f8

20 files changed

+87
-61
lines changed

‎test/e2e/autoscaler.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,10 @@ func AutoscalerSpec(ctx context.Context, inputGetter func() AutoscalerSpecInput)
374374

375375
Byf("Verify Machines Ready condition is true")
376376
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
377-
Lister: input.BootstrapClusterProxy.GetClient(),
378-
Name: clusterResources.Cluster.Name,
379-
Namespace: clusterResources.Cluster.Namespace,
377+
Lister: input.BootstrapClusterProxy.GetClient(),
378+
Name: clusterResources.Cluster.Name,
379+
Namespace: clusterResources.Cluster.Namespace,
380+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
380381
})
381382

382383
By("PASSED!")

‎test/e2e/cluster_deletion.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,10 @@ func ClusterDeletionSpec(ctx context.Context, inputGetter func() ClusterDeletion
207207

208208
Byf("Verify Machines Ready condition is true")
209209
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
210-
Lister: input.BootstrapClusterProxy.GetClient(),
211-
Name: clusterResources.Cluster.Name,
212-
Namespace: clusterResources.Cluster.Namespace,
210+
Lister: input.BootstrapClusterProxy.GetClient(),
211+
Name: clusterResources.Cluster.Name,
212+
Namespace: clusterResources.Cluster.Namespace,
213+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
213214
})
214215

215216
// Get all objects per deletion phase and the list of blocking objects.

‎test/e2e/cluster_in_place_update.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,10 @@ func ClusterInPlaceUpdateSpec(ctx context.Context, inputGetter func() ClusterInP
199199
Namespace: clusterResources.Cluster.Namespace,
200200
})
201201
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
202-
Lister: mgmtClient,
203-
Name: clusterResources.Cluster.Name,
204-
Namespace: clusterResources.Cluster.Namespace,
202+
Lister: mgmtClient,
203+
Name: clusterResources.Cluster.Name,
204+
Namespace: clusterResources.Cluster.Namespace,
205+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
205206
})
206207

207208
var machineObjectsBeforeInPlaceUpdate machineObjects

‎test/e2e/cluster_upgrade.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,10 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
276276

277277
Byf("Verify Machines Ready condition is true")
278278
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
279-
Lister: input.BootstrapClusterProxy.GetClient(),
280-
Name: clusterResources.Cluster.Name,
281-
Namespace: clusterResources.Cluster.Namespace,
279+
Lister: input.BootstrapClusterProxy.GetClient(),
280+
Name: clusterResources.Cluster.Name,
281+
Namespace: clusterResources.Cluster.Namespace,
282+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
282283
})
283284

284285
if !input.SkipConformanceTests {

‎test/e2e/cluster_upgrade_runtimesdk.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,10 @@ func ClusterUpgradeWithRuntimeSDKSpec(ctx context.Context, inputGetter func() Cl
444444

445445
Byf("Verify Machines Ready condition is true")
446446
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
447-
Lister: input.BootstrapClusterProxy.GetClient(),
448-
Name: clusterResources.Cluster.Name,
449-
Namespace: clusterResources.Cluster.Namespace,
447+
Lister: input.BootstrapClusterProxy.GetClient(),
448+
Name: clusterResources.Cluster.Name,
449+
Namespace: clusterResources.Cluster.Namespace,
450+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
450451
})
451452

452453
By("Dumping resources and deleting the workload cluster; deletion waits for BeforeClusterDeleteHook to gate the operation")

‎test/e2e/clusterclass_changes.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,10 @@ func ClusterClassChangesSpec(ctx context.Context, inputGetter func() ClusterClas
281281

282282
Byf("Verify Machines Ready condition is true")
283283
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
284-
Lister: input.BootstrapClusterProxy.GetClient(),
285-
Name: clusterResources.Cluster.Name,
286-
Namespace: clusterResources.Cluster.Namespace,
284+
Lister: input.BootstrapClusterProxy.GetClient(),
285+
Name: clusterResources.Cluster.Name,
286+
Namespace: clusterResources.Cluster.Namespace,
287+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
287288
})
288289

289290
By("Deleting a MachineDeploymentTopology in the Cluster Topology and wait for associated MachineDeployment to be deleted")

‎test/e2e/clusterclass_rollout.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,10 @@ func ClusterClassRolloutSpec(ctx context.Context, inputGetter func() ClusterClas
311311

312312
Byf("Verify Machines Ready condition is true")
313313
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
314-
Lister: input.BootstrapClusterProxy.GetClient(),
315-
Name: clusterResources.Cluster.Name,
316-
Namespace: clusterResources.Cluster.Namespace,
314+
Lister: input.BootstrapClusterProxy.GetClient(),
315+
Name: clusterResources.Cluster.Name,
316+
Namespace: clusterResources.Cluster.Namespace,
317+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
317318
})
318319

319320
By("PASSED!")

‎test/e2e/clusterctl_upgrade.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,9 +740,10 @@ func ClusterctlUpgradeSpec(ctx context.Context, inputGetter func() ClusterctlUpg
740740

741741
Byf("[%d] Verify Machines Ready condition is true", i)
742742
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
743-
Lister: managementClusterProxy.GetClient(),
744-
Name: workloadCluster.Name,
745-
Namespace: workloadCluster.Namespace,
743+
Lister: managementClusterProxy.GetClient(),
744+
Name: workloadCluster.Name,
745+
Namespace: workloadCluster.Namespace,
746+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
746747
})
747748
}
748749

‎test/e2e/config/docker.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ intervals:
414414
default/wait-delete-cluster: ["3m", "10s"]
415415
default/wait-machine-upgrade: ["20m", "10s"]
416416
default/wait-control-plane-upgrade: ["15m", "10s"]
417+
default/wait-machine-ready: ["5m", "10s"]
417418
default/wait-machine-deployment-upgrade: ["10m", "10s"]
418419
default/wait-machine-pool-upgrade: ["5m", "10s"]
419420
default/wait-nodes-ready: ["10m", "10s"]

‎test/e2e/k8s_conformance.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,10 @@ func K8SConformanceSpec(ctx context.Context, inputGetter func() K8SConformanceSp
162162

163163
Byf("Verify Machines Ready condition is true")
164164
framework.VerifyMachinesReady(ctx, framework.VerifyMachinesReadyInput{
165-
Lister: input.BootstrapClusterProxy.GetClient(),
166-
Name: clusterResources.Cluster.Name,
167-
Namespace: clusterResources.Cluster.Namespace,
165+
Lister: input.BootstrapClusterProxy.GetClient(),
166+
Name: clusterResources.Cluster.Name,
167+
Namespace: clusterResources.Cluster.Namespace,
168+
WaitIntervals: input.E2EConfig.GetIntervals(specName, "wait-machine-ready"),
168169
})
169170

170171
By("PASSED!")

0 commit comments

Comments
 (0)