Merge pull request #29827 from vr4manta/SPLAT-2231

SPLAT-2231: Updated tests to work with hybrid environments

Author: openshift-merge-bot[bot]

test/extended/machines/cluster.go

@@ -64,8 +64,16 @@ var _ = g.Describe("[sig-cluster-lifecycle][Feature:Machines][Early] Managed clu
 		machineList := objx.Map(obj.UnstructuredContent())
 		machineItems := objects(machineList.Get("items"))
 
+		// Get number of nodes with machine annotation ("machine.openshift.io/machine")
+		machineNodes := 0
+		for _, node := range nodeItems {
+			if _, ok := node.Annotations["machine.openshift.io/machine"]; ok {
+				machineNodes++
+			}
+		}
+
 		g.By("ensure number of Machines and Nodes are equal")
-		o.Expect(len(nodeItems)).To(o.Equal(len(machineItems)))
+		o.Expect(machineNodes).To(o.Equal(len(machineItems)))
 	})
 })
 

test/extended/machines/machines.go

@@ -64,7 +64,11 @@ var _ = g.Describe("[sig-cluster-lifecycle][Feature:Machines] Managed cluster sh
 		nodeNames := sets.NewString()
 		for i := range allNodes.Items {
 			node := &allNodes.Items[i]
-			nodeNames.Insert(node.ObjectMeta.Name)
+
+			// If the node does not have the label, it may be a non machine node.
+			if _, ok := node.Annotations["machine.openshift.io/machine"]; ok {
+				nodeNames.Insert(node.ObjectMeta.Name)
+			}
 		}
 
 		if len(nodeNames) == 0 {