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
This commit is contained in:
parent
910dacf686
commit
dd9eafdb0c
|
@ -2,11 +2,11 @@ ARG REGISTRY=docker.io
|
||||||
ARG UPSTREAM_DISTRO=debian:stretch
|
ARG UPSTREAM_DISTRO=debian:stretch
|
||||||
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
|
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
|
||||||
# Arguments used after FROM must be specified again
|
# 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@gnumonks.org>
|
MAINTAINER Harald Welte <laforge@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 \
|
RUN apt-get update && apt-get install -y \
|
||||||
gnupg
|
gnupg
|
||||||
|
|
|
@ -47,6 +47,13 @@ OSMOCOM_REPO_MIRROR?=http://download.opensuse.org
|
||||||
OSMOCOM_REPO_PATH?=repositories/network:/osmocom:
|
OSMOCOM_REPO_PATH?=repositories/network:/osmocom:
|
||||||
# Use "nightly" to use the nightly feed
|
# Use "nightly" to use the nightly feed
|
||||||
OSMOCOM_REPO_VERSION?=latest
|
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)
|
ROOT_DIR=$(shell git rev-parse --show-toplevel)
|
||||||
RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support
|
RELEASE_SUPPORT := $(ROOT_DIR)/make/.make-release-support
|
||||||
|
@ -84,6 +91,7 @@ docker-build: .release
|
||||||
--build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \
|
--build-arg OSMOCOM_REPO_MIRROR=$(OSMOCOM_REPO_MIRROR) \
|
||||||
--build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \
|
--build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \
|
||||||
--build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \
|
--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 LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \
|
||||||
--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
|
--build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \
|
||||||
--build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \
|
--build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \
|
||||||
|
|
|
@ -4,13 +4,13 @@ ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
|
||||||
FROM $USER/$DISTRO-build
|
FROM $USER/$DISTRO-build
|
||||||
# Arguments used after FROM must be specified again
|
# Arguments used after FROM must be specified again
|
||||||
ARG DISTRO
|
ARG DISTRO
|
||||||
ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
|
ARG OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
|
||||||
|
|
||||||
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
MAINTAINER Harald Welte <laforge@gnumonks.org>
|
||||||
|
|
||||||
ARG OSMO_BB_BRANCH="master"
|
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
|
COPY .common/Release.key /tmp/Release.key
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue