summaryrefslogtreecommitdiffstats
path: root/docker/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'docker/scripts')
-rw-r--r--docker/scripts/README.md8
-rw-r--r--docker/scripts/lib_common.sh2
-rw-r--r--docker/scripts/lib_vpp.sh3
3 files changed, 5 insertions, 8 deletions
diff --git a/docker/scripts/README.md b/docker/scripts/README.md
index fbb549337..63a0c6a82 100644
--- a/docker/scripts/README.md
+++ b/docker/scripts/README.md
@@ -250,8 +250,9 @@ script will be written to automate the process.
## DockerHub Repositories
-- fdiotools/builder-debian10
+- fdiotools/builder-debian11
- fdiotools/builder-ubuntu2004
+- fdiotools/builder-ubuntu2204
- fdiotools/csit_dut-ubuntu2004
- fdiotools/csit_shim-ubuntu2004
@@ -269,7 +270,4 @@ 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.
-- test-x86_64: Tag used to select the x86_64 sandbox image by the associated
-Jenkins-Nomad Label.
-- test-aarch64: Tag used to select the aarch64 sandbox image by the associated
-Jenkins-Nomad Label.
+
diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh
index f4eec961e..09fbc0914 100644
--- a/docker/scripts/lib_common.sh
+++ b/docker/scripts/lib_common.sh
@@ -157,7 +157,7 @@ export EXECUTOR_CLASSES="$EXECUTOR_DEFAULT_CLASS csit_dut csit_shim"
export EXECUTOR_ARCHS="aarch64 x86_64"
declare -A EXECUTOR_CLASS_ARCH_OS_NAMES
EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-20.04 ubuntu-22.04"
-EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-10 debian-11 ubuntu-20.04 ubuntu-22.04"
+EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-11 ubuntu-20.04 ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-aarch64"]="ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_dut-x86_64"]="ubuntu-22.04"
EXECUTOR_CLASS_ARCH_OS_NAMES["csit_shim-aarch64"]="ubuntu-22.04"
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index a14fc3634..6d9a9d337 100644
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -96,8 +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-10"]="stable/2202"
VPP_BRANCHES["debian-11"]="stable/2206 stable/2210 master"
-VPP_BRANCHES["ubuntu-20.04"]="stable/2202 stable/2206 stable/2210 master"
+VPP_BRANCHES["ubuntu-20.04"]="stable/2206 stable/2210 master"
VPP_BRANCHES["ubuntu-22.04"]="stable/2210 master"
export VPP_BRANCHES