make: add OSMOCOM_REPO_PATH

Allow to change the path between OSMOCOM_REPO_MIRROR and
OSMOCOM_REPO_VERSION. While at it, tweak related comments (comment above
the variable as usually, replace "repo" wording with "feed" for the
latest/nightly variable as we usually refer to it as feed), and mention
OSMOCOM_REPO_* in README.md.

In order to be able to use a different mirror for testsuite and systems
under test, the testsuite related Dockerfiles (osmocom-bb-host-master,
debian-stretch-titan) are not using OSMOCOM_REPO_PATH. We could add a
OSMOCOM_REPO_TESTSUITE_PATH on demand, as mentioned in the next commit.

Related: SYS#5370
Change-Id: I8010a4d49d4620a5c47c2ff4f909a9aeeaad7b73

16 files changed, 50 insertions, 25 deletions

diff --git a/README.md b/README.md
index 1cd9488..490e2a8 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,10 @@ Environment variables:
 * `KERNEL_URL`: git remote url (default: net-next.git on kernel.org)
 * `KERNEL_BRANCH` branch to checkout (default: master)
 
+The OBS repository mirror consists of
+`${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}`,
+e.g. `https://download.opensuse.org/repositories/network:/osmocom:/latest/`.
+
 ### Creating kernel config fragments
 For the kernel tests, we are storing kernel config fragments in the git
 repository instead of full kernel configs. Generate them as follows:
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 0e8b5f5..e36e3f0 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -3,6 +3,7 @@ ARG	UPSTREAM_DISTRO=centos:centos8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 # Let package metadata expire after 60 seconds instead of 48 hours
 RUN	echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
@@ -14,9 +15,9 @@ RUN	dnf install -y dnf-utils wget && \
 	{ echo "[network_osmocom_nightly]"; \
 	  echo "name=Nightly packages of the Osmocom project (CentOS_8)"; \
 	  echo "type=rpm-md"; \
-	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/repositories/network:/osmocom:/nightly/CentOS_8/"; \
+	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/"; \
 	  echo "gpgcheck=1"; \
-	  echo "gpgkey=${MIRROR_HTTPS}/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml.key"; \
+	  echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/repodata/repomd.xml.key"; \
 	  echo "enabled=1"; \
 	} > /etc/yum.repos.d/network:osmocom:nightly.repo
 
@@ -61,4 +62,4 @@ RUN	dnf install -y \
 COPY	.common/respawn.sh /usr/local/bin/respawn.sh
 
 # Invalidate cache once the repository is updated
-ADD	$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
+ADD	${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile
index 6e4f27e..5c2bd7d 100644
--- a/centos8-obs-latest/Dockerfile
+++ b/centos8-obs-latest/Dockerfile
@@ -3,6 +3,7 @@ ARG	UPSTREAM_DISTRO=centos:centos8
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 # Let package metadata expire after 60 seconds instead of 48 hours
 RUN	echo "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
@@ -15,9 +16,9 @@ RUN	dnf install -y dnf-utils wget && \
 	{ echo "[network_osmocom_latest]"; \
 	  echo "name=Latest tagged versions of osmocom cellular network elements (CentOS_8)"; \
 	  echo "type=rpm-md"; \
-	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/repositories/network:/osmocom:/latest/CentOS_8/"; \
+	  echo "baseurl=${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/CentOS_8/"; \
 	  echo "gpgcheck=1"; \
-	  echo "gpgkey=${MIRROR_HTTPS}/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml.key"; \
+	  echo "gpgkey=${MIRROR_HTTPS}/${OSMOCOM_REPO_PATH}/latest/CentOS_8/repodata/repomd.xml.key"; \
 	  echo "enabled=1"; \
 	} > /etc/yum.repos.d/network:osmocom:latest.repo
 
@@ -28,4 +29,4 @@ RUN	dnf install -y \
 COPY	.common/respawn.sh /usr/local/bin/respawn.sh
 
 # Invalidate cache once the repository is updated
-ADD	$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
+ADD	${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile
index e909731..10b2c88 100644
--- a/debian-buster-erlang/Dockerfile
+++ b/debian-buster-erlang/Dockerfile
@@ -2,10 +2,11 @@ ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:buster
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_10/"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_10/"
 
 # install the erlang vm and rebar (2)
 RUN	apt-get update && \
diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
index baa076a..ff69d35 100644
--- a/debian-buster-jenkins/Dockerfile
+++ b/debian-buster-jenkins/Dockerfile
@@ -6,6 +6,7 @@ ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:${DEBIAN_VERSION}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 # Make "$DEBIAN_VERSION" available after FROM
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
@@ -169,7 +170,7 @@ ENV LANG en_US.UTF-8
 # Install packages from Osmocom OBS repositories:
 # * osmo-remsim: libulfius
 # * osmo-trx: liblimesuite-dev, libuhd-dev
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
 COPY	.common/Release.key /tmp/Release.key
 RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
diff --git a/debian-buster-simtrace2/Dockerfile b/debian-buster-simtrace2/Dockerfile
index e07e65a..a8765b9 100644
--- a/debian-buster-simtrace2/Dockerfile
+++ b/debian-buster-simtrace2/Dockerfile
@@ -2,10 +2,11 @@ ARG	USER
 FROM	$USER/debian-buster-build
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_10/"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index 087a783..d95e249 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -2,10 +2,11 @@ ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:jessie
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 MAINTAINER Harald Welte <laforge@gnumonks.org>
 
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_8.0/"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_8.0/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile
index 2c3128e..b04eb8e 100644
--- a/debian-stretch-build/Dockerfile
+++ b/debian-stretch-build/Dockerfile
@@ -3,7 +3,8 @@ ARG	UPSTREAM_DISTRO=debian:stretch
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/"
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
diff --git a/debian-stretch-jenkins/Dockerfile b/debian-stretch-jenkins/Dockerfile
index 43a4035..162ab84 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -6,6 +6,7 @@ ARG	REGISTRY=docker.io
 FROM	${REGISTRY}/debian:${DEBIAN_VERSION}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 
 # Make "$DEBIAN_VERSION" available after FROM
 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
@@ -169,7 +170,7 @@ ENV LANG en_US.UTF-8
 # Install packages from Osmocom OBS repositories:
 # * osmo-remsim: libulfius
 # * osmo-trx: liblimesuite-dev, libuhd-dev
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/nightly/Debian_9.0/"
 COPY	.common/Release.key /tmp/Release.key
 RUN	apt-key add /tmp/Release.key && \
 	rm /tmp/Release.key && \
diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile
index 3089712..aaf1b43 100644
--- a/debian-stretch-obs-latest/Dockerfile
+++ b/debian-stretch-obs-latest/Dockerfile
@@ -3,7 +3,8 @@ ARG	UPSTREAM_DISTRO=debian:stretch
 FROM	${REGISTRY}/${UPSTREAM_DISTRO}
 # Arguments used after FROM must be specified again
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
-ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG	OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_9.0/"
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
diff --git a/make/Makefile b/make/Makefile
index 3b4ea81..6d053f9 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -37,10 +37,16 @@ OSMO_STP_BRANCH?=master
 PULL?=
 UPSTREAM_DISTRO?=debian:stretch
 DISTRO?=debian-stretch
-OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
+
+# Full OBS repository mirror consists of:
+# ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}
+# e.g. "https://download.opensuse.org/repositories/network:/osmocom:/latest/"
+#
 # Use if down: OSMOCOM_REPO_MIRROR=http://ftp.uni-stuttgart.de/opensuse
+OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
+OSMOCOM_REPO_PATH?=repositories/network:/osmocom:
+# Use "nightly" to use the nightly feed
 OSMOCOM_REPO_VERSION?=latest
-# Use "nightly" to use the nightly repo
 
 ROOT_DIR=$(shell git rev-parse --show-toplevel)
 RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support
@@ -76,6 +82,7 @@ docker-build: .release
 		--build-arg UPSTREAM_DISTRO=$(UPSTREAM_DISTRO) \
 		--build-arg DISTRO=$(DISTRO) \
 		--build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \
+		--build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \
 		--build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \
 		--build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \
 		--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile
index 5b28b44..61978ed 100644
--- a/osmo-ran/Dockerfile
+++ b/osmo-ran/Dockerfile
@@ -3,12 +3,13 @@ FROM	$USER/systemd
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
 MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
-ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile
index eec69ec..0cf8347 100644
--- a/osmo-ran/split/ran-bsc_mgw/Dockerfile
+++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile
@@ -3,12 +3,13 @@ FROM	$USER/systemd
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
 MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
-ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile
index c3a1219..e49b8b1 100644
--- a/osmo-ran/split/ran-bts_pcu/Dockerfile
+++ b/osmo-ran/split/ran-bts_pcu/Dockerfile
@@ -3,12 +3,13 @@ FROM	$USER/systemd
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
 MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
-ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile
index b3677b4..bcd84cb 100644
--- a/osmo-ran/split/ran-trx-ipc/Dockerfile
+++ b/osmo-ran/split/ran-trx-ipc/Dockerfile
@@ -3,12 +3,13 @@ FROM	$USER/systemd
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
 MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
-ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
 
 COPY	.common/Release.key /tmp/Release.key
 
diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile
index 9279112..08baa07 100644
--- a/osmo-ran/split/ran-trx-uhd/Dockerfile
+++ b/osmo-ran/split/ran-trx-uhd/Dockerfile
@@ -3,12 +3,13 @@ FROM	$USER/systemd
 # Arguments used after FROM must be specified again
 ARG	DISTRO
 ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
 ARG	OSMOCOM_REPO_VERSION=latest
 
 MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de>
 
-ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/"
-ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/"
+ARG	OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/"
+ARG	OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/"
 
 COPY	.common/Release.key /tmp/Release.key