Change in docker-playground[master]: ttcn3-*-test/jenkins*.sh: add $DOCKER_ARGS

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Tue May 5 12:38:22 UTC 2020 

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/18047 )


Change subject: ttcn3-*-test/jenkins*.sh: add $DOCKER_ARGS
......................................................................

ttcn3-*-test/jenkins*.sh: add $DOCKER_ARGS

Allow to pass options to each "docker run" line in the various
jenkins.sh scripts. I'm using this to run the testsuites and Osmocom
components in docker with the same configurations as jenkins, but with
Osmocom and testsuite binaries built outside and mounted into the
containers:

DOCKER_ARGS="-v /usr/local:/usr/local:ro -v $hacks:/osmo-ttcn3-hacks:ro"

This allows very short test cycles without a second set of configs. The
full script that makes use of this feature is in osmo-dev.git,
ttcn3/ttcn3.sh.

Change-Id: I8d1f78aee926f8f6ec0b704e16639bc83f525816
---
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bscnat-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-ggsn-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-remsim-test/jenkins.sh
M ttcn3-sccp-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
M ttcn3-stp-test/jenkins.sh
15 files changed, 41 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/18047/1

diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index b3791a5..36c79d5 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -25,6 +25,7 @@
 		--network $NET_NAME --ip 172.18.12.20 \
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
 for i in `seq 0 2`; do
@@ -32,6 +33,7 @@
 	docker run	--rm \
 			--network $NET_NAME --ip 172.18.12.10$i \
 			--name ${BUILD_TAG}-bts$i -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
 			/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"
 done
@@ -42,6 +44,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bsc-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-bsc-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-bsc-test
 
 echo Stopping containers
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 3455dc1..44badb5 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -26,6 +26,7 @@
 		--network $NET_NAME --ip 172.18.2.200 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-stp-$IMAGE_SUFFIX
 
 echo Starting container with BSC
@@ -33,6 +34,7 @@
 		--network $NET_NAME --ip 172.18.2.20 \
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
 for i in `seq 0 2`; do
@@ -40,6 +42,7 @@
 	docker run	--rm \
 			--network $NET_NAME --ip 172.18.2.10$i \
 			--name ${BUILD_TAG}-bts$i -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
 			/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"
 done
@@ -50,6 +53,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bsc-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-bsc-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-bsc-test
 
 echo Stopping containers
diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index d52e79a..1df1a70 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -23,6 +23,7 @@
 		--network $NET_NAME --ip 172.18.15.20 \
 		-v $VOL_BASE_DIR/bscnat:/data \
 		--name ${BUILD_TAG}-bscnat -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-nitb-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-bsc_nat -c /data/osmo-bsc-nat.cfg >/data/osmo-bsc-nat.log 2>&1"
 
@@ -32,6 +33,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/bscnat-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-bscnat-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-bscnat-test
 
 echo Stopping containers
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index cc401e7..00e8133 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -17,6 +17,7 @@
 			--network $NET_NAME --ip 172.18.9.11 \
 			-v $VOL_BASE_DIR/bsc:/data \
 			--name ${BUILD_TAG}-bsc -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-bsc-$IMAGE_SUFFIX \
 			/bin/sh -c "osmo-bsc -c /data/osmo-bsc.cfg >>/data/osmo-bsc.log 2>&1"
 }
@@ -34,6 +35,7 @@
 			-v $VOL_BASE_DIR/bts:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
 			--name ${BUILD_TAG}-bts -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
 			/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"
 }
@@ -44,6 +46,7 @@
 			--network $NET_NAME --ip 172.18.9.21 \
 			-v $VOL_BASE_DIR/fake_trx:/data \
 			--name ${BUILD_TAG}-fake_trx -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmocom-bb-host-master \
 			/tmp/osmocom-bb/src/target/trx_toolkit/fake_trx.py \
 				--log-file-name /data/fake_trx.log \
@@ -60,6 +63,7 @@
 			-v $VOL_BASE_DIR/trxcon:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
 			--name ${BUILD_TAG}-trxcon -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmocom-bb-host-master \
 			/bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1"
 }
@@ -70,6 +74,7 @@
 			--network $NET_NAME --ip 172.18.9.22 \
 			-v $VOL_BASE_DIR/unix:/data/unix \
 			--name ${BUILD_TAG}-virtphy -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmocom-bb-host-master \
 			virtphy -s /data/unix/osmocom_l2
 			/bin/sh -c "virtphy -s /data/unix/osmocom_l2 >>/data/virtphy.log 2>&1"
@@ -83,6 +88,7 @@
 			-v $VOL_BASE_DIR/bts-tester:/data \
 			-v $VOL_BASE_DIR/unix:/data/unix \
 			--name ${BUILD_TAG}-ttcn3-bts-test \
+			$DOCKER_ARGS \
 			$REPO_USER/ttcn3-bts-test
 }
 
diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh
index ac26c0f..a69e640 100755
--- a/ttcn3-ggsn-test/jenkins.sh
+++ b/ttcn3-ggsn-test/jenkins.sh
@@ -24,6 +24,7 @@
 		--network $NET_NAME --ip 172.18.3.201 \
 		-v $VOL_BASE_DIR/ggsn:/data \
 		--name ${BUILD_TAG}-ggsn -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-ggsn -c /data/osmo-ggsn.cfg >/data/osmo-ggsn.log 2>&1"
 
@@ -34,6 +35,7 @@
 		-v $VOL_BASE_DIR/ggsn-tester:/data \
 		-e "TTCN3_PCAP_PATH=/data" \
 		--name ${BUILD_TAG}-ggsn-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-ggsn-test
 
 # stop GGSN after test has completed
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 74aa37f..47ce5a9 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -27,6 +27,7 @@
 		--network $NET_NAME --ip 172.18.10.20 \
 		-v $VOL_BASE_DIR/hlr:/data \
 		--name ${BUILD_TAG}-hlr -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-hlr-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-hlr -c /data/osmo-hlr.cfg >/data/osmo-hlr.log 2>&1"
 
@@ -36,6 +37,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/hlr-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-hlr-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-hlr-test
 
 echo Stopping containers
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index 473782f..4ebd235 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -21,6 +21,7 @@
 		--network $NET_NAME --ip 172.18.4.180 \
 		-v $VOL_BASE_DIR/mgw:/data \
 		--name ${BUILD_TAG}-mgw -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-mgw-$IMAGE_SUFFIX
 
 # start docker container with testsuite in foreground
@@ -29,6 +30,7 @@
 		-v $VOL_BASE_DIR/mgw-tester:/data \
 		-e "TTCN3_PCAP_PATH=/data" \
 		--name ${BUILD_TAG}-ttcn3-mgw-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-mgw-test
 
 # stop mgw after test has completed
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 28bc4b7..805151a 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -37,6 +37,7 @@
 		-v $VOL_BASE_DIR/msc:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-msc -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-msc-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-msc -c /data/osmo-msc.cfg >>/data/osmo-msc.log 2>&1"
 
@@ -47,6 +48,7 @@
 		-v $VOL_BASE_DIR/msc-tester:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-msc-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-msc-test
 
 echo Stopping containers
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index 51b5f64..06403d3 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -26,6 +26,7 @@
 		-v $VOL_BASE_DIR/pcu:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-pcu-sns -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
 		/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"
 
@@ -36,6 +37,7 @@
 		-v $VOL_BASE_DIR/pcu-tester:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-pcu-test-sns \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-pcu-test
 
 echo Stopping containers
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index e0f1212..271f89f 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -26,6 +26,7 @@
 		-v $VOL_BASE_DIR/pcu:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-pcu -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-pcu-$IMAGE_SUFFIX \
 		/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"
 
@@ -36,6 +37,7 @@
 		-v $VOL_BASE_DIR/pcu-tester:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-pcu-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-pcu-test
 
 echo Stopping containers
diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh
index 1b7c7cf..1c2682c 100755
--- a/ttcn3-remsim-test/jenkins.sh
+++ b/ttcn3-remsim-test/jenkins.sh
@@ -13,6 +13,7 @@
 			--network $NET_NAME --ip 172.18.17.20 \
 			-v $VOL_BASE_DIR/server:/data \
 			--name ${BUILD_TAG}-server -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
 			/bin/sh -c "osmo-remsim-server >/data/osmo-remsim-server.log 2>&1"
 }
@@ -23,6 +24,7 @@
 			--network $NET_NAME --ip 172.18.17.30 \
 			-v $VOL_BASE_DIR/bankd:/data \
 			--name ${BUILD_TAG}-bankd -d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
 			/bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1"
 }
@@ -33,6 +35,7 @@
 			--network $NET_NAME --ip 172.18.17.40 \
 			-v $VOL_BASE_DIR/client:/data \
 			--name ${BUILD_TAG}-client-d \
+			$DOCKER_ARGS \
 			$REPO_USER/osmo-remsim-$IMAGE_SUFFIX \
 			/bin/sh -c "osmo-remsim-client-shell >/data/osmo-remsim-client.log 2>&1"
 }
@@ -46,6 +49,7 @@
 			-e "TTCN3_PCAP_PATH=/data" \
 			-v $VOL_BASE_DIR/remsim-tester:/data \
 			--name ${BUILD_TAG}-ttcn3-remsim-test \
+			$DOCKER_ARGS \
 			$REPO_USER/ttcn3-remsim-test
 }
 
diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh
index f5c1549..242e44a 100755
--- a/ttcn3-sccp-test/jenkins.sh
+++ b/ttcn3-sccp-test/jenkins.sh
@@ -22,6 +22,7 @@
 		--network $NET_NAME --ip 172.18.22.200 \
 		-v $VOL_BASE_DIR/sccp:/data \
 		--name ${BUILD_TAG}-stp -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-stp-master \
 		/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"
 
@@ -32,6 +33,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sccp-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-sccp-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-sccp-test
 
 docker container kill ${BUILD_TAG}-stp
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 5464ca6..9db295a 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -27,6 +27,7 @@
 		--network $NET_NAME --ip 172.18.8.200 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-stp-$IMAGE_SUFFIX
 
 echo Starting container with SGSN
@@ -34,6 +35,7 @@
 		--network $NET_NAME --ip 172.18.8.10 \
 		-v $VOL_BASE_DIR/sgsn:/data \
 		--name ${BUILD_TAG}-sgsn -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-sgsn -c /data/osmo-sgsn.cfg >/data/osmo-sgsn.log 2>&1"
 
@@ -43,6 +45,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/sgsn-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-sgsn-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-sgsn-test $@
 
 echo Starting container to merge logs
@@ -52,6 +55,7 @@
 		-v $VOL_BASE_DIR/sgsn-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-sgsn-test-logmerge \
 		--entrypoint /osmo-ttcn3-hacks/log_merge.sh SGSN_Tests --rm \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-sgsn-test
 
 echo Stopping containers
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index 0bc0357..8a1977e 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -26,6 +26,7 @@
 		-v $VOL_BASE_DIR/sip:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-sip-connector -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-sip-$IMAGE_SUFFIX \
 		/bin/sh -c "osmo-sip-connector -c /data/osmo-sip-connector.cfg >>/data/osmo-sip-connector.log 2>&1"
 
@@ -36,6 +37,7 @@
 		-v $VOL_BASE_DIR/sip-tester:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-ttcn3-sip-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-sip-test
 
 echo Stopping containers
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index 7bb0337..bc2d5af 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -21,6 +21,7 @@
 		--network $NET_NAME --ip 172.18.19.200 \
 		-v $VOL_BASE_DIR/stp:/data \
 		--name ${BUILD_TAG}-stp -d \
+		$DOCKER_ARGS \
 		$REPO_USER/osmo-stp-$IMAGE_SUFFIX
 
 echo Starting container with STP testsuite
@@ -29,6 +30,7 @@
 		-e "TTCN3_PCAP_PATH=/data" \
 		-v $VOL_BASE_DIR/stp-tester:/data \
 		--name ${BUILD_TAG}-ttcn3-stp-test \
+		$DOCKER_ARGS \
 		$REPO_USER/ttcn3-stp-test
 
 docker container kill ${BUILD_TAG}-stp

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/18047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8d1f78aee926f8f6ec0b704e16639bc83f525816
Gerrit-Change-Number: 18047
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200505/eca3722f/attachment.htm>

More information about the gerrit-log mailing list