From 93580b1071398dbff9b64d73ba1554095335afcc Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Wed, 20 Sep 2023 14:20:18 -0400
Subject: Add stable/2310 branch to docker executor image scripts

- also clean up stale TODO's

Change-Id: I7106bcf8566560c3f85767afac1405d4a7c8d25a
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
---
 docker/scripts/README.md                     | 4 +---
 docker/scripts/dbld_vpp_install_packages.sh  | 3 ---
 docker/scripts/lib_common.sh                 | 3 ---
 docker/scripts/lib_vpp.sh                    | 6 +++---
 docker/scripts/update_dockerhub_prod_tags.sh | 6 ++----
 5 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'docker/scripts')

diff --git a/docker/scripts/README.md b/docker/scripts/README.md
index 63a0c6a82..5fb4cee40 100644
--- a/docker/scripts/README.md
+++ b/docker/scripts/README.md
@@ -183,8 +183,7 @@ tags, but for now testing is a manual operation.
 
 2. Edit jjb/vpp/vpp.yam (or other project yaml file) and replace '-prod-' with '-sandbox-' for all of the docker image
 
-3. `jjb-sandbox-env`  # This bash function currently lives in ../vpp/extras/bash/functions.sh
- - TODO: move it to ci-management repo.
+3. `jjb-sandbox-env`
 
 4. For each job using one of the docker images:
 
@@ -270,4 +269,3 @@ a production image to the previous image used in production.
 Jenkins-Nomad Label.
 - sandbox-aarch64: Tag used to select the aarch64 sandbox image by the
 associated Jenkins-Nomad Label.
-
diff --git a/docker/scripts/dbld_vpp_install_packages.sh b/docker/scripts/dbld_vpp_install_packages.sh
index 3af55dd61..c30fb25b5 100755
--- a/docker/scripts/dbld_vpp_install_packages.sh
+++ b/docker/scripts/dbld_vpp_install_packages.sh
@@ -60,9 +60,6 @@ for branch in ${VPP_BRANCHES[$OS_NAME]} ; do
     # Install/cache python packages
     make_vpp_test "test-dep" "$branch"
     if [ "$OS_ID" = "ubuntu" ] ; then
-        # TODO: Remove make test-doc after VPP 21.06 and 21.10 are no longer supported
-        #       which is deprecated in master (VPP 22.02)
-        make_vpp_test "doc" "$branch"
         make_vpp test-wipe "$branch"
     fi
     # Clean up virtual environment
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index 09fbc0914..150441bb7 100644
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -124,9 +124,6 @@ remove_pyc_files_and_pycache_dirs() {
 }
 
 # OS type variables
-# TODO: Investigate if sourcing /etc/os-release and using env vars from it
-#       works across all OS variants.  If so, clean up copy-pasta...
-#       Alternatively use facter as does LF Releng scripts.
 export OS_ID="$(grep '^ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
 export OS_VERSION_ID="$(grep '^VERSION_ID=' /etc/os-release | cut -d= -f2 | sed -e 's/\"//g')"
 export OS_CODENAME="$(grep 'VERSION_CODENAME=' /etc/os-release | cut -d= -f2)"
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 6a66f1595..60d4e4b6a 100644
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -96,7 +96,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-11"]="stable/2302 stable/2306 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2302 stable/2306 master"
-VPP_BRANCHES["ubuntu-22.04"]="stable/2302 stable/2306 master"
+VPP_BRANCHES["debian-11"]="stable/2302 stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2302 stable/2306 stable/2310 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2302 stable/2306 stable/2310 master"
 export VPP_BRANCHES
diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh
index 6e54cf03c..01dac644c 100755
--- a/docker/scripts/update_dockerhub_prod_tags.sh
+++ b/docker/scripts/update_dockerhub_prod_tags.sh
@@ -187,10 +187,8 @@ get_all_tags_from_dockerhub() {
 
 verify_image_version_date_format() {
     version="$1"
-    # TODO: Remove regex1 when legacy nomenclature is no longer on docker hub.
-    local regex1="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]$"
-    local regex2="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]_UTC$"
-    if [[ "$version" =~ $regex1 ]] || [[ "$version" =~ $regex2 ]]; then
+    local ver_regex="^[0-9]{4}_[0-1][0-9]_[0-3][0-9]_[0-2][0-9][0-5][0-9][0-5][0-9]_UTC$"
+    if [[ "$version" =~ $ver_regex ]]; then
         return 0
     fi
     return 1
-- 
cgit 1.2.3-korg