hs-test: change local registry port

- changed to 5001, CalicoVPP uses port 5000

Type: test

Change-Id: Ic45c613d684685f21e49612c4e6454c302bbabb6
Signed-off-by: Adrian Villin <[email protected]>

diff --git a/extras/hs-test/docker/Dockerfile.ab b/extras/hs-test/docker/Dockerfile.ab
index 5e975af..d61e125 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.ab
+++ b/extras/hs-test/docker/Dockerfile.ab
@@ -1,6 +1,6 @@
 # Apache Bench container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # apache2-utils is now installed in the base image
 

diff --git a/extras/hs-test/docker/Dockerfile.curl b/extras/hs-test/docker/Dockerfile.curl
index b76a9d8..e2fea20 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.curl
+++ b/extras/hs-test/docker/Dockerfile.curl
@@ -1,6 +1,6 @@
 # curl container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # Note: wget and xz-utils are already in the base image
 

diff --git a/extras/hs-test/docker/Dockerfile.h2load b/extras/hs-test/docker/Dockerfile.h2load
index 40bfc72..276e026 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.h2load
+++ b/extras/hs-test/docker/Dockerfile.h2load
@@ -1,6 +1,6 @@
 # h2load container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # nghttp2 is now installed in the base image
 

diff --git a/extras/hs-test/docker/Dockerfile.nginx b/extras/hs-test/docker/Dockerfile.nginx
index bc392d5..5a3e7e2 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.nginx
+++ b/extras/hs-test/docker/Dockerfile.nginx
@@ -1,6 +1,6 @@
 # nginx container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # nginx is now installed in the base image
 

diff --git a/extras/hs-test/docker/Dockerfile.nginx-http3 b/extras/hs-test/docker/Dockerfile.nginx-http3
index 568bd9b..701c66b 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.nginx-http3
+++ b/extras/hs-test/docker/Dockerfile.nginx-http3
@@ -1,6 +1,6 @@
 ARG UBUNTU_VERSION=22.04
 
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 COPY resources/nginx/vcl.conf /vcl.conf
 COPY resources/nginx/nginx_http3.conf /nginx.conf

diff --git a/extras/hs-test/docker/Dockerfile.nginx-server b/extras/hs-test/docker/Dockerfile.nginx-server
index 33c004a..5284ea7 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.nginx-server
+++ b/extras/hs-test/docker/Dockerfile.nginx-server
@@ -1,6 +1,6 @@
 # nginx server container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # nginx is now installed in the base image
 

diff --git a/extras/hs-test/docker/Dockerfile.vpp b/extras/hs-test/docker/Dockerfile.vpp
index 69414c8..1e69e2c 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.vpp
+++ b/extras/hs-test/docker/Dockerfile.vpp
@@ -1,6 +1,6 @@
 # VPP container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-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/extras/hs-test/docker/Dockerfile.wrk b/extras/hs-test/docker/Dockerfile.wrk
index ae376c5..8517a05 100644 (file)
--- a/extras/hs-test/docker/Dockerfile.wrk
+++ b/extras/hs-test/docker/Dockerfile.wrk
@@ -1,6 +1,6 @@
 # wrk HTTP benchmarking container that uses the base image
 ARG UBUNTU_VERSION=22.04
-FROM localhost:5000/vpp-test-base:latest
+FROM localhost:5001/vpp-test-base:latest
 
 # wrk is installed in the base image
 

diff --git a/extras/hs-test/docker/setup-local-registry.sh b/extras/hs-test/docker/setup-local-registry.sh
index 638a2f8..ea8cb1c 100755 (executable)
--- a/extras/hs-test/docker/setup-local-registry.sh
+++ b/extras/hs-test/docker/setup-local-registry.sh
@@ -16,7 +16,7 @@ fi
 
 # Registry container name
 REGISTRY_NAME="local-registry"
-REGISTRY_PORT=5000
+REGISTRY_PORT=${1:-5001}
 
 # Check if registry container is already running
 if docker container inspect "$REGISTRY_NAME" &>/dev/null; then
@@ -48,17 +48,17 @@ else
             echo "Adding 'localhost:$REGISTRY_PORT' to insecure-registries in /etc/docker/daemon.json"
             echo "You may need to restart Docker for changes to take effect"
             echo "Please add the following to /etc/docker/daemon.json:"
-            echo '{
-  "insecure-registries": ["localhost:5000"]
-}'
+            echo "{
+  \"insecure-registries\": [\"localhost:$REGISTRY_PORT\"]
+}"
         fi
     else
         echo "Creating /etc/docker/daemon.json with insecure-registries configuration"
         echo "You may need to restart Docker for changes to take effect"
         echo "Please create /etc/docker/daemon.json with the following content:"
-        echo '{
-  "insecure-registries": ["localhost:5000"]
-}'
+        echo "{
+  \"insecure-registries\": [\"localhost:$REGISTRY_PORT\"]
+}"
     fi
 fi
 

diff --git a/extras/hs-test/infra/hst_suite.go b/extras/hs-test/infra/hst_suite.go
index dc06934..b610b66 100644 (file)
--- a/extras/hs-test/infra/hst_suite.go
+++ b/extras/hs-test/infra/hst_suite.go
@@ -89,6 +89,7 @@ var reservedPorts = []string{
        "48879",
        "4790",
        "5000",
+       "5001",
        "6633",
        "6081",
        "53053",

diff --git a/extras/hs-test/script/build-images.sh b/extras/hs-test/script/build-images.sh
index 74bb2eb..2ec7de3 100755 (executable)
--- a/extras/hs-test/script/build-images.sh
+++ b/extras/hs-test/script/build-images.sh
@@ -34,7 +34,7 @@ if [ -d "${DOCKER_BUILD_DIR}" ] ; then
 fi
 
 # Set the tag for the base image
-BASE_TAG=${BASE_TAG:-"localhost:5000/vpp-test-base:latest"}
+BASE_TAG=${BASE_TAG:-"localhost:5001/vpp-test-base:latest"}
 
 echo "=== Building base image ==="
 # shellcheck disable=2086

diff --git a/extras/hs-test/script/build_hst.sh b/extras/hs-test/script/build_hst.sh
index a36037c..b527466 100755 (executable)
--- a/extras/hs-test/script/build_hst.sh
+++ b/extras/hs-test/script/build_hst.sh
@@ -39,6 +39,7 @@ OS_ARCH="$(uname -m)"
 DOCKER_BUILD_DIR="/scratch/docker-build"
 DOCKER_CACHE_DIR="${DOCKER_BUILD_DIR}/docker_cache"
 DOCKER_LOGIN_SCRIPT="/scratch/nomad/.docker-ro/dlogin.sh"
+REGISTRY_PORT=5001
 if [ -x "$DOCKER_LOGIN_SCRIPT" ] ; then
   $DOCKER_LOGIN_SCRIPT
 fi
@@ -46,12 +47,12 @@ fi
 # Set up the local registry before creating containers
 echo "=== Setting up local registry ==="
 if [ -x "$(dirname "$0")/../docker/setup-local-registry.sh" ]; then
-  "$(dirname "$0")/../docker/setup-local-registry.sh"
+  "$(dirname "$0")/../docker/setup-local-registry.sh" "$REGISTRY_PORT"
 else
   echo "Warning: setup-local-registry.sh not found or not executable"
   echo "Attempting to create and use local registry at localhost:5000"
   if ! docker ps | grep -q "local-registry"; then
-    docker run -d --restart=always -p 5000:5000 --name local-registry registry:2
+    docker run -d --restart=always -p $REGISTRY_PORT:5000 --name local-registry registry:2
   fi
 fi
 
@@ -83,7 +84,7 @@ fi
 echo "=== Building all containers using build-images.sh ==="
 (
     # Export necessary environment variables for build-images.sh
-    export BASE_TAG="localhost:5000/vpp-test-base:latest"
+    export BASE_TAG="localhost:$REGISTRY_PORT/vpp-test-base:latest"
     export OS_ARCH
     export UBUNTU_VERSION
     export HTTP_PROXY