tests/ocp/sriov: fix SR-IOV operator reinstallation test failures

tests/ocp/sriov/tests/reinstallation.go

@@ -2,6 +2,7 @@ package tests
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -145,7 +146,7 @@ var _ = Describe("SRIOV Operator re-installation", Ordered, Label(tsparams.Label
 				installSriovOperator(sriovNamespace, sriovOperatorgroup, sriovSubscription)
 
 				Eventually(sriovoperator.IsSriovDeployed,
-					time.Minute, tsparams.RetryInterval).
+					5*time.Minute, tsparams.RetryInterval).
 					WithArguments(APIClient, SriovOcpConfig.OcpSriovOperatorNamespace).
 					ShouldNot(HaveOccurred(), "SR-IOV operator is not installed")
 
@@ -241,6 +242,14 @@ func removeSriovOperator(sriovNamespace *namespace.Builder) {
 	}, time.Minute, tsparams.RetryInterval).Should(HaveOccurred(),
 		"ValidatingWebhook sriov-operator-webhook-config was not removed")
 
+	By("Removing SR-IOV network pool configs")
+
+	// SriovNetworkPoolConfigs carry a finalizer set by the operator controller.
+	// They must be deleted while the operator is still running; otherwise the
+	// finalizer can never be removed and the namespace gets stuck in Terminating.
+	err = sriov.CleanAllPoolConfigs(APIClient, SriovOcpConfig.SriovOperatorNamespace)
+	Expect(err).ToNot(HaveOccurred(), "Failed to clean SR-IOV network pool configs")
+
 	By("Removing SR-IOV namespace")
 
 	err = sriovNamespace.DeleteAndWait(tsparams.DefaultTimeout)
@@ -276,6 +285,30 @@ func installSriovOperator(sriovNamespace *namespace.Builder,
 	Expect(err).ToNot(HaveOccurred(),
 		fmt.Sprintf("Failed to create SR-IOV Subscription %s", sriovSubscription.Definition.Name))
 
+	By("Waiting for SR-IOV operator CSV to succeed")
+
+	// Mirror deploy_cluster.sh's create_default_soc: wait for CSV Succeeded before
+	// creating SriovOperatorConfig so the operator controller is up and can handle it.
+	Eventually(func() bool {
+		csvList, err := olm.ListClusterServiceVersion(APIClient, sriovNamespace.Definition.Name)
+		if err != nil || len(csvList) == 0 {
+			return false
+		}
+
+		for _, csv := range csvList {
+			if !strings.Contains(csv.Definition.Name, "sriov") {
+				continue
+			}
+
+			succeeded, err := csv.IsSuccessful()
+
+			return err == nil && succeeded
+		}
+
+		return false
+	}, 5*time.Minute, tsparams.RetryInterval).Should(BeTrue(),
+		"SR-IOV operator CSV did not reach Succeeded phase within timeout")
+
 	By("Creating SR-IOV operator default configuration")
 
 	_, err = sriov.NewOperatorConfigBuilder(APIClient, sriovNamespace.Definition.Name).