Skip to content

NO-JIRA: fix: e2e: increase timeouts for storage init / verify replicas #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damdo merged 2 commits into from
Dec 6, 2025
Merged

NO-JIRA: fix: e2e: increase timeouts for storage init / verify replicas #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972b259
fix: e2e: storage init timeouts
damdo Dec 6, 2025
88ea197
fix: e2e: increase wait for replicas timeouts
damdo Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions e2e/framework/machinetemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func GetAWSMachineTemplateByPrefix(cl client.Client, prefix string, namespace st
return nil, nil
}
templateList := &awsv1.AWSMachineTemplateList{}
Eventually(komega.List(templateList, client.InNamespace(namespace))).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
Eventually(komega.List(templateList, client.InNamespace(namespace)), time.Minute, RetryShort).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)

var matches []*awsv1.AWSMachineTemplate
for i, t := range templateList.Items {
Expand All @@ -81,7 +81,7 @@ func DeleteAWSMachineTemplateByPrefix(ctx context.Context, cl client.Client, pre
return nil
}
templateList := &awsv1.AWSMachineTemplateList{}
Eventually(komega.List(templateList, client.InNamespace(namespace))).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
Eventually(komega.List(templateList, client.InNamespace(namespace)), time.Minute, RetryShort).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)

for i := range templateList.Items {
if strings.HasPrefix(templateList.Items[i].Name, prefix) {
Expand Down
4 changes: 2 additions & 2 deletions e2e/machineset_migration_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ func verifyMachinesetReplicas(machineSet client.Object, replicas int) {
switch ms := machineSet.(type) {
case *mapiv1beta1.MachineSet:
By(fmt.Sprintf("Verifying MAPI MachineSet status.Replicas is %d", replicas))
Eventually(komega.Object(ms), capiframework.WaitLong, capiframework.RetryLong).Should(
Eventually(komega.Object(ms), capiframework.WaitOverLong, capiframework.RetryLong).Should(
HaveField("Status.Replicas", Equal(int32(replicas))),
"Should have MAPI MachineSet %q replicas status eventually be %d", ms.Name, replicas)
case *clusterv1beta1.MachineSet:
By(fmt.Sprintf("Verifying CAPI MachineSet status.Replicas is %d", replicas))
Eventually(komega.Object(ms), capiframework.WaitLong, capiframework.RetryLong).Should(
Eventually(komega.Object(ms), capiframework.WaitOverLong, capiframework.RetryLong).Should(
HaveField("Status.Replicas", Equal(int32(replicas))),
"Should have CAPI MachineSet %q replicas status eventually be %d", ms.Name, replicas)
default:
Expand Down