Merge pull request #29807 from eggfoobar/fencing-baremetal-update

openshift-merge-bot[bot] · web-flow · commit 0c51600d0993 · 2025-05-23T07:07:14.000Z
OCPBUGS-56381: feat: update test to account for two node fencing
diff --git a/test/extended/baremetal/hosts.go b/test/extended/baremetal/hosts.go
@@ -41,21 +41,29 @@ var _ = g.Describe("[sig-installer][Feature:baremetal] Baremetal platform should
 	defer g.GinkgoRecover()
 
 	oc := exutil.NewCLI("baremetal")
+	isTNFDeployment := false
 
 	g.BeforeEach(func() {
 		skipIfNotBaremetal(oc)
+		isTNFDeployment = exutil.IsTwoNodeFencing(context.TODO(), oc.AdminConfigClient())
 	})
 
 	g.It("have baremetalhost resources", func() {
 		dc := oc.AdminDynamicClient()
 		bmc := baremetalClient(dc)
 
+		// In TNF Deployments we expect baremetal installs to be detached.
+		expectedOperationalStatus := "OK"
+		if isTNFDeployment {
+			expectedOperationalStatus = "detached"
+		}
+
 		hosts, err := bmc.List(context.Background(), metav1.ListOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 		o.Expect(hosts.Items).ToNot(o.BeEmpty())
 
 		for _, h := range hosts.Items {
-			expectStringField(h, "baremetalhost", "status.operationalStatus").To(o.BeEquivalentTo("OK"))
+			expectStringField(h, "baremetalhost", "status.operationalStatus").To(o.BeEquivalentTo(expectedOperationalStatus))
 			expectStringField(h, "baremetalhost", "status.provisioning.state").To(o.Or(o.BeEquivalentTo("provisioned"), o.BeEquivalentTo("externally provisioned")))
 			expectBoolField(h, "baremetalhost", "spec.online").To(o.BeTrue())
 
diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
@@ -2328,6 +2328,15 @@ func IsMicroShiftCluster(kubeClient k8sclient.Interface) (bool, error) {
 	return true, nil
 }
 
+func IsTwoNodeFencing(ctx context.Context, configClient clientconfigv1.Interface) bool {
+	infrastructure, err := configClient.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
+	if err != nil {
+		return false
+	}
+
+	return infrastructure.Status.ControlPlaneTopology == configv1.DualReplicaTopologyMode
+}
+
 func groupName(groupVersionName string) string {
 	return strings.Split(groupVersionName, "/")[0]
 }
