From ef2e009ff73a71f6894fd228656784961eb7b2bd Mon Sep 17 00:00:00 2001 From: Adrian Villin Date: Tue, 23 Sep 2025 04:52:27 -0400 Subject: [PATCH] kube-test: fix and update image tags Type: test Change-Id: I6514cad1349c65a4ae79e657a3d64d380ce1c1e4 Signed-off-by: Adrian Villin --- test-c/kube-test/docker/Dockerfile.ab | 2 +- test-c/kube-test/docker/Dockerfile.nginx | 2 +- test-c/kube-test/docker/Dockerfile.vpp | 2 +- test-c/kube-test/docker/Dockerfile.wrk | 2 +- test-c/kube-test/script/build-images.sh | 2 +- test-c/kube-test/script/build_kube.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test-c/kube-test/docker/Dockerfile.ab b/test-c/kube-test/docker/Dockerfile.ab index d61e1255033..4d6199298ce 100644 --- a/test-c/kube-test/docker/Dockerfile.ab +++ b/test-c/kube-test/docker/Dockerfile.ab @@ -1,6 +1,6 @@ # Apache Bench container that uses the base image ARG UBUNTU_VERSION=22.04 -FROM localhost:5001/vpp-test-base:latest +FROM localhost:5001/vpp-kube-base:latest # apache2-utils is now installed in the base image diff --git a/test-c/kube-test/docker/Dockerfile.nginx b/test-c/kube-test/docker/Dockerfile.nginx index 5a3e7e2a84d..9002e20b334 100644 --- a/test-c/kube-test/docker/Dockerfile.nginx +++ b/test-c/kube-test/docker/Dockerfile.nginx @@ -1,6 +1,6 @@ # nginx container that uses the base image ARG UBUNTU_VERSION=22.04 -FROM localhost:5001/vpp-test-base:latest +FROM localhost:5001/vpp-kube-base:latest # nginx is now installed in the base image diff --git a/test-c/kube-test/docker/Dockerfile.vpp b/test-c/kube-test/docker/Dockerfile.vpp index 20d2c65064a..a3b7ec35b0b 100644 --- a/test-c/kube-test/docker/Dockerfile.vpp +++ b/test-c/kube-test/docker/Dockerfile.vpp @@ -1,6 +1,6 @@ # VPP container that uses the base image ARG UBUNTU_VERSION=22.04 -FROM localhost:5001/vpp-test-base:latest +FROM localhost:5001/vpp-kube-base:latest # We don't need to install these packages as they're in the base image # Just install anything specific to VPP that isn't in the base diff --git a/test-c/kube-test/docker/Dockerfile.wrk b/test-c/kube-test/docker/Dockerfile.wrk index 8517a058965..cec30bec999 100644 --- a/test-c/kube-test/docker/Dockerfile.wrk +++ b/test-c/kube-test/docker/Dockerfile.wrk @@ -1,6 +1,6 @@ # wrk HTTP benchmarking container that uses the base image ARG UBUNTU_VERSION=22.04 -FROM localhost:5001/vpp-test-base:latest +FROM localhost:5001/vpp-kube-base:latest # wrk is installed in the base image diff --git a/test-c/kube-test/script/build-images.sh b/test-c/kube-test/script/build-images.sh index aa76304ac9a..32916ddbe63 100755 --- a/test-c/kube-test/script/build-images.sh +++ b/test-c/kube-test/script/build-images.sh @@ -35,7 +35,7 @@ if [ -d "${DOCKER_BUILD_DIR}" ] ; then fi # Set the tag for the base image -BASE_TAG=${BASE_TAG:-"localhost:5001/vpp-kube-test-base:latest"} +BASE_TAG=${BASE_TAG:-"localhost:5001/vpp-kube-base:latest"} echo "=== Building base image ===" # shellcheck disable=2086 diff --git a/test-c/kube-test/script/build_kube.sh b/test-c/kube-test/script/build_kube.sh index 11c278d8233..aa3d4056fee 100755 --- a/test-c/kube-test/script/build_kube.sh +++ b/test-c/kube-test/script/build_kube.sh @@ -80,7 +80,7 @@ fi echo "=== Building all containers using build-images.sh ===" ( # Export necessary environment variables for build-images.sh - export BASE_TAG="localhost:$REGISTRY_PORT/vpp-test-base:latest" + export BASE_TAG="localhost:$REGISTRY_PORT/vpp-kube-base:latest" export OS_ARCH export UBUNTU_VERSION export HTTP_PROXY -- 2.16.6