Merge pull request #29960 from dgrisonnet/OCPBUGS-57032

OCPBUGS-57032: upgrade.go: wait some time after node upgrade

Author: sdodson

test/e2e/upgrade/upgrade.go

@@ -188,6 +188,9 @@ var _ = g.Describe("[sig-arch][Feature:ClusterUpgrade]", func() {
 						clusterUpgrade(f, client, dynamicClient, config, upgCtx.Versions[i]),
 						fmt.Sprintf("during upgrade to %s", upgCtx.Versions[i].NodeImage))
 				}
+				// Sleep to give some time to the workloads on the last upgraded
+				// node to restart.
+				time.Sleep(5 * time.Second)
 			},
 		)
 	})
@@ -196,18 +199,7 @@ var _ = g.Describe("[sig-arch][Feature:ClusterUpgrade]", func() {
 		config, err := framework.LoadConfig()
 		framework.ExpectNoError(err)
 		client := configv1client.NewForConfigOrDie(config)
-		var lastErr error
-		err = wait.PollImmediate(1*time.Second, 30*time.Second, func() (bool, error) {
-			if err := checkUpgradeability(client); err != nil {
-				lastErr = err
-				framework.Logf("Upgradeability check failed, retrying: %v", err)
-				return false, nil // retry on error
-			}
-			return true, nil
-		})
-		if err != nil && lastErr != nil {
-			err = lastErr
-		}
+		err = checkUpgradeability(client)
 		framework.ExpectNoError(err)
 	})
 })