<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14072">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved; Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RFC: allow to set configuration and/or specific testcases<br><br>Allows to pass the configuration file and/or tests to<br>start-testsuite.sh.<br><br>This way a single test can be specified by the command line.<br><br>If this RFC gets accepted, I would convert all other Docker.files<br><br>Change-Id: I17e480321f1e7bfa287349f438ff6990e30f1114<br>---<br>M ttcn3-sgsn-test/Dockerfile<br>M ttcn3-sgsn-test/jenkins.sh<br>2 files changed, 11 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index 4ea5daf..09e4ec6 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -27,8 +27,5 @@</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%);">+WORKDIR /data</span><br><span style="color: hsl(120, 100%, 40%);">+ENTRYPOINT ["/osmo-ttcn3-hacks/start-testsuite.sh", "/osmo-ttcn3-hacks/sgsn/SGSN_Tests"]</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 7947132..9505624 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -32,6 +32,15 @@</span><br><span>               -e "TTCN3_PCAP_PATH=/data" \</span><br><span>               -v $VOL_BASE_DIR/sgsn-tester:/data \</span><br><span>                 --name ${BUILD_TAG}-ttcn3-sgsn-test \</span><br><span style="color: hsl(120, 100%, 40%);">+         $REPO_USER/ttcn3-sgsn-test $@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo Starting container to merge logs</span><br><span style="color: hsl(120, 100%, 40%);">+docker run      --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+                --network $NET_NAME --ip 172.18.8.103 \</span><br><span style="color: hsl(120, 100%, 40%);">+               -e "TTCN3_PCAP_PATH=/data" \</span><br><span style="color: hsl(120, 100%, 40%);">+                -v $VOL_BASE_DIR/sgsn-tester:/data \</span><br><span style="color: hsl(120, 100%, 40%);">+          --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \</span><br><span style="color: hsl(120, 100%, 40%);">+                --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \</span><br><span>                $REPO_USER/ttcn3-sgsn-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14072">change 14072</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/14072"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I17e480321f1e7bfa287349f438ff6990e30f1114 </div>
<div style="display:none"> Gerrit-Change-Number: 14072 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>