From: Naveen Joy <najoy@cisco.com>
Date: Tue, 25 Mar 2025 19:16:45 +0000 (-0700)
Subject: hst-2404:add docker dind img selection for hst tests in Ubuntu2404
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=3b76c45e784f5dfbdb0a0cdce42553b8b345ab2e;p=ci-management.git

hst-2404:add docker dind img selection for hst tests in Ubuntu2404

Change-Id: I33f30b3a24a118bc83cefd7b47ca3a60f885a1d7
Signed-off-by: Naveen Joy <najoy@cisco.com>
---

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 356e8818b..beeb4829d 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -20,8 +20,26 @@ if [ -n "$(alias lib_apt_imported 2> /dev/null)" ] ; then
 fi
 alias lib_apt_imported=true
 
-DIND_FROM_IMAGE="cruizba/ubuntu-dind:jammy-26.1.3-r2"
-HST_FROM_IMAGE="ubuntu:22.04"
+select_dind_image() {
+    local input_image="$1"
+    local dind_image=""
+
+    case "$input_image" in
+      "ubuntu:22.04")
+        dind_image="cruizba/ubuntu-dind:jammy-26.1.3-r2"
+        is_dind_image="true"
+        ;;
+      "ubuntu:24.04")
+        dind_image="cruizba/ubuntu-dind:noble-26.1.3-r2"
+        is_dind_image="true"
+        ;;
+      *)
+        dind_image="$input_image"
+        ;;
+    esac
+
+    echo "$dind_image"
+}
 
 export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
 . "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
@@ -374,10 +392,7 @@ generate_apt_dockerfile() {
     local is_dind_image="false"
 
     # TODO: Enable HST on AARCH64 when supported in vpp/extras/hs-test
-    if [ "$from_image" = "$HST_FROM_IMAGE" ] ; then
-        from_image="$DIND_FROM_IMAGE"
-        is_dind_image="true"
-    fi
+    from_image=$(select_dind_image "$from_image")
 
     cat <<EOF  >"$DOCKERIGNOREFILE"
 **/__pycache__