Merge pull request #5602 from sergiordlr/ocp_2090_migrate_nodedisruptionpolicy_tests

MCO-2090: migrate nodedisruptionpolicy tests from the private reposit…

Author: openshift-merge-bot[bot]

test/extended-priv/const.go

@@ -87,4 +87,12 @@ const (
 	BusyBoxImage = "quay.io/openshifttest/busybox@sha256:c5439d7db88ab5423999530349d327b04279ad3161d7596d2126dfb5b02bfd1f"
 	// AlpineImage the multiplatform alpine image stored in openshifttest
 	AlpineImage = "quay.io/openshifttest/alpine@sha256:dc1536cbff0ba235d4219462aeccd4caceab9def96ae8064257d049166890083"
+
+	// Constants for NodeDisruptionPolicy
+	NodeDisruptionPolicyActionNone         = "None"
+	NodeDisruptionPolicyActionReboot       = "Reboot"
+	NodeDisruptionPolicyActionReload       = "Reload"
+	NodeDisruptionPolicyActionRestart      = "Restart"
+	NodeDisruptionPolicyActionDrain        = "Drain"
+	NodeDisruptionPolicyActionDaemonReload = "DaemonReload"
 )

test/extended-priv/mco_machineconfignode.go

@@ -105,24 +105,25 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/longdurati
 		o.Eventually(mcn.GetDrained, "1m", "2s").Should(o.Equal("Unknown"))
 		logger.Infof("Checking Drained")
 		o.Eventually(mcn.GetDrained, "5m", "2s").Should(o.Equal("True"))
-		logger.Infof("Checking AppliedFilesAndOS Unknown")
-		o.Eventually(mcn.GetAppliedFilesAndOS, "1m", "1s").Should(o.Equal("Unknown"))
+		// This transition is too fast and we can't check it without introducing instability. It is left commented so that we know that this transition exists.
+		// logger.Infof("Checking AppliedFilesAndOS Unknown")
+		// o.Eventually(mcn.GetAppliedFilesAndOS, "1m", "1s").Should(o.Equal("Unknown"))
 		logger.Infof("Checking AppliedFilesAndOS")
 		o.Eventually(mcn.GetAppliedFilesAndOS, "3m", "2s").Should(o.Equal("True"))
 		logger.Infof("Checking UpdateExecuted")
 		o.Eventually(mcn.GetUpdateExecuted, "20s", "5s").Should(o.Equal("True"))
 		logger.Infof("Checking RebootedNode Unknown")
 		o.Eventually(mcn.GetRebootedNode, "15s", "3s").Should(o.Equal("Unknown"))
 		logger.Infof("Checking RebootedNode")
-		o.Eventually(mcn.GetRebootedNode, "5m", "5s").Should(o.Equal("True"))
+		o.Eventually(mcn.GetRebootedNode, "5m", "2s").Should(o.Equal("True"))
 		logger.Infof("Checking Resumed")
-		o.Eventually(mcn.GetResumed, "15s", "5s").Should(o.Equal("True"))
+		o.Eventually(mcn.GetResumed, "45s", "1s").Should(o.Equal("True"))
 		logger.Infof("Checking UpdateComplete")
-		o.Eventually(mcn.GetUpdateComplete, "10s", "5s").Should(o.Equal("True"))
+		o.Eventually(mcn.GetUpdateComplete, "40s", "1s").Should(o.Equal("True"))
 		logger.Infof("Checking Uncordoned")
-		o.Eventually(mcn.GetUncordoned, "10s", "2s").Should(o.Equal("True"))
+		o.Eventually(mcn.GetUncordoned, "40s", "1s").Should(o.Equal("True"))
 		logger.Infof("Checking Updated")
-		o.Eventually(mcn.GetUpdated, "1m", "5s").Should(o.Equal("True"))
+		o.Eventually(mcn.GetUpdated, "1m", "1s").Should(o.Equal("True"))
 
 	})