summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorVanessa Valderrama <vvalderrama@linuxfoundation.org>2024-09-13 18:43:10 +0000
committerGerrit Code Review <gerrit@fd.io>2024-09-13 18:43:10 +0000
commit7933a87d71175656cf547f772776ae849e54f3a2 (patch)
tree60bd95c043c7d1708a91a06159c627133a236b66 /jjb
parent96ae1afd2937ec1cedd4d5688fe5942a3d678551 (diff)
parent7435c2dd66dc0c2ee05c003be41414c0c4a963bb (diff)
Merge "Add debian-12 support."
Diffstat (limited to 'jjb')
-rw-r--r--jjb/scripts/publish_library_py.sh2
-rw-r--r--jjb/vpp/vpp-preprod.yaml7
2 files changed, 5 insertions, 4 deletions
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':