diff options
Diffstat (limited to 'ttcn3-sgsn-test')
| -rw-r--r-- | ttcn3-sgsn-test/Dockerfile | 7 | ||||
| -rwxr-xr-x | ttcn3-sgsn-test/jenkins.sh | 9 |
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 |