Skip to content

allow longer upgrade times to run tests, but continue to fail junit at 75 minutes #25411

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
deads2k merged 1 commit into from
Aug 13, 2020
Merged

allow longer upgrade times to run tests, but continue to fail junit at 75 minutes #25411

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: 14 additions & 1 deletion test/e2e/upgrade/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,10 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam

kubeClient := kubernetes.NewForConfigOrDie(config)

maximumDuration := 75 * time.Minute
// this is very long. We should update the clusteroperator junit to give us a duration.
maximumDuration := 150 * time.Minute
// if upgrades take longer than this, then we will have a junit marker indicating failure.
durationToSoftFailure := 75 * time.Minute

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

Expand Down Expand Up @@ -332,6 +335,7 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam
framework.Logf("Cluster version operator acknowledged upgrade request")
aborted := false
var lastMessage string
upgradeStarted := time.Now()
if err := wait.PollImmediate(10*time.Second, maximumDuration, func() (bool, error) {
cv, msg, err := monitor.Check(updated.Generation, desired)
if msg != "" {
Expand Down Expand Up @@ -376,6 +380,15 @@ func clusterUpgrade(f *framework.Framework, c configv1client.Interface, dc dynam

framework.Logf("Completed upgrade to %s", versionString(desired))

// record whether the cluster was fast or slow upgrading. Don't fail the test, we still want signal on the actual tests themselves.
upgradeEnded := time.Now()
upgradeDuration := upgradeEnded.Sub(upgradeStarted)
if upgradeDuration > durationToSoftFailure {
disruption.RecordJUnitResult(f, "cluster upgrade should be fast", upgradeDuration, fmt.Sprintf("Upgrade took too long: %v", upgradeDuration.Minutes()))
} else {
disruption.RecordJUnitResult(f, "cluster upgrade should be fast", upgradeDuration, "")
}

framework.Logf("Waiting on pools to be upgraded")
if err := wait.PollImmediate(10*time.Second, 30*time.Minute, func() (bool, error) {
mcps := dc.Resource(schema.GroupVersionResource{
Expand Down