<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22822">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3: move shared run code to script<br><br>While I'm at it with tidying up the Dockerfiles, create a<br>ttcn3-docker-run.sh with shared run code.<br><br>Related: OS#5017<br>Change-Id: Id90769707158f0488eca2313c57b99ea7a4a27c8<br>---<br>M debian-stretch-titan/Dockerfile<br>A debian-stretch-titan/ttcn3-docker-run.sh<br>M ttcn3-bsc-test/Dockerfile<br>M ttcn3-bscnat-test/Dockerfile<br>M ttcn3-bts-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>17 files changed, 39 insertions(+), 75 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 daa0f8c..512b4ac 100644</span><br><span>--- a/debian-stretch-titan/Dockerfile</span><br><span>+++ b/debian-stretch-titan/Dockerfile</span><br><span>@@ -63,3 +63,4 @@</span><br><span> fi</span><br><span> </span><br><span> ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare</span><br><span style="color: hsl(120, 100%, 40%);">+ADD ttcn3-docker-run.sh /usr/local/bin/ttcn3-docker-run</span><br><span>diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..0cda8a5</span><br><span>--- /dev/null</span><br><span>+++ b/debian-stretch-titan/ttcn3-docker-run.sh</span><br><span>@@ -0,0 +1,23 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh</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-run SUBDIR SUITE"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "arguments:"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " SUBDIR: directory in osmo-ttcn3-hacks, e.g. 'msc'"</span><br><span style="color: hsl(120, 100%, 40%);">+ echo " SUITE: name of the testsuite, e.g. 'MSC_Tests'"</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%);">+SUBDIR=$1</span><br><span style="color: hsl(120, 100%, 40%);">+SUITE=$2</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cd /data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE"</span><br><span style="color: hsl(120, 100%, 40%);">+exit_code=$?</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/osmo-ttcn3-hacks/log_merge.sh "$SUITE" --rm</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+exit $exit_code</span><br><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index c56f3a5..10b7267 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY BSC_Tests.cfg /data/BSC_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run bsc BSC_Tests</span><br><span>diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile</span><br><span>index 405c0a6..d970482 100644</span><br><span>--- a/ttcn3-bscnat-test/Dockerfile</span><br><span>+++ b/ttcn3-bscnat-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc-nat/BSCNAT_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh BSCNAT_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run bsc-nat BSCNAT_Tests</span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 4aa3825..7abf1a9 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY BTS_Tests.cfg /data/BTS_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run bts BTS_Tests</span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index e38e9d5..e67dc9f 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run ggsn_tests GGSN_Tests</span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index b180567..36761a7 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY HLR_Tests.cfg /data/HLR_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run hlr HLR_Tests</span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index b05fa21..bd74f79 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY MGCP_Test.cfg /data/MGCP_Test.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run mgw MGCP_Test</span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index 06c07ca..8ce9828 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY MSC_Tests.cfg /data/MSC_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run msc MSC_Tests</span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index 4d0cf73..026a465 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY Test.cfg /data/Test.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh Test --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run sysinfo Test</span><br><span>diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile</span><br><span>index 2c7d52f..2a35db3 100644</span><br><span>--- a/ttcn3-pcu-test/Dockerfile</span><br><span>+++ b/ttcn3-pcu-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY PCU_Tests.cfg /data/PCU_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/pcu/PCU_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh PCU_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run pcu PCU_Tests</span><br><span>diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile</span><br><span>index c826d7c..0391d0a 100644</span><br><span>--- a/ttcn3-remsim-test/Dockerfile</span><br><span>+++ b/ttcn3-remsim-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/remsim/REMSIM_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh REMSIM_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run remsim REMSIM_Tests</span><br><span>diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile</span><br><span>index 3fc4ca3..a818d8b 100644</span><br><span>--- a/ttcn3-sccp-test/Dockerfile</span><br><span>+++ b/ttcn3-sccp-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sccp/SCCP_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh SCCP_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run sccp SCCP_Tests</span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index 2cc9778..2a2e66e 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run sgsn SGSN_Tests</span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index 4d138ce..bce215a 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY SIP_Tests.cfg /data/SIP_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run sip SIP_Tests</span><br><span>diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile</span><br><span>index d2a081f..21d77a4 100644</span><br><span>--- a/ttcn3-smlc-test/Dockerfile</span><br><span>+++ b/ttcn3-smlc-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/smlc/SMLC_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh SMLC_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run smlc SMLC_Tests</span><br><span>diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile</span><br><span>index 0ae2c5e..073753b 100644</span><br><span>--- a/ttcn3-stp-test/Dockerfile</span><br><span>+++ b/ttcn3-stp-test/Dockerfile</span><br><span>@@ -9,8 +9,4 @@</span><br><span> </span><br><span> COPY STP_Tests.cfg /data/STP_Tests.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-CMD cd /data && \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/stp/STP_Tests; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit_code=$?; \</span><br><span style="color: hsl(0, 100%, 40%);">- /osmo-ttcn3-hacks/log_merge.sh STP_Tests --rm; \</span><br><span style="color: hsl(0, 100%, 40%);">- exit $exit_code</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ttcn3-docker-run stp STP_Tests</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22822">change 22822</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/+/22822"/><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: Id90769707158f0488eca2313c57b99ea7a4a27c8 </div>
<div style="display:none"> Gerrit-Change-Number: 22822 </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>