<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24115">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make: add OSMOCOM_REPO_TESTSUITE_MIRROR<br><br>Make it possible to set a different mirror for debian-stretch-titan than<br>for all other containers. 2021q1 doesn't have the eclipse-titan package<br>and it doesn't make sense to build it there.<br><br>I've thought about adding OSMOCOM_REPO_TESTSUITE_PATH and<br>OSMOCOM_REPO_TESTSUITE_VERSION too, but we don't have any use for these<br>right now. Let's add them later if we should need them.<br><br>Related: SYS#5370.<br>Change-Id: I7187473c2188a864b60b03789eff62e0a527404a<br>---<br>M debian-stretch-titan/Dockerfile<br>M make/Makefile<br>M osmocom-bb-host-master/Dockerfile<br>3 files changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile</span><br><span>index e28c556..5b6b134 100644</span><br><span>--- a/debian-stretch-titan/Dockerfile</span><br><span>+++ b/debian-stretch-titan/Dockerfile</span><br><span>@@ -2,11 +2,11 @@</span><br><span> ARG UPSTREAM_DISTRO=debian:stretch</span><br><span> FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span> # Arguments used after FROM must be specified again</span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/"</span><br><span> </span><br><span> RUN apt-get update && apt-get install -y \</span><br><span> gnupg</span><br><span>diff --git a/make/Makefile b/make/Makefile</span><br><span>index 6d053f9..edb0890 100644</span><br><span>--- a/make/Makefile</span><br><span>+++ b/make/Makefile</span><br><span>@@ -47,6 +47,13 @@</span><br><span> OSMOCOM_REPO_PATH?=repositories/network:/osmocom:</span><br><span> # Use "nightly" to use the nightly feed</span><br><span> OSMOCOM_REPO_VERSION?=latest</span><br><span style="color: hsl(120, 100%, 40%);">+# Build the testsuite with the following mirror. In jenkins we always want to</span><br><span style="color: hsl(120, 100%, 40%);">+# point this to http://download.opensuse.org, so the same testsuite can be</span><br><span style="color: hsl(120, 100%, 40%);">+# used no matter which OSMOCOM_REPO_MIRROR is set. This avoids rebuilding the</span><br><span style="color: hsl(120, 100%, 40%);">+# testsuite when we only want to change OSMOCOM_REPO_MIRROR to build different</span><br><span style="color: hsl(120, 100%, 40%);">+# subjects under test, and it works even if the OSMOCOM_REPO_MIRROR only has</span><br><span style="color: hsl(120, 100%, 40%);">+# a subset of the network:osmocom:latest packages (i.e. no eclipse-titan).</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCOM_REPO_TESTSUITE_MIRROR?=$(OSMOCOM_REPO_MIRROR)</span><br><span> </span><br><span> ROOT_DIR=$(shell git rev-parse --show-toplevel)</span><br><span> RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support</span><br><span>@@ -84,6 +91,7 @@</span><br><span> --build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \</span><br><span> --build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \</span><br><span> --build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --build-arg OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \</span><br><span> --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \</span><br><span> --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \</span><br><span> --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \</span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 53b8dcc..2e86767 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -4,13 +4,13 @@</span><br><span> FROM $USER/$DISTRO-build</span><br><span> # Arguments used after FROM must be specified again</span><br><span> ARG DISTRO</span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span> ARG OSMO_BB_BRANCH="master"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span> </span><br><span> COPY .common/Release.key /tmp/Release.key</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24115">change 24115</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/24115"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7187473c2188a864b60b03789eff62e0a527404a </div>
<div style="display:none"> Gerrit-Change-Number: 24115 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>