This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/24115 ) Change subject: make: add OSMOCOM_REPO_TESTSUITE_MIRROR ...................................................................... make: add OSMOCOM_REPO_TESTSUITE_MIRROR Make it possible to set a different mirror for debian-stretch-titan than for all other containers. 2021q1 doesn't have the eclipse-titan package and it doesn't make sense to build it there. I've thought about adding OSMOCOM_REPO_TESTSUITE_PATH and OSMOCOM_REPO_TESTSUITE_VERSION too, but we don't have any use for these right now. Let's add them later if we should need them. Related: SYS#5370. Change-Id: I7187473c2188a864b60b03789eff62e0a527404a --- M debian-stretch-titan/Dockerfile M make/Makefile M osmocom-bb-host-master/Dockerfile 3 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/24115/1 diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index e28c556..5b6b134 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -2,11 +2,11 @@ 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_TESTSUITE_MIRROR="http://download.opensuse.org" MAINTAINER Harald Welte <laforge at gnumonks.org> -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/latest/Debian_9.0/" RUN apt-get update && apt-get install -y \ gnupg diff --git a/make/Makefile b/make/Makefile index 6d053f9..edb0890 100644 --- a/make/Makefile +++ b/make/Makefile @@ -47,6 +47,13 @@ OSMOCOM_REPO_PATH?=repositories/network:/osmocom: # Use "nightly" to use the nightly feed OSMOCOM_REPO_VERSION?=latest +# Build the testsuite with the following mirror. In jenkins we always want to +# point this to http://download.opensuse.org, so the same testsuite can be +# used no matter which OSMOCOM_REPO_MIRROR is set. This avoids rebuilding the +# testsuite when we only want to change OSMOCOM_REPO_MIRROR to build different +# subjects under test, and it works even if the OSMOCOM_REPO_MIRROR only has +# a subset of the network:osmocom:latest packages (i.e. no eclipse-titan). +OSMOCOM_REPO_TESTSUITE_MIRROR?=$(OSMOCOM_REPO_MIRROR) ROOT_DIR=$(shell git rev-parse --show-toplevel) RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support @@ -84,6 +91,7 @@ --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 OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \ --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 53b8dcc..2e86767 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -4,13 +4,13 @@ FROM $USER/$DISTRO-build # Arguments used after FROM must be specified again ARG DISTRO -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" MAINTAINER Harald Welte <laforge at gnumonks.org> ARG OSMO_BB_BRANCH="master" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/" COPY .common/Release.key /tmp/Release.key -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/24115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I7187473c2188a864b60b03789eff62e0a527404a Gerrit-Change-Number: 24115 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210504/74a91b57/attachment.htm>