aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2019-05-16 18:23:53 +0200
committerAlexander Couzens <lynxis@fe80.eu>2019-05-16 18:55:41 +0200
commit73663b01f21e9a01cf3e5048d802270c482852cf (patch)
treee1a2c5f4ffc40d12496cf60d66bd192f59aaa17e
parent26565bb729549152ce8fa89f59df02f37c907c27 (diff)
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
-rw-r--r--ttcn3-sgsn-test/Dockerfile7
-rwxr-xr-xttcn3-sgsn-test/jenkins.sh9
2 files changed, 11 insertions, 5 deletions
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 @@ 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; \
- 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 @@ docker run --rm \
-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