From 106120cace3630a1b99c26dba5b8d646dd962a79 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 10 May 2023 12:05:24 +0200 Subject: obs: build_binpkg: add feed argument Make it possible to configure a different feed than master inside the docker container that gets used to build the packages. This way we can build ubuntu packages against nightly. We don't build the Osmocom packages in the master feed for Ubuntu as we rarely have a build error that only happens on ubuntu. With this patch, it can be easily reproduced if it happens. Change-Id: Ibc27459815f26e8c691c83fe594ff84962b991f5 --- scripts/obs/data/build_binpkg.Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'scripts/obs/data/build_binpkg.Dockerfile') diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index c3c1b1e..49cdc96 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -1,6 +1,7 @@ ARG DISTRO_FROM FROM ${DISTRO_FROM} ARG DISTRO +ARG FEED ARG UID COPY Release.key /tmp/Release.key @@ -58,24 +59,24 @@ RUN set -x; \ debian:*) \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb https://downloads.osmocom.org/packages/osmocom:/master/Debian_$VERSION/ ./" \ - > /etc/apt/sources.list.d/osmocom-master.list \ + echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/Debian_$VERSION/ ./" \ + > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ ubuntu:*) \ apt-key add /tmp/Release.key && \ rm /tmp/Release.key && \ - echo "deb https://downloads.osmocom.org/packages/osmocom:/master/xUbuntu_$VERSION/ ./" \ - > /etc/apt/sources.list.d/osmocom-master.list \ + echo "deb https://downloads.osmocom.org/packages/osmocom:/$FEED/xUbuntu_$VERSION/ ./" \ + > /etc/apt/sources.list.d/osmocom-$FEED.list \ ;; \ almalinux:*) \ - { echo "[network_osmocom_master]"; \ - echo "name=osmocom:master"; \ + { echo "[network_osmocom_$FEED]"; \ + echo "name=osmocom:$FEED"; \ echo "type=rpm-md"; \ - echo "baseurl=https://downloads.osmocom.org/packages/osmocom:/master/CentOS_$VERSION/"; \ + echo "baseurl=https://downloads.osmocom.org/packages/osmocom:/$FEED/CentOS_$VERSION/"; \ echo "gpgcheck=1"; \ - echo "gpgkey=https://downloads.osmocom.org/packages/osmocom:/master/CentOS_$VERSION/repodata/repomd.xml.key"; \ + echo "gpgkey=https://downloads.osmocom.org/packages/osmocom:/$FEED/CentOS_$VERSION/repodata/repomd.xml.key"; \ echo "enabled=1"; \ - } > /etc/yum.repos.d/network:osmocom:master.repo \ + } > /etc/yum.repos.d/network:osmocom:$FEED.repo \ ;; \ *) \ echo "can't install repo for $DISTRO" && \ -- cgit v1.2.3