<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22819">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: 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;">ttcn3: move prepare code to shared script<br><br>Move the git fetch/checkout code and make call to build the testsuite,<br>to debian-stretch-titan/ttcn3-docker-prepare.sh. In the next patch, I<br>will extend the script to update deps right before building too (e.g.<br>because OSMO_TTCN3_BRANCH changed).<br><br>Related: OS#5017<br>Change-Id: I4b5bedf058dc527e821f9b7204c632820e671af9<br>---<br>M debian-stretch-titan/Dockerfile<br>A debian-stretch-titan/ttcn3-docker-prepare.sh<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bscnat-test/Dockerfile<br>M ttcn3-bts-test/Dockerfile<br>M ttcn3-fr-test/Dockerfile<br>M ttcn3-gbproxy-test/Dockerfile<br>M ttcn3-ggsn-test/Dockerfile<br>M ttcn3-hlr-test/Dockerfile<br>M ttcn3-mgw-test/Dockerfile<br>M ttcn3-msc-test/Dockerfile<br>M ttcn3-nitb-sysinfo/Dockerfile<br>M ttcn3-pcu-test/Dockerfile<br>M ttcn3-remsim-test/Dockerfile<br>M ttcn3-sccp-test/Dockerfile<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>M ttcn3-smlc-test/Dockerfile<br>M ttcn3-stp-test/Dockerfile<br>19 files changed, 47 insertions(+), 102 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 39ff76f..daa0f8c 100644</span><br><span>--- a/debian-stretch-titan/Dockerfile</span><br><span>+++ b/debian-stretch-titan/Dockerfile</span><br><span>@@ -61,3 +61,5 @@</span><br><span> git pull && \</span><br><span> make deps; \</span><br><span> fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare</span><br><span>diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..d7363f5</span><br><span>--- /dev/null</span><br><span>+++ b/debian-stretch-titan/ttcn3-docker-prepare.sh</span><br><span>@@ -0,0 +1,28 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+if [ $# -lt 2 ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "usage: ttcn3-docker-prepare OSMO_TTCN3_BRANCH PROJECT [PROJECT ...]"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "arguments:"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " OSMO_TTCN3_BRANCH: as passed from docker"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " PROJECT: make target from osmo-ttcn3-hacks.git, e.g. 'msc'"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+set -x</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_TTCN3_BRANCH=$1</span><br><span style="color: hsl(120, 100%, 40%);">+PROJECT=$2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cd /osmo-ttcn3-hacks</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+git fetch</span><br><span style="color: hsl(120, 100%, 40%);">+git checkout "$OSMO_TTCN3_BRANCH"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if git symbolic-ref -q HEAD; then</span><br><span style="color: hsl(120, 100%, 40%);">+ git reset --hard origin/"$OSMO_TTCN3_BRANCH"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+git rev-parse --abbrev-ref HEAD</span><br><span style="color: hsl(120, 100%, 40%);">+git rev-parse HEAD</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+make "$PROJECT"</span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index c26247d..80d3384 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make bsc</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile</span><br><span>index dcf66d2..61f699d 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make bsc-nat</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bsc-nat</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 48909aa..685d99b 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make deps-update bts</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" bts</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile</span><br><span>index 3941895..dcee72d 100644</span><br><span>--- a/ttcn3-fr-test/Dockerfile</span><br><span>+++ b/ttcn3-fr-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make fr fr-net</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" fr fr-net</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile</span><br><span>index 2acd103..c0a8841 100644</span><br><span>--- a/ttcn3-gbproxy-test/Dockerfile</span><br><span>+++ b/ttcn3-gbproxy-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" gbproxy</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 1d53747..10683b6 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make ggsn_tests</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" ggsn_tests</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index 20e1597..3d12234 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make deps-update hlr</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hlr</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index 6580e92..860a06a 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make mgw</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" mgw</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index bb04c10..93b3e0a 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make msc</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" msc</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index 27a3e23..4d0cf73 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make sysinfo</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sysinfo</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile</span><br><span>index c3606bb..6b2072c 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make pcu</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" pcu</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile</span><br><span>index 594dcb6..b526206 100644</span><br><span>--- a/ttcn3-remsim-test/Dockerfile</span><br><span>+++ b/ttcn3-remsim-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make deps-update remsim</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" remsim</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile</span><br><span>index d906106..b047ba7 100644</span><br><span>--- a/ttcn3-sccp-test/Dockerfile</span><br><span>+++ b/ttcn3-sccp-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make sccp</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sccp</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index e3babb7..01bbce1 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sgsn</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index 5b3044c..3e7b8f0 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make sip</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" sip</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile</span><br><span>index 88a4dfc..0205547 100644</span><br><span>--- a/ttcn3-smlc-test/Dockerfile</span><br><span>+++ b/ttcn3-smlc-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make smlc</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" smlc</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile</span><br><span>index 55ccf01..183c545 100644</span><br><span>--- a/ttcn3-stp-test/Dockerfile</span><br><span>+++ b/ttcn3-stp-test/Dockerfile</span><br><span>@@ -3,12 +3,7 @@</span><br><span> ARG OSMO_TTCN3_BRANCH="master"</span><br><span> </span><br><span> ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd osmo-ttcn3-hacks && \</span><br><span style="color: hsl(0, 100%, 40%);">- git fetch && \</span><br><span style="color: hsl(0, 100%, 40%);">- git checkout $OSMO_TTCN3_BRANCH && \</span><br><span style="color: hsl(0, 100%, 40%);">- (git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_TTCN3_BRANCH || exit 1); \</span><br><span style="color: hsl(0, 100%, 40%);">- git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span style="color: hsl(0, 100%, 40%);">- make stp</span><br><span style="color: hsl(120, 100%, 40%);">+RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" stp</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22819">change 22819</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/+/22819"/><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: I4b5bedf058dc527e821f9b7204c632820e671af9 </div>
<div style="display:none"> Gerrit-Change-Number: 22819 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </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>