Upgrade agnhost image to 2.52 for both Linux and Windows tests

Signed-off-by: Shuyang Xin <[email protected]>
antrea-io · Nov 1, 2024 · 3cbc19c · 3cbc19c
1 parent 2ae4426
commit 3cbc19c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/ci/jenkins/test-mc.sh b/ci/jenkins/test-mc.sh
@@ -405,16 +405,16 @@ function run_multicluster_e2e {
 
     # 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
+    docker pull "registry.k8s.io/e2e-test-images/agnhost:2.52"
+    docker save "registry.k8s.io/e2e-test-images/agnhost:2.52" -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 "registry.k8s.io/e2e-test-images/agnhost:2.29" --name ${name}
+            kind load docker-image "registry.k8s.io/e2e-test-images/agnhost:2.52" --name ${name}
         done
     else
         for kubeconfig in "${membercluster_kubeconfigs[@]}"; do

diff --git a/ci/jenkins/test-vmc.sh b/ci/jenkins/test-vmc.sh
@@ -447,9 +447,9 @@ function deliver_antrea {
     ${SCP_WITH_ANTREA_CI_KEY} $GIT_CHECKOUT_DIR/build/yamls/*.yml capv@${control_plane_ip}:~
 
     IPs=($(kubectl get nodes -o wide --no-headers=true | awk '{print $6}' | xargs))
-    antrea_images=("registry.k8s.io/e2e-test-images/agnhost:2.40" "antrea/nginx:1.21.6-alpine" "antrea/sonobuoy:v0.56.16" "antrea/toolbox:1.3-0" "antrea/systemd-logs:v0.4")
-    k8s_images=("registry.k8s.io/e2e-test-images/agnhost:2.45" "registry.k8s.io/e2e-test-images/jessie-dnsutils:1.5" "registry.k8s.io/e2e-test-images/nginx:1.14-2")
-    e2e_images=("k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.45" "k8sprow.azurecr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.5" "k8sprow.azurecr.io/kubernetes-e2e-test-images/nginx:1.14-2")
+    antrea_images=("registry.k8s.io/e2e-test-images/agnhost:2.52" "antrea/nginx:1.21.6-alpine" "antrea/sonobuoy:v0.56.16" "antrea/toolbox:1.3-0" "antrea/systemd-logs:v0.4")
+    k8s_images=("registry.k8s.io/e2e-test-images/agnhost:2.52" "registry.k8s.io/e2e-test-images/jessie-dnsutils:1.5" "registry.k8s.io/e2e-test-images/nginx:1.14-2")
+    e2e_images=("k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.52" "k8sprow.azurecr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.5" "k8sprow.azurecr.io/kubernetes-e2e-test-images/nginx:1.14-2")
     for image in "${antrea_images[@]}"; do
         copy_test_image ${image}
     done

diff --git a/ci/jenkins/test.sh b/ci/jenkins/test.sh
@@ -429,7 +429,7 @@ function deliver_antrea_linux {
     DOCKER_REGISTRY="${DOCKER_REGISTRY}" ./hack/build-antrea-linux-all.sh --pull
     docker save -o antrea-ubuntu.tar antrea/antrea-agent-ubuntu:latest antrea/antrea-controller-ubuntu:latest
     echo "===== Pull necessary images on Control-Plane node ====="
-    common_images=("registry.k8s.io/e2e-test-images/agnhost:2.40")
+    common_images=("registry.k8s.io/e2e-test-images/agnhost:2.52")
     k8s_images=("registry.k8s.io/e2e-test-images/agnhost:2.52" "registry.k8s.io/e2e-test-images/jessie-dnsutils:1.5" "registry.k8s.io/e2e-test-images/nginx:1.14-2")
     conformance_images=("k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.52" "k8sprow.azurecr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.5" "k8sprow.azurecr.io/kubernetes-e2e-test-images/nginx:1.14-2")
     e2e_images=("toolbox:1.4-0" "nginx:1.21.6-alpine")
@@ -485,7 +485,7 @@ function deliver_antrea_windows {
         revert_snapshot_windows ${WORKER_NAME}
         k8s_images=("registry.k8s.io/e2e-test-images/agnhost:2.52" "registry.k8s.io/e2e-test-images/jessie-dnsutils:1.5" "registry.k8s.io/e2e-test-images/nginx:1.14-2" "registry.k8s.io/pause:3.10")
         conformance_images=("k8sprow.azurecr.io/kubernetes-e2e-test-images/agnhost:2.52" "k8sprow.azurecr.io/kubernetes-e2e-test-images/jessie-dnsutils:1.5" "k8sprow.azurecr.io/kubernetes-e2e-test-images/nginx:1.14-2" "registry.k8s.io/e2e-test-images/pause:3.10")
-        e2e_images=("${DOCKER_REGISTRY}/antrea/toolbox:1.4-0" "registry.k8s.io/e2e-test-images/agnhost:2.40")
+        e2e_images=("${DOCKER_REGISTRY}/antrea/toolbox:1.4-0" "registry.k8s.io/e2e-test-images/agnhost:2.52")
         # Pull necessary images in advance to avoid transient error
         for i in "${!k8s_images[@]}"; do
             ssh -o StrictHostKeyChecking=no -n Administrator@${IP} "ctr -n k8s.io images pull --user ${DOCKER_USERNAME}:${DOCKER_PASSWORD} ${k8s_images[i]} && ctr -n k8s.io images tag ${k8s_images[i]} ${conformance_images[i]}" || true

diff --git a/ci/kind/kind-setup.sh b/ci/kind/kind-setup.sh
@@ -489,7 +489,7 @@ function printUnixTimestamp {
 
 function setup_external_servers {
   if [[ $DEPLOY_EXTERNAL_AGNHOST == true ]]; then
-    docker run -d --name antrea-external-agnhost-$RANDOM --network kind -it --rm registry.k8s.io/e2e-test-images/agnhost:2.40 netexec &> /dev/null
+    docker run -d --name antrea-external-agnhost-$RANDOM --network kind -it --rm registry.k8s.io/e2e-test-images/agnhost:2.52 netexec &> /dev/null
   fi
 
   if [[ $DEPLOY_EXTERNAL_FRR == true ]]; then

diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh
@@ -249,7 +249,7 @@ if $flow_visibility; then
     manifest_args="$manifest_args --feature-gates FlowExporter=true,L7FlowExporter=true --extra-helm-values-file $FLOW_VISIBILITY_HELM_VALUES"
 fi
 
-COMMON_IMAGES_LIST=("registry.k8s.io/e2e-test-images/agnhost:2.40" \
+COMMON_IMAGES_LIST=("registry.k8s.io/e2e-test-images/agnhost:2.52" \
                     "antrea/nginx:1.21.6-alpine" \
                     "antrea/toolbox:1.3-0")
 

diff --git a/ci/kind/test-netpol-v2-conformance-kind.sh b/ci/kind/test-netpol-v2-conformance-kind.sh
@@ -105,7 +105,7 @@ if [ -n "$feature_gates" ]; then
   manifest_args="$manifest_args --feature-gates $feature_gates"
 fi
 
-IMAGE_LIST=("registry.k8s.io/e2e-test-images/agnhost:2.43" \
+IMAGE_LIST=("registry.k8s.io/e2e-test-images/agnhost:2.52" \
             "antrea/antrea-agent-ubuntu:latest" \
             "antrea/antrea-controller-ubuntu:latest")
 

diff --git a/hack/netpol-generator/test-kind.sh b/hack/netpol-generator/test-kind.sh
@@ -34,8 +34,8 @@ kind load docker-image antrea/antrea-controller-ubuntu:latest
 docker pull mfenwick100/cyclonus:v0.4.7
 kind load docker-image mfenwick100/cyclonus:v0.4.7
 # pre-load agnhost image
-docker pull registry.k8s.io/e2e-test-images/agnhost:2.40
-kind load docker-image registry.k8s.io/e2e-test-images/agnhost:2.40
+docker pull registry.k8s.io/e2e-test-images/agnhost:2.52
+kind load docker-image registry.k8s.io/e2e-test-images/agnhost:2.52
 
 "$ROOT_DIR"/hack/generate-manifest.sh | kubectl apply -f -
 

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

diff --git a/test/e2e/framework.go b/test/e2e/framework.go
@@ -120,7 +120,7 @@ const (
 	antreaControllerConfName = "antrea-controller.conf"
 	flowAggregatorConfName   = "flow-aggregator.conf"
 
-	agnhostImage        = "registry.k8s.io/e2e-test-images/agnhost:2.40"
+	agnhostImage        = "registry.k8s.io/e2e-test-images/agnhost:2.52"
 	ToolboxImage        = "antrea/toolbox:1.3-0"
 	mcjoinImage         = "antrea/mcjoin:v2.9"
 	nginxImage          = "antrea/nginx:1.21.6-alpine"