From 7484b9d2e2e35ec38f698ddcde85f88955aaecc5 Mon Sep 17 00:00:00 2001 From: abdallahyas Date: Thu, 8 Jul 2021 12:58:42 +0000 Subject: [PATCH] Remove sriov-cni check from E2E tests Following k8snetworkplumbingwg/sriov-network-operator#149, sriov-cni daemonset is no longer deployed separatly but as part of the config daemon daemonset. This breaks the E2E tests, since the E2E tests wait for the sriov-cni daemonsets to be ready. This patch fix that by replacing the wait condition from the sriov-cni daemonset to the config-daemon daemonset. --- test/e2e/sriovoperatornodepolicy_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/sriovoperatornodepolicy_test.go b/test/e2e/sriovoperatornodepolicy_test.go index dc1a00ebc..9bcf9c969 100644 --- a/test/e2e/sriovoperatornodepolicy_test.go +++ b/test/e2e/sriovoperatornodepolicy_test.go @@ -117,7 +117,7 @@ var _ = Describe("Operator", func() { By("provision the cni and device plugin daemonsets") cniDaemonSet := &appsv1.DaemonSet{} - err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-cni", RetryInterval, Timeout) + err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-network-config-daemon", RetryInterval, Timeout) Expect(err).NotTo(HaveOccurred()) dpDaemonSet := &appsv1.DaemonSet{} @@ -249,7 +249,7 @@ var _ = Describe("Operator", func() { By("provision the cni and device plugin daemonsets") cniDaemonSet := &appsv1.DaemonSet{} - err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-cni", RetryInterval, Timeout) + err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-network-config-daemon", RetryInterval, Timeout) Expect(err).NotTo(HaveOccurred()) dpDaemonSet := &appsv1.DaemonSet{} @@ -393,7 +393,7 @@ var _ = Describe("Operator", func() { By("provision the cni and device plugin daemonsets") cniDaemonSet := &appsv1.DaemonSet{} - err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-cni", RetryInterval, Timeout) + err = WaitForDaemonSetReady(cniDaemonSet, k8sClient, testNamespace, "sriov-network-config-daemon", RetryInterval, Timeout) Expect(err).NotTo(HaveOccurred()) dpDaemonSet := &appsv1.DaemonSet{}