laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/41430?usp=email )
Change subject: nplab-m3ua-test: Parametrize git branch and change it to osmocom/master ......................................................................
nplab-m3ua-test: Parametrize git branch and change it to osmocom/master
I just pushed a new "osmocom/master" branch to our fork pointing to laforge/python3.
Change-Id: I78b2a27b355f11ba64476216bc7ef76713e8f61e --- M make/Makefile M nplab-m3ua-test/Dockerfile 2 files changed, 8 insertions(+), 3 deletions(-)
Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/make/Makefile b/make/Makefile index b320ba9..1fba3d6 100644 --- a/make/Makefile +++ b/make/Makefile @@ -19,6 +19,7 @@ NAME?=$(shell basename $(CURDIR)) ASTERISK_BRANCH?=sysmocom/20.7.0 LIBOSMOCORE_BRANCH?=master +M3UA_TESTTOOL_BRANCH?=osmocom/master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master OSMO_BSC_BRANCH?=master @@ -106,6 +107,7 @@ --build-arg OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \ --build-arg ASTERISK_BRANCH=$(ASTERISK_BRANCH) \ --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \ + --build-arg M3UA_TESTTOOL_BRANCH=$(M3UA_TESTTOOL_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ --build-arg OSMO_BTS_BRANCH=$(OSMO_BTS_BRANCH) \ diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile index e5cc00f..d0418b4 100644 --- a/nplab-m3ua-test/Dockerfile +++ b/nplab-m3ua-test/Dockerfile @@ -1,11 +1,14 @@ ARG USER=osmocom-build FROM $USER/sigtran-tests
+ARG M3UA_TESTTOOL_BRANCH="osmocom/master" + RUN cd /tmp && git clone https://gitea.osmocom.org/nplab/m3ua-testtool -ADD https://gitea.osmocom.org/api/v1/repos/nplab/m3ua-testtool/git/refs/heads/la... /tmp/commit +ADD https://gitea.osmocom.org/api/v1/repos/nplab/m3ua-testtool/git/refs/heads/$M... /tmp/commit RUN cd /tmp/m3ua-testtool && \ - git fetch && \ - git checkout -f laforge/python3 && \ + git fetch && git checkout $M3UA_TESTTOOL_BRANCH && \ + (git symbolic-ref -q HEAD && git reset --hard origin/$M3UA_TESTTOOL_BRANCH || exit 1); \ + git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ cp runtest-junitxml.py /usr/local/bin/
COPY dotguile /root/.guile