diff options
| author |   Vanessa Valderrama <vvalderrama@linuxfoundation.org> | 2024-09-13 18:43:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2024-09-13 18:43:10 +0000 |
| commit | 7933a87d71175656cf547f772776ae849e54f3a2 (patch) | |
| tree | 60bd95c043c7d1708a91a06159c627133a236b66 /docker | |
| parent | 96ae1afd2937ec1cedd4d5688fe5942a3d678551 (diff) | |
| parent | 7435c2dd66dc0c2ee05c003be41414c0c4a963bb (diff) | |
Merge "Add debian-12 support."
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/scripts/dbld_lfit_requirements.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_common.sh | 2 | ||||
| -rw-r--r-- | docker/scripts/lib_vpp.sh | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/docker/scripts/dbld_lfit_requirements.sh b/docker/scripts/dbld_lfit_requirements.sh index b28fc0e44..c67c2e579 100755 --- a/docker/scripts/dbld_lfit_requirements.sh +++ b/docker/scripts/dbld_lfit_requirements.sh @@ -49,7 +49,7 @@ EOF # Install lftools & boto3 for log / artifact upload. pip_options="" -if [ "$OS_CODENAME" = "noble" ] ; then +if [ "$OS_CODENAME" = "noble" ] || [ "$OS_CODENAME" = "bookworm" ] ; then pip_options=" --break-system-packages" fi python3 -m pip install$pip_options boto3 diff --git a/docker/scripts/lib_common.sh b/docker/scripts/lib_common.sh index 54d291e3f..916191b80 100644 --- a/docker/scripts/lib_common.sh +++ b/docker/scripts/lib_common.sh @@ -154,7 +154,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 ubuntu-24.04" -EXECUTOR_CLASS_ARCH_OS_NAMES["builder-x86_64"]="debian-11 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["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 ff4ebd47f..54aa4bee0 100644 --- a/docker/scripts/lib_vpp.sh +++ b/docker/scripts/lib_vpp.sh @@ -123,6 +123,7 @@ docker_build_setup_vpp() { # definitions here. declare -A VPP_BRANCHES VPP_BRANCHES["debian-11"]="stable/2402 stable/2406 master" +VPP_BRANCHES["debian-12"]="master" VPP_BRANCHES["ubuntu-20.04"]="stable/2402 stable/2406 master" VPP_BRANCHES["ubuntu-22.04"]="stable/2402 stable/2406 master" VPP_BRANCHES["ubuntu-24.04"]="master" |