From: Dave Wallace Date: Fri, 13 Jun 2025 04:09:20 +0000 (-0400) Subject: tests: run docker login script hs-test jobs X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F43153%2F2;p=vpp.git tests: run docker login script hs-test jobs - login to docker hub in the CI to avoid hitting the docker hub rate-limiter Type: test Change-Id: I4f6a854136b9bae9da1493a2aaa88576a64b314d Signed-off-by: Dave Wallace --- diff --git a/extras/hs-test/docker/setup-local-registry.sh b/extras/hs-test/docker/setup-local-registry.sh index 684f858584a..638a2f898d1 100755 --- a/extras/hs-test/docker/setup-local-registry.sh +++ b/extras/hs-test/docker/setup-local-registry.sh @@ -3,6 +3,11 @@ set -e +DOCKER_LOGIN_SCRIPT="/scratch/nomad/.docker-ro/dlogin.sh" +if [ -x "$DOCKER_LOGIN_SCRIPT" ] ; then + $DOCKER_LOGIN_SCRIPT +fi + # Check if Docker is running if ! docker info &>/dev/null; then echo "Error: Docker is not running. Please start Docker and try again." diff --git a/extras/hs-test/script/build-images.sh b/extras/hs-test/script/build-images.sh index 86398f881be..74bb2eb06cd 100755 --- a/extras/hs-test/script/build-images.sh +++ b/extras/hs-test/script/build-images.sh @@ -10,10 +10,15 @@ ARCH=${OS_ARCH:-$(dpkg --print-architecture)} DOCKER_BUILD_DIR="/scratch/docker-build" DOCKER_CACHE_DIR="${DOCKER_BUILD_DIR}/docker_cache" DOCKER_HST_BUILDER="hst_builder" +DOCKER_LOGIN_SCRIPT="/scratch/nomad/.docker-ro/dlogin.sh" if [ -d "${DOCKER_BUILD_DIR}" ] ; then mkdir -p "${DOCKER_CACHE_DIR}" + if [ -x "$DOCKER_LOGIN_SCRIPT" ] ; then + $DOCKER_LOGIN_SCRIPT + fi + # Create buildx builder if it doesn't exist if ! docker buildx ls --format "{{.Name}}" | grep -q "${DOCKER_HST_BUILDER}"; then docker buildx create --use \ diff --git a/extras/hs-test/script/build_hst.sh b/extras/hs-test/script/build_hst.sh index 0e7656354f7..a36037c0b67 100755 --- a/extras/hs-test/script/build_hst.sh +++ b/extras/hs-test/script/build_hst.sh @@ -38,6 +38,10 @@ fi 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" +if [ -x "$DOCKER_LOGIN_SCRIPT" ] ; then + $DOCKER_LOGIN_SCRIPT +fi # Set up the local registry before creating containers echo "=== Setting up local registry ==="