ttcn3-*: Merge logfiles no matter resolution of tests

Previous to this commit, log messages were not being merged if tests
were resolved as failed (test-suite.sh ending with exit code != 0),
which can happen if at least one test failed.

Change-Id: If293fc2d3182ef2a7b997faa8b41129a9dd89c45

9 files changed, 36 insertions, 18 deletions

diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index 4f0c606..9bdc898 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	BSC_Tests.cfg /data/BSC_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bsc/BSC_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh BSC_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index 43ed4f0..3fec55b 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	BTS_Tests.cfg /data/BTS_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/bts/BTS_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh BTS_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
index 3c676cd..4e5e2da 100644
--- a/ttcn3-ggsn-test/Dockerfile
+++ b/ttcn3-ggsn-test/Dockerfile
@@ -22,5 +22,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	GGSN_Tests.cfg /data/GGSN_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh GGSN_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile
index 8a920a6..0dee3d3 100644
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	HLR_Tests.cfg /data/HLR_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/hlr/HLR_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh HLR_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile
index 423e9df..6460c0a 100644
--- a/ttcn3-mgw-test/Dockerfile
+++ b/ttcn3-mgw-test/Dockerfile
@@ -23,5 +23,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	MGCP_Test.cfg /data/MGCP_Test.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test && \
-	/osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/mgw/MGCP_Test; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh MGCP_Test --rm; \
+	exit $exit_code
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile
index 315638f..bbc60a2 100644
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	MSC_Tests.cfg /data/MSC_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/msc/MSC_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh MSC_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index fb5ceb2..39860f2 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -20,5 +20,7 @@ VOLUME	/data
 COPY	Test.cfg /data/Test.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test && \
-	/osmo-ttcn3-hacks/log_merge.sh Test
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sysinfo/Test; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh Test; \
+	exit $exit_code
diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index dfca1c4..d06195d 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	SGSN_Tests.cfg /data/SGSN_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sgsn/SGSN_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm; \
+	exit $exit_code
diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile
index d443d29..7d566b9 100644
--- a/ttcn3-sip-test/Dockerfile
+++ b/ttcn3-sip-test/Dockerfile
@@ -26,5 +26,7 @@ RUN	ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \
 COPY	SIP_Tests.cfg /data/SIP_Tests.cfg
 
 CMD	cd /data && \
-	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests && \
-	/osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm
+	/osmo-ttcn3-hacks/start-testsuite.sh /osmo-ttcn3-hacks/sip/SIP_Tests; \
+	exit_code=$?; \
+	/osmo-ttcn3-hacks/log_merge.sh SIP_Tests --rm; \
+	exit $exit_code