Skip to content

Commit

Permalink
Remove sriov-cni check from E2E tests
Browse files Browse the repository at this point in the history
Following k8snetworkplumbingwg#149, sriov-cni
daemonset is no longer deployed separatly but as part of the config
daemon daemonset. This lead to break 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
to the config-daemon daemonset.
  • Loading branch information
abdallahyas committed Jul 8, 2021
1 parent e0a92fe commit 7b39f1a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/e2e/sriovoperatornodepolicy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down Expand Up @@ -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{}
Expand Down Expand Up @@ -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{}
Expand Down

0 comments on commit 7b39f1a

Please sign in to comment.