Change in docker-playground[master]: RFC: allow to set configuration and/or specific testcases

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/14072 )

Change subject: RFC: allow to set configuration and/or specific testcases
......................................................................

RFC: allow to set configuration and/or specific testcases

Allows to pass the configuration file and/or tests to
start-testsuite.sh.

This way a single test can be specified by the command line.

If this RFC gets accepted, I would convert all other Docker.files

Change-Id: I17e480321f1e7bfa287349f438ff6990e30f1114
---
M ttcn3-sgsn-test/Dockerfile
M ttcn3-sgsn-test/jenkins.sh
2 files changed, 11 insertions(+), 5 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index 4ea5daf..09e4ec6 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -27,8 +27,5 @@
 
 COPY	SGSN_Tests.cfg /data/SGSN_Tests.cfg
 
-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
+WORKDIR /data
+ENTRYPOINT ["/osmo-ttcn3-hacks/start-testsuite.sh", "/osmo-ttcn3-hacks/sgsn/SGSN_Tests"]
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 7947132..9505624 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -32,6 +32,15 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sgsn-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-sgsn-test \
+		$REPO_USER/ttcn3-sgsn-test $@
+
+echo Starting container to merge logs
+docker run	--rm \
+		--network $NET_NAME --ip 172.18.8.103 \
+		-e "TTCN3_PCAP_PATH=/data" \
+		-v $VOL_BASE_DIR/sgsn-tester:/data \
+		--name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \
+		--entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \
 		$REPO_USER/ttcn3-sgsn-test
 
 echo Stopping containers

-- 
To view, visit https://gerrit.osmocom.org/14072
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: I17e480321f1e7bfa287349f438ff6990e30f1114
Gerrit-Change-Number: 14072
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190521/75ec5e04/attachment.htm>