Change in docker-playground[master]: ttcn3-sgsn: Run log_merge.sh after tests

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Wed May 29 14:34:46 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/14258 )

Change subject: ttcn3-sgsn: Run log_merge.sh after tests
......................................................................

ttcn3-sgsn: Run log_merge.sh after tests

Change-Id: If03422bb8fb126fe6f204a4f8bc6edf0cbb7f194
---
M ttcn3-sgsn-test/Dockerfile
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Verified



diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index 42a53f2..fcc2c02 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -28,5 +28,8 @@
 
 COPY	SGSN_Tests.cfg /data/SGSN_Tests.cfg
 
-WORKDIR /data
-ENTRYPOINT ["/osmo-ttcn3-hacks/start-testsuite.sh", "/osmo-ttcn3-hacks/sgsn/SGSN_Tests"]
+CMD	cd /data && \
+	/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

-- 
To view, visit https://gerrit.osmocom.org/14258
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: If03422bb8fb126fe6f204a4f8bc6edf0cbb7f194
Gerrit-Change-Number: 14258
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190529/4ad5b7dd/attachment.html>


More information about the gerrit-log mailing list