laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31910 )

Change subject: obs: build_binpkg: add ubuntu 22.04 ......................................................................

obs: build_binpkg: add ubuntu 22.04

Add it for debugging a build failure that we only saw on Ubuntu.

Related: OS#5946 Change-Id: I4a927447d8f8b89411b93c563fbc6aa8d4998ffa --- M scripts/obs/build_binpkg.py M scripts/obs/data/build_binpkg.Dockerfile M scripts/obs/data/build_binpkg_manuals.Dockerfile M scripts/obs/lib/config.py 4 files changed, 22 insertions(+), 3 deletions(-)

Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified

diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index dcd6cdc..1ee9636 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -64,7 +64,7 @@

script_path = "data/build.sh"

- if not distro.startswith("debian:"): + if not distro.startswith("debian:") and not distro.startswith("ubuntu:"): env["PACKAGEFORMAT"] = "rpm"

if args.docker: diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 925680d..bd12562 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -16,7 +16,7 @@ # to regenerate the manuals database when installing build dependencies. # SYS#5818: using almalinux:8 instead of centos:8 RUN case "$DISTRO" in \ - debian*) \ + debian*|ubuntu*) \ echo "path-exclude=/usr/share/man/*" \ > /etc/dpkg/dpkg.cfg.d/exclude-man-pages && \ rm -rf /usr/share/man/ && \ @@ -59,6 +59,12 @@ echo "deb https://downloads.osmocom.org/packages/osmocom:/master/Debian_11/ ./" \ > /etc/apt/sources.list.d/osmocom-master.list \ ;; \ + ubuntu:22.04) \ + apt-key add /tmp/Release.key && \ + rm /tmp/Release.key && \ + echo "deb https://downloads.osmocom.org/packages/osmocom:/master/xUbuntu_22.04/ ./" \ + > /etc/apt/sources.list.d/osmocom-master.list \ + ;; \ almalinux:8) \ { echo "[network_osmocom_master]"; \ echo "name=osmocom:master"; \ diff --git a/scripts/obs/data/build_binpkg_manuals.Dockerfile b/scripts/obs/data/build_binpkg_manuals.Dockerfile index fd4c709..c2b1211 100644 --- a/scripts/obs/data/build_binpkg_manuals.Dockerfile +++ b/scripts/obs/data/build_binpkg_manuals.Dockerfile @@ -10,7 +10,7 @@ ARG DISTRO

RUN case "$DISTRO" in \ - debian*) \ + debian*|ubuntu*) \ apt-get update && \ apt-get install -y --no-install-recommends \ osmo-gsm-manuals-dev \ diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 473916b..15e4d44 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -114,4 +114,5 @@ docker_distro_default = "debian:11" docker_distro_other = [ "almalinux:8", # instead of centos:8 (SYS#5818) + "ubuntu:22.04", ]