Merge pull request #29938 from isabella-janssen/ocpbugs-58036

OCPBUGS-58036: Fix MCN test on agent compact FIPS jobs

Author: openshift-merge-bot[bot]

test/extended/machine_config/helpers.go

@@ -149,6 +149,24 @@ func skipOnMetal(oc *exutil.CLI) {
 	}
 }
 
+// `GetRolesToTest` gets the MCPs in a cluster with nodes associated to it. This allows a more robust way to determine
+// the roles to use when selecting nodes and testing their MCP associations in an MCN.
+func GetRolesToTest(oc *exutil.CLI, machineConfigClient *machineconfigclient.Clientset) []string {
+	// Get MCPs
+	mcps, mcpErr := machineConfigClient.MachineconfigurationV1().MachineConfigPools().List(context.TODO(), metav1.ListOptions{})
+	o.Expect(mcpErr).NotTo(o.HaveOccurred(), "Error getting MCPs.")
+
+	// For any MCP with machines, add the MCP name as a role to test.
+	var rolesToTest []string
+	for _, mcp := range mcps.Items {
+		if mcp.Status.MachineCount > 0 {
+			rolesToTest = append(rolesToTest, mcp.Name)
+		}
+	}
+
+	return rolesToTest
+}
+
 // getRandomMachineSet picks a random machineset present on the cluster
 func getRandomMachineSet(machineClient *machineclient.Clientset) machinev1beta1.MachineSet {
 	machineSets, err := machineClient.MachineV1beta1().MachineSets("openshift-machine-api").List(context.TODO(), metav1.ListOptions{})

test/extended/machine_config/machine_config_node.go

@@ -53,18 +53,7 @@ var _ = g.Describe("[Suite:openshift/machine-config-operator/disruptive][sig-mco
 	})
 
 	g.It("[Suite:openshift/conformance/parallel]Should have MCN properties matching associated node properties for nodes in default MCPs [apigroup:machineconfiguration.openshift.io]", func() {
-		if IsSingleNode(oc) || IsTwoNode(oc) { //handle SNO & two-node clusters
-			// In SNO and standard two-node openshift clusters, the nodes have both worker and master roles, but are a part
-			// of the master MCP. Thus, the tests for these clusters will be limited to checking master MCP association.
-			ValidateMCNPropertiesByMCPs(oc, []string{master})
-		} else if IsTwoNodeArbiter(oc) { //handle two-node arbiter clusters
-			// In two-node arbiter openshift clusters, there are two nodes have both worker and master roles, but are a part
-			// of the master MCP. There is also a third "arbiter" node. Thus, these clusters should be tests for both master
-			// and arbiter MCP association.
-			ValidateMCNPropertiesByMCPs(oc, []string{master, arbiter})
-		} else { //handle standard clusters
-			ValidateMCNPropertiesByMCPs(oc, []string{master, worker})
-		}
+		ValidateMCNPropertiesByMCPs(oc)
 	})
 
 	g.It("[Suite:openshift/conformance/serial][Serial]Should have MCN properties matching associated node properties for nodes in custom MCPs [apigroup:machineconfiguration.openshift.io]", func() {
@@ -108,14 +97,16 @@ var _ = g.Describe("[Suite:openshift/machine-config-operator/disruptive][sig-mco
 })
 
 // `ValidateMCNPropertiesByMCPs` checks that MCN properties match the corresponding node properties
-// for a random node in each of the desired MCPs.
-func ValidateMCNPropertiesByMCPs(oc *exutil.CLI, poolNames []string) {
-	framework.Logf("Validating MCN properties for node(s) in pool(s) '%v'.", poolNames)
-
+// for a random node in each MCP in the cluster with nodes.
+func ValidateMCNPropertiesByMCPs(oc *exutil.CLI) {
 	// Create client set for test
 	clientSet, clientErr := machineconfigclient.NewForConfig(oc.KubeFramework().ClientConfig())
 	o.Expect(clientErr).NotTo(o.HaveOccurred(), "Error creating client set for test.")
 
+	// Get MCPs to test for cluster
+	poolNames := GetRolesToTest(oc, clientSet)
+	framework.Logf("Validating MCN properties for node(s) in pool(s) '%v'.", poolNames)
+
 	// Validate MCN associated with node in each desired MCP
 	for _, poolName := range poolNames {
 		framework.Logf("Validating MCN properties for %v node.", poolName)