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

Change subject: obs: build_binpkg: use almalinux:8 naming ......................................................................

obs: build_binpkg: use almalinux:8 naming

Instead of using "--docker centos:8" as argument and translating it later on in the code to use "almalinux:8" as base distribution, use "--docker almalinux:8" as argument. It was brought up in code review that this makes it less confusing.

Related: OS#2385 Change-Id: Id8298e8bafe065010f7bc00f1ff261aa6431ed4c --- M scripts/obs/data/build_binpkg.Dockerfile M scripts/obs/lib/config.py M scripts/obs/lib/docker.py 3 files changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index de53478..201c7e5 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -14,6 +14,7 @@ # https://build.opensuse.org/projects/CentOS:CentOS-8/prjconf # For debian, make sure we don't have man pages as otherwise it takes some time # to regenerate the manuals database when installing build dependencies. +# SYS#5818: using almalinux:8 instead of centos:8 RUN case "$DISTRO" in \ debian*) \ echo "path-exclude=/usr/share/man/*" \ @@ -29,7 +30,7 @@ && \ apt-get clean \ ;; \ - centos*) \ + almalinux*) \ dnf -y install \ autoconf \ automake \ @@ -58,7 +59,7 @@ echo "deb https://downloads.osmocom.org/packages/osmocom:/master/Debian_11/ ./" \ > /etc/apt/sources.list.d/osmocom-master.list \ ;; \ - centos:8) \ + almalinux:8) \ { echo "[network_osmocom_master]"; \ echo "name=Nightly packages of the Osmocom project (CentOS_8)"; \ echo "type=rpm-md"; \ diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 393251b..d9f6bfe 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -113,5 +113,5 @@

docker_distro_default = "debian:11" docker_distro_other = [ - "centos:8", + "almalinux:8", # instead of centos:8 (SYS#5818) ] diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index 136aeeb..87611e3 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -19,10 +19,6 @@ if image_type.endswith("_manuals"): return get_image_name(distro, image_type.replace("_manuals", ""))

- # CentOS 8 is EOL (SYS#5818) - if distro == "centos:8": - return "almalinux:8" - return distro