diff options
| -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 | ||||
| -rw-r--r-- | extras/bash/sandbox_test_functions.sh | 4 | ||||
| -rw-r--r-- | jjb/scripts/publish_library_py.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/vpp-preprod.yaml | 7 |
6 files changed, 10 insertions, 8 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" diff --git a/extras/bash/sandbox_test_functions.sh b/extras/bash/sandbox_test_functions.sh index ae37d3a19..f952dd335 100644 --- a/extras/bash/sandbox_test_functions.sh +++ b/extras/bash/sandbox_test_functions.sh @@ -29,7 +29,7 @@ jjb-sandbox-env() { - local jjb_version=${JJB_VERSION:-"6.0.0"} + local jjb_version=${JJB_VERSION:-"6.4.1"} if [ -z "$WS_ROOT" ] ; then echo "ERROR: WS_ROOT is not set!" @@ -73,7 +73,7 @@ jjb-sandbox-env() && python3 -m venv $VENV_DIR \ && source $VENV_DIR/bin/activate \ && pip3 install --upgrade pip \ - && pip3 install wheel \ + && pip3 install --upgrade setuptools \ && pip3 install jenkins-job-builder==$jjb_version alias jjsb='jenkins-jobs --conf $JENKINS_INI' diff --git a/jjb/scripts/publish_library_py.sh b/jjb/scripts/publish_library_py.sh index db60c1dbe..af4f22a08 100644 --- a/jjb/scripts/publish_library_py.sh +++ b/jjb/scripts/publish_library_py.sh @@ -21,7 +21,7 @@ PYTHON_SCRIPT="/w/workspace/publish_library.py" OS_CODENAME="$(grep 'VERSION_CODENAME=' /etc/os-release | cut -d= -f2)" pip_options="" -if [ "$OS_CODENAME" = "noble" ] ; then +if [ "$OS_CODENAME" = "noble" ] || [ "$OS_CODENAME" = "bookworm" ] ; then pip_options=" --break-system-packages" fi # shellcheck disable=SC2086 diff --git a/jjb/vpp/vpp-preprod.yaml b/jjb/vpp/vpp-preprod.yaml index a4685211c..547b17336 100644 --- a/jjb/vpp/vpp-preprod.yaml +++ b/jjb/vpp/vpp-preprod.yaml @@ -44,13 +44,14 @@ project: 'vpp' os: - 'ubuntu2404' + - 'debian12' make-parallel-jobs: '4' - make-test-multiworker-os: 'debian-11' + make-test-multiworker-os: 'debian-11 debian-12' make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' stream: - 'master': branch: 'master' - branch-refspec: '' + branch-refspec: 'refs/changes/61/41561/3' executor-arch: 'x86_64' # [end] VPP-X86_64 PROJECT @@ -109,7 +110,7 @@ os: - 'ubuntu2404' make-parallel-jobs: '4' - make-test-multiworker-os: 'debian-11' + make-test-multiworker-os: 'debian-11 debian-12' make-test-os: 'ubuntu-20.04 ubuntu-22.04 ubuntu-24.04' stream: - 'master': |