diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/scripts/README.md | 12 | ||||
| -rw-r--r-- | docker/scripts/lib_apt.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_common.sh | 4 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/docker/scripts/README.md b/docker/scripts/README.md index 5fb4cee40..fc1552a0d 100644 --- a/docker/scripts/README.md +++ b/docker/scripts/README.md @@ -111,7 +111,7 @@ The following commands are useful to build the initial builder images: `cd <ci-managment repository directory>` -`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-20.04 2>&1 | tee u2004-$(uname -m).log | grep -ve '^+'` +`sudo ./docker/scripts/build_executor_docker_image.sh ubuntu-24.04 2>&1 | tee u2004-$(uname -m).log | grep -ve '^+'` `sudo ./docker/scripts/build_executor_docker_image.sh -apr sandbox 2>&1 | tee all-sandbox-$(uname -m).log | grep -ve '^+'` @@ -133,10 +133,10 @@ avoids the pitfalls encountered with Docker-In-Docker environments: The environment in the docker shell contains all of the necessary environment variable definitions so the docker scripts can be run directly on the cli. Here is an example command that would be used in a CI job -which automates the generation and testing of a new ubuntu-20.04 docker image +which automates the generation and testing of a new ubuntu-24.04 docker image and push it to Docker Hub fdiotools/builder-ubuntu2004:test-<arch>: -`build_executor_docker_image.sh -pr test ubuntu-20.04` +`build_executor_docker_image.sh -pr test ubuntu-24.04` In the future, a fully automated CI/CD pipeline may be created for production docker images. @@ -249,11 +249,9 @@ script will be written to automate the process. ## DockerHub Repositories -- fdiotools/builder-debian11 -- fdiotools/builder-ubuntu2004 +- fdiotools/builder-debian12 - fdiotools/builder-ubuntu2204 -- fdiotools/csit_dut-ubuntu2004 -- fdiotools/csit_shim-ubuntu2004 +- fdiotools/builder-ubuntu2404 ## Docker Image Tags diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index d5ec1589f..356e8818b 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -101,7 +101,7 @@ ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8" # TODO: Fix broken project requirement install targets # graphviz for doxygen (HICN) # doxygen for doxygen (HICN) -# libffi-dev for python cffi install (Ubuntu20.04/VPP/aarch64) +# libffi-dev for python cffi install (Ubuntu24.04/VPP/aarch64) # liblapack-dev for python numpy/scipy (CSIT/aarch64) # libopenblas-dev for python numpy/scipy (CSIT/aarch64) # libpcap-dev for python pypcap install (CSIT) diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index 916191b80..262e635de 100644 --- a/docker/scripts/lib_common.sh +++ b/docker/scripts/lib_common.sh @@ -153,8 +153,8 @@ export EXECUTOR_CLASS_ARCH="$EXECUTOR_DEFAULT_CLASS-$OS_ARCH" 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 ubuntu-24.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-11 debian-12 ubuntu-20.04 ubuntu-22.04 ubuntu-24.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-aarch64"]="ubuntu-22.04 ubuntu-24.04" +EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-12 ubuntu-22.04 ubuntu-24.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 440c92010..3d827a15c 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -122,9 +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-11"]="stable/2406 stable/2410 master" VPP_BRANCHES["debian-12"]="stable/2410 master" -VPP_BRANCHES["ubuntu-20.04"]="stable/2406 stable/2410 master" VPP_BRANCHES["ubuntu-22.04"]="stable/2406 stable/2410 master" VPP_BRANCHES["ubuntu-24.04"]="stable/2410 master" export VPP_BRANCHES |