Merge pull request kubevirt#1854 from SchSeba/fix-skip-network-namespace

Change the skip function for multus genie and sriov.
volume-ji · Dec 18, 2018 · 7c5284e · 7c5284e
2 parents 2252080 + 7f898df
commit 7c5284e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/automation/test.sh b/automation/test.sh
@@ -47,8 +47,8 @@ if [[ $TARGET =~ openshift-.* ]]; then
   fi
 elif [[ $TARGET =~ .*-1.10.4-.* ]]; then
   export KUBEVIRT_PROVIDER="k8s-1.10.4"
-elif [[ $TARGET =~ .*-multus-1.11.1-.* ]]; then
-  export KUBEVIRT_PROVIDER="k8s-multus-1.11.1"
+elif [[ $TARGET =~ .*-multus-1.12.2-.* ]]; then
+  export KUBEVIRT_PROVIDER="k8s-multus-1.12.2"
 elif [[ $TARGET =~ .*-genie-1.11.1-.* ]]; then
   export KUBEVIRT_PROVIDER="k8s-genie-1.11.1"
 else

diff --git a/tests/utils.go b/tests/utils.go
@@ -2187,21 +2187,21 @@ func SkipIfNoRhelImage(virtClient kubecli.KubevirtClient) {
 }
 
 func SkipIfNoSriovDevicePlugin(virtClient kubecli.KubevirtClient) {
-	_, err := virtClient.ExtensionsV1beta1().DaemonSets(KubeVirtInstallNamespace).Get("kube-sriov-device-plugin-amd64", metav1.GetOptions{})
+	_, err := virtClient.ExtensionsV1beta1().DaemonSets(metav1.NamespaceSystem).Get("kube-sriov-device-plugin-amd64", metav1.GetOptions{})
 	if err != nil {
 		Skip("Skip srio tests that required sriov device plugin")
 	}
 }
 
 func SkipIfNoMultusProvider(virtClient kubecli.KubevirtClient) {
-	_, err := virtClient.ExtensionsV1beta1().DaemonSets(KubeVirtInstallNamespace).Get("kube-multus-ds-amd64", metav1.GetOptions{})
+	_, err := virtClient.ExtensionsV1beta1().DaemonSets(metav1.NamespaceSystem).Get("kube-multus-ds-amd64", metav1.GetOptions{})
 	if err != nil {
 		Skip("Skip multus tests that required multus cni plugin")
 	}
 }
 
 func SkipIfNoGenieProvider(virtClient kubecli.KubevirtClient) {
-	_, err := virtClient.ExtensionsV1beta1().DaemonSets("kube-system").Get("genie-plugin", metav1.GetOptions{})
+	_, err := virtClient.ExtensionsV1beta1().DaemonSets(metav1.NamespaceSystem).Get("genie-plugin", metav1.GetOptions{})
 	if err != nil {
 		Skip("Skip genie tests that required genie cni plugin")
 	}

diff --git a/tests/vmi_networking_test.go b/tests/vmi_networking_test.go
@@ -150,7 +150,7 @@ var _ = Describe("Networking", func() {
 			var cmdCheck, addrShow, addr string
 
 			if destination == "InboundVMIWithCustomMacAddress" {
-				tests.SkipIfOpenShift("Custom MAC addresses on pod networks are not suppored")
+				tests.SkipIfOpenShift("Custom MAC addresses on pod networks are not supported")
 			}
 
 			// assuming pod network is of standard MTU = 1500 (minus 50 bytes for vxlan overhead)