update sno

Author: isabella-janssen

test/extended/machine_config/machine_config_node.go

@@ -277,15 +277,15 @@ func ValidateMCNConditionTransitionsOnRebootlessUpdateSNO(oc *exutil.CLI, nodeDi
 	clientSet, clientErr := machineconfigclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(clientErr).NotTo(o.HaveOccurred(), "Error creating client set for test.")
 
-	// // Remove node disruption policy on test completion or failure
-	// defer func() {
-	// 	// Apply empty MachineConfiguration fixture to remove previously set NodeDisruptionPolicy
-	// 	framework.Logf("Removing node disruption policy.")
-	// 	ApplyBootImageFixture(oc, nodeDisruptionEmptyFixture)
-	// }()
+	// Remove node disruption policy on test completion or failure
+	defer func() {
+		// Apply empty MachineConfiguration fixture to remove previously set NodeDisruptionPolicy
+		framework.Logf("Removing node disruption policy.")
+		ApplyBootImageFixture(oc, nodeDisruptionEmptyFixture)
+	}()
 
-	// // Apply a node disruption policy to allow for rebootless update
-	// ApplyBootImageFixture(oc, nodeDisruptionFixture)
+	// Apply a node disruption policy to allow for rebootless update
+	ApplyBootImageFixture(oc, nodeDisruptionFixture)
 
 	// Delete applied MC on test completion or failure
 	defer func() {
@@ -295,9 +295,9 @@ func ValidateMCNConditionTransitionsOnRebootlessUpdateSNO(oc *exutil.CLI, nodeDi
 		o.Expect(deleteMCErr).NotTo(o.HaveOccurred(), fmt.Sprintf("Could not delete MachineConfig '%v'.", mcName))
 
 		// Wait for master MCP to be ready
-		// TODO: see if there needs to be a wait before checking this update status
-		framework.Logf("Waiting for %v MCP to be updated with %v ready machines.", master, 1)
-		WaitForMCPToBeReady(oc, clientSet, worker, 1)
+		time.Sleep(15 * time.Second) //wait to not catch the updated state before the deleted mc triggers an update
+		framework.Logf("Waiting for %v MCP to be updated with %v ready machines.", poolName, 1)
+		WaitForMCPToBeReady(oc, clientSet, poolName, 1)
 	}()
 
 	// Apply MC targeting worker node