aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2021-02-12 19:20:20 +0100
committerOliver Smith <osmith@sysmocom.de>2021-02-12 19:34:48 +0100
commitf670f1739dc96b31f152cb96d0a36726fa759937 (patch)
tree7d8d0e22393254323c22fb97d2ea7fc9a85aa5eb
parent82251720b0c97da3728937e9beba49256a9fa312 (diff)
WIP: ttcn3: pass argsosmith/ttcn3-pass-args
FIXME: describe how to only run a specific test. Change-Id: I1949e992647127e476f36f877bb4556ee246c84c
-rw-r--r--README.md5
-rwxr-xr-xdebian-stretch-titan/ttcn3-docker-run.sh6
-rw-r--r--ttcn3-bsc-test/Dockerfile2
-rwxr-xr-xttcn3-bsc-test/jenkins-sccplite.sh2
-rwxr-xr-xttcn3-bsc-test/jenkins.sh2
-rw-r--r--ttcn3-bscnat-test/Dockerfile2
-rwxr-xr-xttcn3-bscnat-test/jenkins.sh2
-rw-r--r--ttcn3-bts-test/Dockerfile2
-rwxr-xr-xttcn3-bts-test/jenkins.sh11
-rwxr-xr-xttcn3-fr-test/jenkins.sh2
-rwxr-xr-xttcn3-gbproxy-test-fr/jenkins.sh2
-rwxr-xr-xttcn3-gbproxy-test/jenkins.sh2
-rw-r--r--ttcn3-ggsn-test/Dockerfile2
-rwxr-xr-xttcn3-ggsn-test/jenkins.sh2
-rw-r--r--ttcn3-hlr-test/Dockerfile2
-rwxr-xr-xttcn3-hlr-test/jenkins.sh2
-rw-r--r--ttcn3-mgw-test/Dockerfile2
-rwxr-xr-xttcn3-mgw-test/jenkins.sh2
-rw-r--r--ttcn3-msc-test/Dockerfile2
-rwxr-xr-xttcn3-msc-test/jenkins.sh2
-rw-r--r--ttcn3-nitb-sysinfo/Dockerfile2
-rwxr-xr-xttcn3-nitb-sysinfo/jenkins.sh2
-rw-r--r--ttcn3-pcu-test/Dockerfile2
-rwxr-xr-xttcn3-pcu-test/jenkins-sns.sh2
-rwxr-xr-xttcn3-pcu-test/jenkins.sh2
-rw-r--r--ttcn3-remsim-test/Dockerfile2
-rwxr-xr-xttcn3-remsim-test/jenkins.sh8
-rw-r--r--ttcn3-sccp-test/Dockerfile2
-rwxr-xr-xttcn3-sccp-test/jenkins.sh2
-rw-r--r--ttcn3-sgsn-test/Dockerfile2
-rwxr-xr-xttcn3-sgsn-test/jenkins.sh2
-rw-r--r--ttcn3-sip-test/Dockerfile2
-rwxr-xr-xttcn3-sip-test/jenkins.sh2
-rw-r--r--ttcn3-smlc-test/Dockerfile2
-rwxr-xr-xttcn3-smlc-test/jenkins.sh2
-rw-r--r--ttcn3-stp-test/Dockerfile2
-rwxr-xr-xttcn3-stp-test/jenkins.sh2
37 files changed, 52 insertions, 44 deletions
diff --git a/README.md b/README.md
index 925907e..525ee98 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@ $ cd ttcn3-mgw-test
$ ./jenkins.sh
```
+Arguments to `jenkins.sh` are passed to the TTCN-3 testsuite executable.
+With the following example, only a single test gets started:
+
+FIXME
+
Environment variables:
* `IMAGE_SUFFIX`: the version of the Osmocom stack to run the testsuite
against. Default is `master`, set this to `latest` to test the last
diff --git a/debian-stretch-titan/ttcn3-docker-run.sh b/debian-stretch-titan/ttcn3-docker-run.sh
index da3d314..ebb6b7a 100755
--- a/debian-stretch-titan/ttcn3-docker-run.sh
+++ b/debian-stretch-titan/ttcn3-docker-run.sh
@@ -1,10 +1,11 @@
#!/bin/sh
if [ $# -lt 2 ]; then
echo
- echo "usage: ttcn3-docker-run SUBDIR SUITE"
+ echo "usage: ttcn3-docker-run SUBDIR SUITE [SUITE_ARG [SUITE_ARG ...]]"
echo "arguments:"
echo " SUBDIR: directory in osmo-ttcn3-hacks, e.g. 'msc'"
echo " SUITE: name of the testsuite, e.g. 'MSC_Tests'"
+ echo " SUITE_ARG: optional arguments to pass to the testsuite"
echo
exit 1
fi
@@ -12,6 +13,7 @@ fi
set -x
SUBDIR=$1
SUITE=$2
+shift 2
if [ -n "$WAIT_FOR_NETDEV" ]; then
pipework --wait -i "$WAIT_FOR_NETDEV"
@@ -19,7 +21,7 @@ fi
cd /data
-/osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE"
+/osmo-ttcn3-hacks/start-testsuite.sh "/osmo-ttcn3-hacks/$SUBDIR/$SUITE" "$@"
exit_code=$?
/osmo-ttcn3-hacks/log_merge.sh "$SUITE" --rm
diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile
index 1923c38..0eb3bdd 100644
--- a/ttcn3-bsc-test/Dockerfile
+++ b/ttcn3-bsc-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY BSC_Tests.cfg /data/BSC_Tests.cfg
-CMD ttcn3-docker-run bsc BSC_Tests
+ENTRYPOINT ["ttcn3-docker-run", "bsc", "BSC_Tests"]
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index ab8c06d..124af34 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -54,7 +54,7 @@ docker run --rm \
-v $VOL_BASE_DIR/bsc-tester:/data \
--name ${BUILD_TAG}-ttcn3-bsc-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-bsc-test
+ $REPO_USER/ttcn3-bsc-test "$@"
echo Stopping containers
for i in `seq 0 2`; do
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index cba378e..5605da2 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -85,7 +85,7 @@ docker run --rm \
-v $VOL_BASE_DIR/bsc-tester:/data \
--name ${BUILD_TAG}-ttcn3-bsc-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-bsc-test
+ $REPO_USER/ttcn3-bsc-test "$@"
echo Stopping containers
for i in `seq 0 2`; do
diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile
index 50ca926..80a73d1 100644
--- a/ttcn3-bscnat-test/Dockerfile
+++ b/ttcn3-bscnat-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY BSCNAT_Tests.cfg /data/BSCNAT_Tests.cfg
-CMD ttcn3-docker-run bsc-nat BSCNAT_Tests
+ENTRYPOINT ["ttcn3-docker-run", "bsc-nat", "BSCNAT_Tests"]
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index 9b04955..8703eb7 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -35,7 +35,7 @@ docker run --rm \
-v $VOL_BASE_DIR/bscnat-tester:/data \
--name ${BUILD_TAG}-ttcn3-bscnat-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-bscnat-test
+ $REPO_USER/ttcn3-bscnat-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-bscnat
diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile
index 8ac7cb8..07d0b7c 100644
--- a/ttcn3-bts-test/Dockerfile
+++ b/ttcn3-bts-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY BTS_Tests.cfg /data/BTS_Tests.cfg
-CMD ttcn3-docker-run bts BTS_Tests
+ENTRYPOINT ["ttcn3-docker-run", "bts", "BTS_Tests"]
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 87e2896..c0cc5c8 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -91,6 +91,7 @@ start_virtphy() {
start_testsuite() {
echo Starting container with BTS testsuite
variant=$1 # e.g 'generic', 'oml', 'hopping'
+ shift
docker run --rm \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
@@ -99,7 +100,7 @@ start_testsuite() {
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-bts-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-bts-test
+ $REPO_USER/ttcn3-bts-test "$@"
}
SUBNET=9
@@ -145,7 +146,7 @@ start_bsc
start_bts trx 1
start_fake_trx
start_trxcon
-start_testsuite generic
+start_testsuite generic "$@"
# 2) some GPRS tests require virt_phy
echo "Changing to virtphy configuration"
@@ -157,7 +158,7 @@ cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/
start_bts virtual 0
start_virtphy
# ... and execute the testsuite again with different cfg
-#start_testsuite virtphy
+#start_testsuite virtphy "$@"
# 3) OML tests require us to run without BSC
docker container kill ${BUILD_TAG}-bsc
@@ -170,7 +171,7 @@ start_bts trx 1
start_fake_trx
start_trxcon
# ... and execute the testsuite again with different cfg
-start_testsuite oml
+start_testsuite oml "$@"
# 4) Frequency hopping tests require different configuration files
cp fh/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
@@ -179,7 +180,7 @@ cp osmo-bts.cfg $VOL_BASE_DIR/bts/
docker container kill ${BUILD_TAG}-bts
start_bsc
start_bts trx 1
-start_testsuite hopping
+start_testsuite hopping "$@"
# append ':hopping' to the classnames,
# e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'"
# e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'"
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index faf8170..ac01099 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -52,7 +52,7 @@ docker run --rm \
-v $VOL_BASE_DIR/fr-tester:/data \
--name ${BUILD_TAG}-ttcn3-fr-test -d \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-fr-test fr FR_Tests
+ $REPO_USER/ttcn3-fr-test fr FR_Tests "$@"
# move all hdlcnetX net-devices into container
for i in `seq 1 8`; do
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 4ef2ace..bc26a1a 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -65,7 +65,7 @@ docker run --rm \
-v $VOL_BASE_DIR/gbproxy-tester:/data \
--name ${BUILD_TAG}-ttcn3-gbproxy-test -d \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-gbproxy-test $@
+ $REPO_USER/ttcn3-gbproxy-test "$@"
# move all hdlcnetX net-devices into container
for i in `seq 1 8`; do
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index b063c7f..5d72eb8 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -43,7 +43,7 @@ docker run --rm \
-v $VOL_BASE_DIR/gbproxy-tester:/data \
--name ${BUILD_TAG}-ttcn3-gbproxy-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-gbproxy-test $@
+ $REPO_USER/ttcn3-gbproxy-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-gbproxy
diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile
index d42ac3e..9374020 100644
--- a/ttcn3-ggsn-test/Dockerfile
+++ b/ttcn3-ggsn-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg
-CMD ttcn3-docker-run ggsn_tests GGSN_Tests
+ENTRYPOINT ["ttcn3-docker-run", "ggsn_tests", "GGSN_Tests"]
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index 0aabe8a..bf23d2a 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -37,7 +37,7 @@ docker run --rm \
-e "TTCN3_PCAP_PATH=/data" \
--name ${BUILD_TAG}-ggsn-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-ggsn-test
+ $REPO_USER/ttcn3-ggsn-test "$@"
# stop GGSN after test has completed
docker container stop ${BUILD_TAG}-ggsn
diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile
index 8480288..1af83d0 100644
--- a/ttcn3-hlr-test/Dockerfile
+++ b/ttcn3-hlr-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY HLR_Tests.cfg /data/HLR_Tests.cfg
-CMD ttcn3-docker-run hlr HLR_Tests
+ENTRYPOINT ["ttcn3-docker-run", "hlr", "HLR_Tests"]
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 93ba6c3..f90cce7 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -39,7 +39,7 @@ docker run --rm \
-v $VOL_BASE_DIR/hlr-tester:/data \
--name ${BUILD_TAG}-ttcn3-hlr-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-hlr-test
+ $REPO_USER/ttcn3-hlr-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-hlr
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile
index 087dc09..a15d187 100644
--- a/ttcn3-mgw-test/Dockerfile
+++ b/ttcn3-mgw-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY MGCP_Test.cfg /data/MGCP_Test.cfg
-CMD ttcn3-docker-run mgw MGCP_Test
+ENTRYPOINT ["ttcn3-docker-run", "mgw", "MGCP_Test"]
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index c49096b..6f975c4 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -41,7 +41,7 @@ docker run --rm \
-e "TTCN3_PCAP_PATH=/data" \
--name ${BUILD_TAG}-ttcn3-mgw-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-mgw-test
+ $REPO_USER/ttcn3-mgw-test "$@"
# stop mgw after test has completed
docker container stop ${BUILD_TAG}-mgw
diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile
index 05610a4..44caa2a 100644
--- a/ttcn3-msc-test/Dockerfile
+++ b/ttcn3-msc-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY MSC_Tests.cfg /data/MSC_Tests.cfg
-CMD ttcn3-docker-run msc MSC_Tests
+ENTRYPOINT ["ttcn3-docker-run", "msc", "MSC_Tests"]
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index c67fb5e..700d73b 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -69,7 +69,7 @@ docker run --rm \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-msc-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-msc-test
+ $REPO_USER/ttcn3-msc-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-msc
diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile
index 45bf69e..d37ae01 100644
--- a/ttcn3-nitb-sysinfo/Dockerfile
+++ b/ttcn3-nitb-sysinfo/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY Test.cfg /data/Test.cfg
-CMD ttcn3-docker-run sysinfo Test
+ENTRYPOINT ["ttcn3-docker-run", "sysinfo", "Test"]
diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh
index c31ad6d..581c147 100755
--- a/ttcn3-nitb-sysinfo/jenkins.sh
+++ b/ttcn3-nitb-sysinfo/jenkins.sh
@@ -34,7 +34,7 @@ docker run --rm \
--ulimit core=-1 \
-v ttcn3-nitb-sysinfo-vol:/data \
--name ${BUILD_TAG}-ttcn3-nitb-sysinfo \
- $REPO_USER/ttcn3-nitb-sysinfo
+ $REPO_USER/ttcn3-nitb-sysinfo "$@"
# stop bts + nitb after test has completed
docker container stop ${BUILD_TAG}-bts
diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile
index e42bca1..1dfca48 100644
--- a/ttcn3-pcu-test/Dockerfile
+++ b/ttcn3-pcu-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY PCU_Tests.cfg /data/PCU_Tests.cfg
-CMD ttcn3-docker-run pcu PCU_Tests
+ENTRYPOINT ["ttcn3-docker-run", "pcu" ,"PCU_Tests"]
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index ee0b08a..1e6014e 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -55,7 +55,7 @@ docker run --rm \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-pcu-test-sns \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-pcu-test
+ $REPO_USER/ttcn3-pcu-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-pcu-sns
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index c2ef0d5..f369f56 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -58,7 +58,7 @@ docker run --rm \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-pcu-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-pcu-test
+ $REPO_USER/ttcn3-pcu-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-pcu
diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile
index caa6da1..533c256 100644
--- a/ttcn3-remsim-test/Dockerfile
+++ b/ttcn3-remsim-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY REMSIM_Tests.cfg /data/REMSIM_Tests.cfg
-CMD ttcn3-docker-run remsim REMSIM_Tests
+ENTRYPOINT ["ttcn3-docker-run", "remsim", "REMSIM_Tests"]
diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 58279b9..2463c8f 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -53,7 +53,7 @@ start_testsuite() {
-v $VOL_BASE_DIR/remsim-tester:/data \
--name ${BUILD_TAG}-ttcn3-remsim-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-remsim-test
+ $REPO_USER/ttcn3-remsim-test "$@"
}
SUBNET=17
@@ -72,21 +72,21 @@ mkdir $VOL_BASE_DIR/client
# 1) server test suite
start_server
cp REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/
-start_testsuite
+start_testsuite "$@"
docker container kill ${BUILD_TAG}-server
# 2) bankd test suite
echo "Changing to bankd configuration"
start_bankd
cp bankd/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/
-start_testsuite
+start_testsuite "$@"
docker container kill ${BUILD_TAG}-bankd
# 3) client test suite
echo "Changing to client configuration"
start_client
cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/
-start_testsuite
+start_testsuite "$@"
docker container kill ${BUILD_TAG}-client
network_remove
diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile
index 708a72f..34d1c83 100644
--- a/ttcn3-sccp-test/Dockerfile
+++ b/ttcn3-sccp-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY SCCP_Tests.cfg /data/SCCP_Tests.cfg
-CMD ttcn3-docker-run sccp SCCP_Tests
+ENTRYPOINT ["ttcn3-docker-run", "sccp", "SCCP_Tests"]
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index b47589c..cd22efd 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -35,7 +35,7 @@ docker run --rm \
-v $VOL_BASE_DIR/sccp-tester:/data \
--name ${BUILD_TAG}-ttcn3-sccp-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-sccp-test
+ $REPO_USER/ttcn3-sccp-test "$@"
docker container kill ${BUILD_TAG}-stp
diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile
index 333b5ed..47401b3 100644
--- a/ttcn3-sgsn-test/Dockerfile
+++ b/ttcn3-sgsn-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY SGSN_Tests.cfg /data/SGSN_Tests.cfg
-CMD ttcn3-docker-run sgsn SGSN_Tests
+ENTRYPOINT ["ttcn3-docker-run", "sgsn", "SGSN_Tests"]
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 35eaf2e..2e58e40 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -56,7 +56,7 @@ docker run --rm \
-v $VOL_BASE_DIR/sgsn-tester:/data \
--name ${BUILD_TAG}-ttcn3-sgsn-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-sgsn-test
+ $REPO_USER/ttcn3-sgsn-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-sgsn
diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile
index 1324ac0..1ea958b 100644
--- a/ttcn3-sip-test/Dockerfile
+++ b/ttcn3-sip-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY SIP_Tests.cfg /data/SIP_Tests.cfg
-CMD ttcn3-docker-run sip SIP_Tests
+ENTRYPOINT ["ttcn3-docker-run", "sip", "SIP_Tests"]
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index af5e40b..0ef71cc 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -45,7 +45,7 @@ docker run --rm \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-sip-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-sip-test
+ $REPO_USER/ttcn3-sip-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-sip-connector
diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile
index 5d27ceb..1f4d871 100644
--- a/ttcn3-smlc-test/Dockerfile
+++ b/ttcn3-smlc-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY SMLC_Tests.cfg /data/SMLC_Tests.cfg
-CMD ttcn3-docker-run smlc SMLC_Tests
+ENTRYPOINT ["ttcn3-docker-run", "smlc", "SMLC_Tests"]
diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh
index ba824c1..7648219 100755
--- a/ttcn3-smlc-test/jenkins.sh
+++ b/ttcn3-smlc-test/jenkins.sh
@@ -46,7 +46,7 @@ docker run --rm \
-v $VOL_BASE_DIR/smlc-tester:/data \
--name ${BUILD_TAG}-ttcn3-smlc-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-smlc-test
+ $REPO_USER/ttcn3-smlc-test "$@"
echo Stopping containers
docker container kill ${BUILD_TAG}-smlc
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index e36935b..aa26083 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-test/Dockerfile
@@ -10,4 +10,4 @@ VOLUME /data
COPY STP_Tests.cfg /data/STP_Tests.cfg
-CMD ttcn3-docker-run stp STP_Tests
+ENTRYPOINT ["ttcn3-docker-run", "stp", "STP_Tests"]
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index 9ea97cb..30199b6 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -39,7 +39,7 @@ docker run --rm \
-v $VOL_BASE_DIR/stp-tester:/data \
--name ${BUILD_TAG}-ttcn3-stp-test \
$DOCKER_ARGS \
- $REPO_USER/ttcn3-stp-test
+ $REPO_USER/ttcn3-stp-test "$@"
docker container kill ${BUILD_TAG}-stp