Skip to content
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

Jump to bottom

[release-4.17] OCPEDGE-1292: fix: adding in a SNO time override for AWS Metal #29192

Open
wants to merge 1 commit into
base: release-4.17
Choose a base branch
from
Open

[release-4.17] OCPEDGE-1292: fix: adding in a SNO time override for AWS Metal #29192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions test/e2e/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,21 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam
upgradeDurationLimit = time.Duration(limit) * time.Minute
}
}

// If we are running single node on an AWS metal instance, we need to use a higher timeout because metal instances take significantly longer
if infra.Status.InfrastructureTopology == configv1.SingleReplicaTopologyMode && infra.Status.PlatformStatus.Type == configv1.AWSPlatformType {
nodes, err := kubeClient.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
framework.ExpectNoError(err)

// If any nodes are AWS metal instances, override the SNO time limit with the AWS Metal limit
for _, node := range nodes.Items {
if strings.Contains(node.Labels["node.kubernetes.io/instance-type"], "metal") {
upgradeDurationLimit = 95 * time.Minute
break
}
}
}

framework.Logf("Upgrade time limit set as %0.2f", upgradeDurationLimit.Minutes())

framework.Logf("Starting upgrade to version=%s image=%s attempt=%s", version.Version.String(), version.NodeImage, uid)
Expand Down