Merge pull request #717 from zeeke/drain-loop-vfio-pci-e2e

e2e: Verify removing partial policy works

test/conformance/test_suite_test.go

@@ -17,7 +17,6 @@ import (
 	// Test files in this package must not end with `_test.go` suffix, as they are imported as go package
 	_ "github.com/k8snetworkplumbingwg/sriov-network-operator/test/conformance/tests"
 
-	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/clean"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/k8sreporter"
 )
 
@@ -58,13 +57,3 @@ func TestTest(t *testing.T) {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 	RunSpecs(t, "SRIOV Operator conformance tests")
 }
-
-var _ = BeforeSuite(func() {
-	err := clean.All()
-	Expect(err).NotTo(HaveOccurred())
-})
-
-var _ = AfterSuite(func() {
-	err := clean.All()
-	Expect(err).NotTo(HaveOccurred())
-})

test/conformance/tests/fixtures.go

@@ -0,0 +1,49 @@
+package tests
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/clean"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/cluster"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/discovery"
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/test/util/namespaces"
+)
+
+var sriovInfos *cluster.EnabledNodes
+
+var _ = BeforeSuite(func() {
+	err := clean.All()
+	Expect(err).NotTo(HaveOccurred())
+
+	isSingleNode, err := cluster.IsSingleNode(clients)
+	Expect(err).ToNot(HaveOccurred())
+	if isSingleNode {
+		disableDrainState, err := cluster.GetNodeDrainState(clients, operatorNamespace)
+		Expect(err).ToNot(HaveOccurred())
+		if discovery.Enabled() {
+			if !disableDrainState {
+				Fail("SriovOperatorConfig DisableDrain property must be enabled in a single node environment")
+			}
+		}
+		snoTimeoutMultiplier = 1
+		if !disableDrainState {
+			err = cluster.SetDisableNodeDrainState(clients, operatorNamespace, true)
+			Expect(err).ToNot(HaveOccurred())
+			clean.RestoreNodeDrainState = true
+		}
+	}
+
+	err = namespaces.Create(namespaces.Test, clients)
+	Expect(err).ToNot(HaveOccurred())
+	err = namespaces.Clean(operatorNamespace, namespaces.Test, clients, discovery.Enabled())
+	Expect(err).ToNot(HaveOccurred())
+	WaitForSRIOVStable()
+	sriovInfos, err = cluster.DiscoverSriov(clients, operatorNamespace)
+	Expect(err).ToNot(HaveOccurred())
+})
+
+var _ = AfterSuite(func() {
+	err := clean.All()
+	Expect(err).NotTo(HaveOccurred())
+})