Merge pull request #2799 from spidernet-io/robot/cherrypick/pr2778/re…

…lease-v0.8 fix ovs installtation scripts
spidernet-io · Dec 11, 2023 · 321d9a3 · 321d9a3
2 parents 80db675 + 37ab245
commit 321d9a3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/test/e2e/kubevirt/kubevirt_test.go b/test/e2e/kubevirt/kubevirt_test.go
@@ -116,7 +116,8 @@ var _ = Describe("test kubevirt", Label("kubevirt"), func() {
 		Expect(vmInterfaces).Should(Equal(tmpVMInterfaces))
 	})
 
-	It("Succeed to keep static IP for the kubevirt VM live migration", Label("F00002"), func() {
+	// TODO (Icarus9913): after migration, the new vm pod try to pull a different tag image which may cause image pull failed.
+	PIt("Succeed to keep static IP for the kubevirt VM live migration", Label("F00002"), func() {
 		// 1. create a kubevirt vm with masquerade mode (At present, it seems like the live migration only supports masquerade mode)
 		virtualMachine.Spec.Template.Spec.Networks = []kubevirtv1.Network{
 			{

diff --git a/test/e2e/kubevirt/testvm.yaml b/test/e2e/kubevirt/testvm.yaml
@@ -35,7 +35,7 @@ spec:
       volumes:
         - name: containerdisk
           containerDisk:
-            image: quay.io/kubevirt/cirros-container-disk-demo
+            image: quay.io/kubevirt/cirros-container-disk-demo:latest
         - name: cloudinitdisk
           cloudInitNoCloud:
             userData: |

diff --git a/test/scripts/install-kubevirt.sh b/test/scripts/install-kubevirt.sh
@@ -35,8 +35,8 @@ KUBEVIRT_API_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/virt-api:${KUBEVIRT_VERSI
 KUBEVIRT_CONTROLLER_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/virt-controller:${KUBEVIRT_VERSION}
 KUBEVIRT_HANDLER_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/virt-handler:${KUBEVIRT_VERSION}
 KUBEVIRT_LAUNCHER_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/virt-launcher:${KUBEVIRT_VERSION}
-KUBEVIRT_TEST_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/cirros-container-disk-demo
-KUBEVIRT_IMAGE_LIST="${KUBEVIRT_OPERATOR_IMAGE} ${KUBEVIRT_API_IMAGE} ${KUBEVIRT_CONTROLLER_IMAGE} ${KUBEVIRT_HANDLER_IMAGE} ${KUBEVIRT_LAUNCHER_IMAGE}"
+KUBEVIRT_TEST_IMAGE=${E2E_KUBEVIRT_IMAGE_REPO}/kubevirt/cirros-container-disk-demo:latest
+KUBEVIRT_IMAGE_LIST="${KUBEVIRT_OPERATOR_IMAGE} ${KUBEVIRT_API_IMAGE} ${KUBEVIRT_CONTROLLER_IMAGE} ${KUBEVIRT_HANDLER_IMAGE} ${KUBEVIRT_LAUNCHER_IMAGE} ${KUBEVIRT_TEST_IMAGE}"
 
 LOCAL_IMAGE_LIST=`docker images | awk '{printf("%s:%s\n",$1,$2)}'`
 

diff --git a/test/scripts/install-multus.sh b/test/scripts/install-multus.sh
@@ -323,6 +323,8 @@ EOF
           subnet: ${SPIDERPOOL_VLAN200_POOL_V6}
           vlan: 200
 EOF
+
+  if [ "${INSTALL_OVS}" == "true" ] ; then
         cat <<EOF | kubectl --kubeconfig ${E2E_KUBECONFIG} apply -f -
         apiVersion: spiderpool.spidernet.io/v2beta1
         kind: SpiderIPPool
@@ -350,6 +352,7 @@ EOF
           vlan: 40
           gateway: ${SPIDERPOOL_VLAN40_GATEWAY_V6}
 EOF
+  fi
     }
 
   case ${E2E_IP_FAMILY} in