From 8adc050cae2371cbbf51224a0e6731007f78af55 Mon Sep 17 00:00:00 2001 From: Shuyang Xin Date: Fri, 1 Nov 2024 10:27:18 +0800 Subject: [PATCH] Upgrade CI images for both Linux and Windows tests Signed-off-by: Shuyang Xin --- ci/jenkins/test-mc.sh | 6 +++--- ci/jenkins/test-vmc.sh | 6 +++--- ci/jenkins/test.sh | 4 ++-- ci/kind/kind-setup.sh | 2 +- ci/kind/test-e2e-kind.sh | 4 ++-- ci/kind/test-netpol-v2-conformance-kind.sh | 2 +- ci/kind/test-secondary-network-kind.sh | 2 +- hack/netpol-generator/test-kind.sh | 4 ++-- multicluster/test/e2e/framework.go | 2 +- test/e2e/framework.go | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/jenkins/test-mc.sh b/ci/jenkins/test-mc.sh index 15f3594013c..dcf5c9903c6 100755 --- a/ci/jenkins/test-mc.sh +++ b/ci/jenkins/test-mc.sh @@ -405,8 +405,8 @@ 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 @@ -414,7 +414,7 @@ function run_multicluster_e2e { 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 index 73e6989630a..40f3a7d5464 100755 --- 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.4-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 index 1f49250f1b6..782c12429c6 100755 --- 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 index e57e79616e4..ee29d5e5c70 100755 --- 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 index 1b9030c76df..fce35634695 100755 --- a/ci/kind/test-e2e-kind.sh +++ b/ci/kind/test-e2e-kind.sh @@ -249,9 +249,9 @@ 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") + "antrea/toolbox:1.4-0") FLOW_VISIBILITY_IMAGE_LIST=("antrea/ipfix-collector:v0.11.0" \ "antrea/clickhouse-operator:0.21.0" \ diff --git a/ci/kind/test-netpol-v2-conformance-kind.sh b/ci/kind/test-netpol-v2-conformance-kind.sh index 29bca5257ce..892a2d6c54c 100755 --- 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/ci/kind/test-secondary-network-kind.sh b/ci/kind/test-secondary-network-kind.sh index 6d437ab2130..2fb0f313f65 100755 --- a/ci/kind/test-secondary-network-kind.sh +++ b/ci/kind/test-secondary-network-kind.sh @@ -90,7 +90,7 @@ fi trap "quit" INT EXIT -IMAGE_LIST=("antrea/toolbox:1.3-0" \ +IMAGE_LIST=("antrea/toolbox:1.4-0" \ "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 index 48a55544048..508b6fde501 100755 --- 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 index 6be3af8982b..ff0a6a288dd 100644 --- 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 index 6a8af13ad1f..a01332e06c1 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -120,8 +120,8 @@ const ( antreaControllerConfName = "antrea-controller.conf" flowAggregatorConfName = "flow-aggregator.conf" - agnhostImage = "registry.k8s.io/e2e-test-images/agnhost:2.40" - ToolboxImage = "antrea/toolbox:1.3-0" + agnhostImage = "registry.k8s.io/e2e-test-images/agnhost:2.52" + ToolboxImage = "antrea/toolbox:1.4-0" mcjoinImage = "antrea/mcjoin:v2.9" nginxImage = "antrea/nginx:1.21.6-alpine" iisImage = "mcr.microsoft.com/windows/servercore/iis"