chore: update docker builder scripts for stable/2506

- Update to latest docker dind images
- update golang version to 1.24.4

Change-Id: I309a1a00fecacd3151b0cd97e076f68fa93c4cc8
Signed-off-by: Dave Wallace <[email protected]>

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index ee1c599..1c8a098 100644 (file)
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -25,10 +25,10 @@ select_dind_image() {
 
     case "$input_image" in
         "ubuntu:22.04")
-            echo "cruizba/ubuntu-dind:jammy-26.1.3-r2|true"
+            echo "cruizba/ubuntu-dind:jammy-28.2.1|true"
             ;;
         "ubuntu:24.04")
-            echo "cruizba/ubuntu-dind:noble-26.1.3-r2|true"
+            echo "cruizba/ubuntu-dind:noble-28.2.1|true"
             ;;
         *)
             echo "$input_image|false"

diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 262e635..43b026c 100644 (file)
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -237,7 +237,7 @@ export DOCKER_VPP_DL_CACHE_DIR="$DOCKER_BUILD_DIR"/vpp_ext_deps_downloads
 export DOCKER_CSIT_DIR="$DOCKER_BUILD_DIR/csit"
 export DOCKER_DOWNLOADS_DIR="/root/Downloads"
 export DOCKER_BUILD_FILES_DIR="$DOCKER_BUILD_DIR/files"
-export DOCKER_GOLANG_VERSION="1.22.5"
+export DOCKER_GOLANG_VERSION="1.24.4"
 
 docker_build_setup_ciman() {
     if [ "$(dirname $CIMAN_ROOT)" != "$DOCKER_BUILD_DIR" ] ; then

diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 72b32bb..f27178c 100644 (file)
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -34,8 +34,8 @@ export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]}
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A CSIT_VPP_BRANCHES
-CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master"
-CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master"
+CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 stable/2506 master"
+CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 stable/2506 master"
 export CSIT_VPP_BRANCHES
 
 CSIT_SUPPORTED_EXECUTOR_CLASSES="builder csit_dut"

diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 83dd2c9..706be12 100644 (file)
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -122,7 +122,7 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["debian-12"]="stable/2410 stable/2502 master"
-VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master"
-VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master"
+VPP_BRANCHES["debian-12"]="stable/2410 stable/2502 stable/2506 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 stable/2506 master"
+VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 stable/2506 master"
 export VPP_BRANCHES