wip

antrea-io · Aug 15, 2022 · 01e8fe6 · 01e8fe6
1 parent 5fac25c
commit 01e8fe6
Show file tree

Hide file tree

Showing 4 changed files with 173 additions and 85 deletions.
diff --git a/ci/kind/kind-setup.sh b/ci/kind/kind-setup.sh
@@ -83,6 +83,13 @@ function configure_networks {
   networks=$(docker network ls -f name=antrea --format '{{.Name}}')
   networks="$(echo $networks)"
   if [[ -z $SUBNETS ]] && [[ -z $networks ]]; then
+    docker network create -d bridge multicast-bridge
+    node="$(kind get nodes --name kind | grep control-plane)"
+    docker network connect multicast-bridge $node
+    docker run -d --name mcjoin --network multicast-bridge troglobit/mcjoin
+    docker run -d --name mcjoin1 --network kind troglobit/mcjoin
+    docker run -d --name mcjoin2  --network kind troglobit/mcjoin
+    docker run -d --name mcjoin3 --network kind troglobit/mcjoin
     echo "Using default kind docker network"
     return
   fi

diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh
@@ -139,7 +139,7 @@ trap "quit" INT EXIT
 manifest_args="$manifest_args --verbose-log"
 if [ -n "$feature_gates" ]; then
     if [[ "$feature_gates" == *"Multicast=true"* ]] || ([[ "$feature_gates" == *"AllAlpha=true"* ]] && [[ "$feature_gates" != *"AllAlpha=false"* ]]); then
-        manifest_args="$manifest_args --extra-helm-values multicast.igmpQueryInterval=10s"
+        manifest_args="$manifest_args --multicast --multicast-interfaces eth1 --extra-helm-values multicast.igmpQueryInterval=10s"
     fi
     manifest_args="$manifest_args --feature-gates $feature_gates"
 fi
@@ -163,7 +163,7 @@ if $coverage; then
     manifest_args="$manifest_args --coverage"
     COMMON_IMAGES_LIST+=("antrea/antrea-ubuntu-coverage:latest")
 else
-    COMMON_IMAGES_LIST+=("antrea/antrea-ubuntu:latest")
+    COMMON_IMAGES_LIST+=("projects.registry.vmware.com/antrea/antrea-ubuntu:latest")
 fi
 if $proxy_all; then
     COMMON_IMAGES_LIST+=("k8s.gcr.io/echoserver:1.10")
@@ -214,6 +214,7 @@ function run_test {
       coverage_args="--coverage --coverage-dir $ANTREA_COV_DIR"
   else
       $YML_CMD --encap-mode $current_mode $manifest_args | docker exec -i kind-control-plane dd of=/root/antrea.yml
+      echo $manifest_args
       $YML_CMD --ipsec $manifest_args | docker exec -i kind-control-plane dd of=/root/antrea-ipsec.yml
       timeout="75m"
   fi

diff --git a/test/e2e/antreapolicy_test.go b/test/e2e/antreapolicy_test.go
@@ -3769,12 +3769,12 @@ func testACNPIGMPQuery(t *testing.T, data *TestData, acnpName, caseName, groupAd
 	testNamespace := data.testNamespace
 	mc := multicastTestcase{
 		name:            caseName,
-		senderConfig:    multicastTestPodConfig{nodeIdx: 0, isHostNetwork: false},
+		senderConfig:    multicastTestPodConfig{nodeIdx: 0, isExternalHost: false},
 		receiverConfigs: []multicastTestPodConfig{{1, false}},
 		port:            3457,
 		group:           net.ParseIP(groupAddress),
 	}
-	senderName, _, cleanupFunc := createAndWaitForPod(t, data, data.createMcJoinPodOnNode, "test-sender-", nodeName(mc.senderConfig.nodeIdx), testNamespace, mc.senderConfig.isHostNetwork)
+	senderName, _, cleanupFunc := createAndWaitForPod(t, data, data.createMcJoinPodOnNode, "test-sender-", nodeName(mc.senderConfig.nodeIdx), testNamespace, mc.senderConfig.isExternalHost)
 	defer cleanupFunc()
 	var wg sync.WaitGroup
 	receiverNames, cleanupFuncs := setupReceivers(t, data, mc, mcjoinWaitTimeout, &wg)
@@ -3855,12 +3855,12 @@ func testACNPMulticastEgress(t *testing.T, data *TestData, acnpName, caseName, g
 	testNamespace := data.testNamespace
 	mc := multicastTestcase{
 		name:            caseName,
-		senderConfig:    multicastTestPodConfig{nodeIdx: 0, isHostNetwork: false},
+		senderConfig:    multicastTestPodConfig{nodeIdx: 0, isExternalHost: false},
 		receiverConfigs: []multicastTestPodConfig{{1, false}},
 		port:            3457,
 		group:           net.ParseIP(groupAddress),
 	}
-	senderName, _, cleanupFunc := createAndWaitForPod(t, data, data.createMcJoinPodOnNode, "test-sender-", nodeName(mc.senderConfig.nodeIdx), testNamespace, mc.senderConfig.isHostNetwork)
+	senderName, _, cleanupFunc := createAndWaitForPod(t, data, data.createMcJoinPodOnNode, "test-sender-", nodeName(mc.senderConfig.nodeIdx), testNamespace, mc.senderConfig.isExternalHost)
 	defer cleanupFunc()
 	var wg sync.WaitGroup
 	receiverNames, cleanupFuncs := setupReceivers(t, data, mc, mcjoinWaitTimeout, &wg)