<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9897">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;">ttcn3-*: Merge logfiles no matter resolution of tests<br><br>Previous to this commit, log messages were not being merged if tests<br>were resolved as failed (test-suite.sh ending with exit code != 0),<br>which can happen if at least one test failed.<br><br>Change-Id: If293fc2d3182ef2a7b997faa8b41129a9dd89c45<br>---<br>M ttcn3-bsc-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-sgsn-test/Dockerfile<br>M ttcn3-sip-test/Dockerfile<br>9 files changed, 36 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile</span><br><span>index 4f0c606..9bdc898 100644</span><br><span>--- a/ttcn3-bsc-test/Dockerfile</span><br><span>+++ b/ttcn3-bsc-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY BSC_Tests.cfg /data/BSC_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile</span><br><span>index 43ed4f0..3fec55b 100644</span><br><span>--- a/ttcn3-bts-test/Dockerfile</span><br><span>+++ b/ttcn3-bts-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY BTS_Tests.cfg /data/BTS_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile</span><br><span>index 3c676cd..4e5e2da 100644</span><br><span>--- a/ttcn3-ggsn-test/Dockerfile</span><br><span>+++ b/ttcn3-ggsn-test/Dockerfile</span><br><span>@@ -22,5 +22,7 @@</span><br><span> COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile</span><br><span>index 8a920a6..0dee3d3 100644</span><br><span>--- a/ttcn3-hlr-test/Dockerfile</span><br><span>+++ b/ttcn3-hlr-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY HLR_Tests.cfg /data/HLR_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile</span><br><span>index 423e9df..6460c0a 100644</span><br><span>--- a/ttcn3-mgw-test/Dockerfile</span><br><span>+++ b/ttcn3-mgw-test/Dockerfile</span><br><span>@@ -23,5 +23,7 @@</span><br><span> COPY MGCP_Test.cfg /data/MGCP_Test.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile</span><br><span>index 315638f..bbc60a2 100644</span><br><span>--- a/ttcn3-msc-test/Dockerfile</span><br><span>+++ b/ttcn3-msc-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY MSC_Tests.cfg /data/MSC_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>index fb5ceb2..39860f2 100644</span><br><span>--- a/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>+++ b/ttcn3-nitb-sysinfo/Dockerfile</span><br><span>@@ -20,5 +20,7 @@</span><br><span> COPY Test.cfg /data/Test.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh Test</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh Test; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile</span><br><span>index dfca1c4..d06195d 100644</span><br><span>--- a/ttcn3-sgsn-test/Dockerfile</span><br><span>+++ b/ttcn3-sgsn-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span>diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile</span><br><span>index d443d29..7d566b9 100644</span><br><span>--- a/ttcn3-sip-test/Dockerfile</span><br><span>+++ b/ttcn3-sip-test/Dockerfile</span><br><span>@@ -26,5 +26,7 @@</span><br><span> COPY SIP_Tests.cfg /data/SIP_Tests.cfg</span><br><span> </span><br><span> 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%);">- /osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit_code=$?; \</span><br><span style="color: hsl(120, 100%, 40%);">+ /osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm; \</span><br><span style="color: hsl(120, 100%, 40%);">+ exit $exit_code</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9897">change 9897</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/9897"/><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: If293fc2d3182ef2a7b997faa8b41129a9dd89c45 </div>
<div style="display:none"> Gerrit-Change-Number: 9897 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>