Merge pull request #148 from openshift-cherrypick-robot/cherry-pick-1…

…47-to-release-4.14 [release-4.14] OCPBUGS-26000: Fix machineset machine role test
openshift · Jan 12, 2024 · 16e2dcb · 16e2dcb
2 parents 57c40e1 + d4b9b21
commit 16e2dcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/test/extended/openstack/machineset.go b/test/extended/openstack/machineset.go
@@ -47,13 +47,6 @@ var _ = g.Describe("[sig-installer][Suite:openshift/openstack] MachineSet", func
 		o.Expect(err).NotTo(o.HaveOccurred())
 	})
 
-	g.It("have role worker", func() {
-		for i := range machineSets {
-			labels := machineSets[i].Get("spec.template.metadata.labels").Data().(map[string]interface{})
-			o.Expect(labels[machineLabelRole]).To(o.Equal("worker"), "unexpected or absent MachineSet role label")
-		}
-	})
-
 	g.It("replica number corresponds to the number of Machines", func() {
 		for _, machineSet := range machineSets {
 			machineSetName := machineSet.Get("metadata.name").String()
@@ -75,13 +68,20 @@ var _ = g.Describe("[sig-installer][Suite:openshift/openstack] MachineSet", func
 				msSecurityGroups[securityGroupName] = struct{}{}
 			}
 
+			msLabels := machineSet.Get("spec.template.metadata.labels").Data().(map[string]interface{})
+
 			machines, err := machines.List(ctx, dc, machines.ByMachineSet(msName))
 			o.Expect(err).NotTo(o.HaveOccurred(), "error fetching machines for MachineSet %q", msName)
 
 			for _, machine := range machines {
 				machineName := machine.Get("metadata.name").String()
 				g.By("Comparing the MachineSet spec with machine " + machineName)
 
+				machineLabels := machine.Get("metadata.labels").Data().(map[string]interface{})
+				for label, value := range msLabels {
+					o.Expect(machineLabels[label]).To(o.Equal(value), "label mismatch on Machine %q of MachineSet %q", machineName, msName)
+				}
+
 				machineFlavor := machine.Get("spec.providerSpec.value.flavor").String()
 				machineImage := machine.Get("spec.providerSpec.value.image").String()
 				machineSecurityGroups := make(map[string]struct{})

diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go
@@ -23,8 +23,6 @@ var Annotations = map[string]string{
 
 	"[sig-installer][Suite:openshift/openstack] MachineSet ProviderSpec template is correctly applied to Machines": "",
 
-	"[sig-installer][Suite:openshift/openstack] MachineSet have role worker": "",
-
 	"[sig-installer][Suite:openshift/openstack] MachineSet replica number corresponds to the number of Machines": "",
 
 	"[sig-installer][Suite:openshift/openstack] The OpenStack platform creates Control plane nodes in a server group": "",