<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18047">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-*-test/jenkins*.sh: add $DOCKER_ARGS<br><br>Allow to pass options to each "docker run" line in the various<br>jenkins.sh scripts. I'm using this to run the testsuites and Osmocom<br>components in docker with the same configurations as jenkins, but with<br>Osmocom and testsuite binaries built outside and mounted into the<br>containers:<br><br>DOCKER_ARGS="-v /usr/local:/usr/local:ro -v $hacks:/osmo-ttcn3-hacks:ro"<br><br>This allows very short test cycles without a second set of configs. The<br>full script that makes use of this feature is in osmo-dev.git,<br>ttcn3/ttcn3.sh.<br><br>Change-Id: I8d1f78aee926f8f6ec0b704e16639bc83f525816<br>---<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/jenkins.sh<br>M ttcn3-bscnat-test/jenkins.sh<br>M ttcn3-bts-test/jenkins.sh<br>M ttcn3-ggsn-test/jenkins.sh<br>M ttcn3-hlr-test/jenkins.sh<br>M ttcn3-mgw-test/jenkins.sh<br>M ttcn3-msc-test/jenkins.sh<br>M ttcn3-pcu-test/jenkins-sns.sh<br>M ttcn3-pcu-test/jenkins.sh<br>M ttcn3-remsim-test/jenkins.sh<br>M ttcn3-sccp-test/jenkins.sh<br>M ttcn3-sgsn-test/jenkins.sh<br>M ttcn3-sip-test/jenkins.sh<br>M ttcn3-stp-test/jenkins.sh<br>15 files changed, 41 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/18047/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index b3791a5..36c79d5 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -25,6 +25,7 @@</span><br><span> --network $NET_NAME --ip 172.18.12.20 \</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bsc-$IMAGE_SUFFIX</span><br><span> </span><br><span> for i in `seq 0 2`; do</span><br><span>@@ -32,6 +33,7 @@</span><br><span> docker run --rm \</span><br><span> --network $NET_NAME --ip 172.18.12.10$i \</span><br><span> --name ${BUILD_TAG}-bts$i -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bts-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.12.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1"</span><br><span> done</span><br><span>@@ -42,6 +44,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/bsc-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-bsc-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index 3455dc1..44badb5 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -26,6 +26,7 @@</span><br><span> --network $NET_NAME --ip 172.18.2.200 \</span><br><span> -v $VOL_BASE_DIR/stp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-stp-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with BSC</span><br><span>@@ -33,6 +34,7 @@</span><br><span> --network $NET_NAME --ip 172.18.2.20 \</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bsc-$IMAGE_SUFFIX</span><br><span> </span><br><span> for i in `seq 0 2`; do</span><br><span>@@ -40,6 +42,7 @@</span><br><span> docker run --rm \</span><br><span> --network $NET_NAME --ip 172.18.2.10$i \</span><br><span> --name ${BUILD_TAG}-bts$i -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bts-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy 172.18.2.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1"</span><br><span> done</span><br><span>@@ -50,6 +53,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/bsc-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-bsc-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-bsc-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh</span><br><span>index d52e79a..1df1a70 100755</span><br><span>--- a/ttcn3-bscnat-test/jenkins.sh</span><br><span>+++ b/ttcn3-bscnat-test/jenkins.sh</span><br><span>@@ -23,6 +23,7 @@</span><br><span> --network $NET_NAME --ip 172.18.15.20 \</span><br><span> -v $VOL_BASE_DIR/bscnat:/data \</span><br><span> --name ${BUILD_TAG}-bscnat -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-nitb-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-bsc_nat -c /data/osmo-bsc-nat.cfg >/data/osmo-bsc-nat.log 2>&1"</span><br><span> </span><br><span>@@ -32,6 +33,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/bscnat-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-bscnat-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-bscnat-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index cc401e7..00e8133 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -17,6 +17,7 @@</span><br><span> --network $NET_NAME --ip 172.18.9.11 \</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-bsc -c /data/osmo-bsc.cfg >>/data/osmo-bsc.log 2>&1"</span><br><span> }</span><br><span>@@ -34,6 +35,7 @@</span><br><span> -v $VOL_BASE_DIR/bts:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-bts -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-bts-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-$variant -c /data/osmo-bts.cfg -i 172.18.9.10 >>/data/osmo-bts.log 2>&1"</span><br><span> }</span><br><span>@@ -44,6 +46,7 @@</span><br><span> --network $NET_NAME --ip 172.18.9.21 \</span><br><span> -v $VOL_BASE_DIR/fake_trx:/data \</span><br><span> --name ${BUILD_TAG}-fake_trx -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmocom-bb-host-master \</span><br><span> /tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \</span><br><span> --log-file-name /data/fake_trx.log \</span><br><span>@@ -60,6 +63,7 @@</span><br><span> -v $VOL_BASE_DIR/trxcon:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-trxcon -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmocom-bb-host-master \</span><br><span> /bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1"</span><br><span> }</span><br><span>@@ -70,6 +74,7 @@</span><br><span> --network $NET_NAME --ip 172.18.9.22 \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-virtphy -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmocom-bb-host-master \</span><br><span> virtphy -s /data/unix/osmocom_l2</span><br><span> /bin/sh -c "virtphy -s /data/unix/osmocom_l2 >>/data/virtphy.log 2>&1"</span><br><span>@@ -83,6 +88,7 @@</span><br><span> -v $VOL_BASE_DIR/bts-tester:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-bts-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-bts-test</span><br><span> }</span><br><span> </span><br><span>diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh</span><br><span>index ac26c0f..a69e640 100755</span><br><span>--- a/ttcn3-ggsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-ggsn-test/jenkins.sh</span><br><span>@@ -24,6 +24,7 @@</span><br><span> --network $NET_NAME --ip 172.18.3.201 \</span><br><span> -v $VOL_BASE_DIR/ggsn:/data \</span><br><span> --name ${BUILD_TAG}-ggsn -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1"</span><br><span> </span><br><span>@@ -34,6 +35,7 @@</span><br><span> -v $VOL_BASE_DIR/ggsn-tester:/data \</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> --name ${BUILD_TAG}-ggsn-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-ggsn-test</span><br><span> </span><br><span> # stop GGSN after test has completed</span><br><span>diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh</span><br><span>index 74aa37f..47ce5a9 100755</span><br><span>--- a/ttcn3-hlr-test/jenkins.sh</span><br><span>+++ b/ttcn3-hlr-test/jenkins.sh</span><br><span>@@ -27,6 +27,7 @@</span><br><span> --network $NET_NAME --ip 172.18.10.20 \</span><br><span> -v $VOL_BASE_DIR/hlr:/data \</span><br><span> --name ${BUILD_TAG}-hlr -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-hlr -c /data/osmo-hlr.cfg >/data/osmo-hlr.log 2>&1"</span><br><span> </span><br><span>@@ -36,6 +37,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/hlr-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-hlr-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-hlr-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh</span><br><span>index 473782f..4ebd235 100755</span><br><span>--- a/ttcn3-mgw-test/jenkins.sh</span><br><span>+++ b/ttcn3-mgw-test/jenkins.sh</span><br><span>@@ -21,6 +21,7 @@</span><br><span> --network $NET_NAME --ip 172.18.4.180 \</span><br><span> -v $VOL_BASE_DIR/mgw:/data \</span><br><span> --name ${BUILD_TAG}-mgw -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-mgw-$IMAGE_SUFFIX</span><br><span> </span><br><span> # start docker container with testsuite in foreground</span><br><span>@@ -29,6 +30,7 @@</span><br><span> -v $VOL_BASE_DIR/mgw-tester:/data \</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> --name ${BUILD_TAG}-ttcn3-mgw-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-mgw-test</span><br><span> </span><br><span> # stop mgw after test has completed</span><br><span>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index 28bc4b7..805151a 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -37,6 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/msc:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-msc -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-msc-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1"</span><br><span> </span><br><span>@@ -47,6 +48,7 @@</span><br><span> -v $VOL_BASE_DIR/msc-tester:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-msc-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-msc-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>index 51b5f64..06403d3 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins-sns.sh</span><br><span>@@ -26,6 +26,7 @@</span><br><span> -v $VOL_BASE_DIR/pcu:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-pcu-sns -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1"</span><br><span> </span><br><span>@@ -36,6 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/pcu-tester:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-pcu-test-sns \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-pcu-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh</span><br><span>index e0f1212..271f89f 100755</span><br><span>--- a/ttcn3-pcu-test/jenkins.sh</span><br><span>+++ b/ttcn3-pcu-test/jenkins.sh</span><br><span>@@ -26,6 +26,7 @@</span><br><span> -v $VOL_BASE_DIR/pcu:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-pcu -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.13.10 >>/data/osmo-pcu.log 2>&1"</span><br><span> </span><br><span>@@ -36,6 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/pcu-tester:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-pcu-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-pcu-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh</span><br><span>index 1b7c7cf..1c2682c 100755</span><br><span>--- a/ttcn3-remsim-test/jenkins.sh</span><br><span>+++ b/ttcn3-remsim-test/jenkins.sh</span><br><span>@@ -13,6 +13,7 @@</span><br><span> --network $NET_NAME --ip 172.18.17.20 \</span><br><span> -v $VOL_BASE_DIR/server:/data \</span><br><span> --name ${BUILD_TAG}-server -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-remsim-server >/data/osmo-remsim-server.log 2>&1"</span><br><span> }</span><br><span>@@ -23,6 +24,7 @@</span><br><span> --network $NET_NAME --ip 172.18.17.30 \</span><br><span> -v $VOL_BASE_DIR/bankd:/data \</span><br><span> --name ${BUILD_TAG}-bankd -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1"</span><br><span> }</span><br><span>@@ -33,6 +35,7 @@</span><br><span> --network $NET_NAME --ip 172.18.17.40 \</span><br><span> -v $VOL_BASE_DIR/client:/data \</span><br><span> --name ${BUILD_TAG}-client-d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-remsim-client-shell >/data/osmo-remsim-client.log 2>&1"</span><br><span> }</span><br><span>@@ -46,6 +49,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/remsim-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-remsim-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-remsim-test</span><br><span> }</span><br><span> </span><br><span>diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh</span><br><span>index f5c1549..242e44a 100755</span><br><span>--- a/ttcn3-sccp-test/jenkins.sh</span><br><span>+++ b/ttcn3-sccp-test/jenkins.sh</span><br><span>@@ -22,6 +22,7 @@</span><br><span> --network $NET_NAME --ip 172.18.22.200 \</span><br><span> -v $VOL_BASE_DIR/sccp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-stp-master \</span><br><span> /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1"</span><br><span> </span><br><span>@@ -32,6 +33,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/sccp-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-sccp-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-sccp-test</span><br><span> </span><br><span> docker container kill ${BUILD_TAG}-stp</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 5464ca6..9db295a 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -27,6 +27,7 @@</span><br><span> --network $NET_NAME --ip 172.18.8.200 \</span><br><span> -v $VOL_BASE_DIR/stp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-stp-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with SGSN</span><br><span>@@ -34,6 +35,7 @@</span><br><span> --network $NET_NAME --ip 172.18.8.10 \</span><br><span> -v $VOL_BASE_DIR/sgsn:/data \</span><br><span> --name ${BUILD_TAG}-sgsn -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-sgsn -c /data/osmo-sgsn.cfg >/data/osmo-sgsn.log 2>&1"</span><br><span> </span><br><span>@@ -43,6 +45,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/sgsn-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-sgsn-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-sgsn-test $@</span><br><span> </span><br><span> echo Starting container to merge logs</span><br><span>@@ -52,6 +55,7 @@</span><br><span> -v $VOL_BASE_DIR/sgsn-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \</span><br><span> --entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-sgsn-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index 0bc0357..8a1977e 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -26,6 +26,7 @@</span><br><span> -v $VOL_BASE_DIR/sip:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-sip-connector -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-sip-$IMAGE_SUFFIX \</span><br><span> /bin/sh -c "osmo-sip-connector -c /data/osmo-sip-connector.cfg >>/data/osmo-sip-connector.log 2>&1"</span><br><span> </span><br><span>@@ -36,6 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/sip-tester:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-ttcn3-sip-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-sip-test</span><br><span> </span><br><span> echo Stopping containers</span><br><span>diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh</span><br><span>index 7bb0337..bc2d5af 100755</span><br><span>--- a/ttcn3-stp-test/jenkins.sh</span><br><span>+++ b/ttcn3-stp-test/jenkins.sh</span><br><span>@@ -21,6 +21,7 @@</span><br><span> --network $NET_NAME --ip 172.18.19.200 \</span><br><span> -v $VOL_BASE_DIR/stp:/data \</span><br><span> --name ${BUILD_TAG}-stp -d \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/osmo-stp-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with STP testsuite</span><br><span>@@ -29,6 +30,7 @@</span><br><span> -e "TTCN3_PCAP_PATH=/data" \</span><br><span> -v $VOL_BASE_DIR/stp-tester:/data \</span><br><span> --name ${BUILD_TAG}-ttcn3-stp-test \</span><br><span style="color: hsl(120, 100%, 40%);">+ $DOCKER_ARGS \</span><br><span> $REPO_USER/ttcn3-stp-test</span><br><span> </span><br><span> docker container kill ${BUILD_TAG}-stp</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18047">change 18047</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/18047"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8d1f78aee926f8f6ec0b704e16639bc83f525816 </div>
<div style="display:none"> Gerrit-Change-Number: 18047 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>