osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33993 )
Change subject: jobs/master,gerrit: don't use bullseye for python2 ......................................................................
jobs/master,gerrit: don't use bullseye for python2
openbsc, osmo-e1-recorder, osmo-smlc have been adjusted to not require python2 anymore. Let them use debian 12 for building.
Closes: OS#5950 Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 16 insertions(+), 10 deletions(-)
Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 1324df6..d2aaaae 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -133,7 +133,6 @@ pipeline_binpkgs: "debian:10 debian:12"
- openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -367,7 +366,6 @@ - osmo-cbc
- osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) pipeline_binpkgs: ""
- gapk: @@ -378,9 +376,7 @@ - osmo-el2tpd: pipeline_binpkgs: ""
- - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - + - osmo-smlc - osmo-gbproxy - osmo-hnodeb
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4b1609a..6837d78 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,7 +222,6 @@ trigger: master-osmo-trx
- openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -464,13 +463,11 @@
- osmo-e1d - osmo-cbc - - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-smlc - osmo-gbproxy - osmo-hnodeb
-
osmith