Change Mulit-cluster e2e tests to use the shared agnhost image (#4738)

Signed-off-by: Lan Luo <luola@vmware.com>
antrea-io · Mar 24, 2023 · 6590c2a · 6590c2a
1 parent a20077c
commit 6590c2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ci/jenkins/test-mc.sh b/ci/jenkins/test-mc.sh
@@ -397,17 +397,18 @@ function run_multicluster_e2e {
     docker pull "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine
     docker save "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine -o "${WORKDIR}"/nginx.tar
 
-    docker pull "${DOCKER_REGISTRY}/antrea/agnhost:2.26"
-    docker tag "${DOCKER_REGISTRY}/antrea/agnhost:2.26" "agnhost:2.26"
-    docker save agnhost:2.26 -o "${WORKDIR}"/agnhost.tar
+    # Use the same agnhost image which is defined as 'agnhostImage' in antrea/test/e2e/framework.go to
+    # avoid pulling the image again when running Multi-cluster e2e tests.
+    docker pull "registry.k8s.io/e2e-test-images/agnhost:2.29"
+    docker save "registry.k8s.io/e2e-test-images/agnhost:2.29" -o "${WORKDIR}"/agnhost.tar
 
     if [[ ${KIND} == "true" ]]; then
         for name in ${CLUSTER_NAMES[*]}; do
             if [[ "${name}" == "leader" ]];then
                 continue
             fi
             kind load docker-image "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine --name ${name}
-            kind load docker-image "agnhost:2.26" --name ${name}
+            kind load docker-image "registry.k8s.io/e2e-test-images/agnhost:2.29" --name ${name}
         done
     else
         for kubeconfig in "${membercluster_kubeconfigs[@]}"; do

diff --git a/multicluster/test/e2e/framework.go b/multicluster/test/e2e/framework.go
@@ -51,7 +51,7 @@ const (
 	regularNodeClientSuffix string = "regular-client"
 
 	nginxImage   = "projects.registry.vmware.com/antrea/nginx:1.21.6-alpine"
-	agnhostImage = "agnhost:2.26"
+	agnhostImage = "registry.k8s.io/e2e-test-images/agnhost:2.29"
 )
 
 var provider providers.ProviderInterface