osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40859?usp=email ) Change subject: OBS: support building debian trixie (13) pkgs ...................................................................... OBS: support building debian trixie (13) pkgs Translate "debian:13" to "debian:trixie", as for some reason no docker tag is getting pushed for "debian:13". With this we can keep using the usual short naming scheme in pipeline_binpkgs lines in gerrit-verifications.yml (see next patch). Change-Id: I1377af7f74f074ed6e28e07dee82360d024edd05 --- M scripts/obs/lib/docker.py 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index a68c7f9..68ed28d 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -19,8 +19,16 @@ if image_type.endswith("_manuals"): return get_image_name(distro, image_type.replace("_manuals", "")) - if distro == "debian:10": - distro = "debian/eol:buster" + # Ensure we can use short names like "debian:13" instead of "debian:trixie" + # even though upstream apparently doesn't push the number-tags anymore: + # https://hub.docker.com/_/debian + match distro: + case "debian:10": + distro = "debian/eol:buster" + # debian:11 points to debian:bullseye upstream + # debian:12 points to debian:bookworm upstream + case "debian:13": + distro = "debian:trixie" return distro -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40859?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1377af7f74f074ed6e28e07dee82360d024edd05 Gerrit-Change-Number: 40859 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>