Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade agnhost image to 2.52 for both Linux and Windows tests #6785

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −18
Open

Upgrade agnhost image to 2.52 for both Linux and Windows tests #6785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/jenkins/test-mc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci/jenkins/test-vmc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/jenkins/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/kind/kind-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/kind/test-e2e-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion ci/kind/test-netpol-v2-conformance-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion ci/kind/test-secondary-network-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions hack/netpol-generator/test-kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -

Expand Down
2 changes: 1 addition & 1 deletion multicluster/test/e2e/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading