fixeria submitted this change.

View Change


Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve
ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites

Let's also retrieve talloc reports for these testsuites.

Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9
---
M ttcn3-cbc-test/jenkins.sh
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-gbproxy-test/jenkins.sh
M ttcn3-hnbgw-test/jenkins.sh
M ttcn3-hnodeb-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
M ttcn3-smlc-test/jenkins.sh
M ttcn3-stp-test/jenkins.sh
M ttcn3-upf-test/jenkins.sh
12 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh
index e1958ef..6026df0 100755
--- a/ttcn3-cbc-test/jenkins.sh
+++ b/ttcn3-cbc-test/jenkins.sh
@@ -33,6 +33,8 @@
$(docker_network_params $SUBNET 100) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \
+ -e "OSMO_SUT_PORT=4264" \
-v $VOL_BASE_DIR/cbc-tester:/data \
--name ${BUILD_TAG}-ttcn3-cbc-test \
$DOCKER_ARGS \
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 1c53173..72dc4af 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -61,6 +61,8 @@
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \
+ -e "OSMO_SUT_PORT=4246" \
-e "WAIT_FOR_NETDEV=hdlc8" \
-v $VOL_BASE_DIR/gbproxy-tester:/data \
--name ${BUILD_TAG}-ttcn3-gbproxy-test -d \
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index 0ee7a5f..861be39 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -39,6 +39,8 @@
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \
+ -e "OSMO_SUT_PORT=4246" \
-v $VOL_BASE_DIR/gbproxy-tester:/data \
--name ${BUILD_TAG}-ttcn3-gbproxy-test \
$DOCKER_ARGS \
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index c47c9ca..21647ed 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -67,6 +67,8 @@
$(docker_network_params $SUBNET 203) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \
+ -e "OSMO_SUT_PORT=4261" \
-v $base_dir/hnbgw-tester:/data \
-v $base_dir/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-hnbgw-test \
diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh
index 3b57fd8..cdc47b0 100755
--- a/ttcn3-hnodeb-test/jenkins.sh
+++ b/ttcn3-hnodeb-test/jenkins.sh
@@ -38,6 +38,8 @@
$(docker_network_params $SUBNET 203) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \
+ -e "OSMO_SUT_PORT=4273" \
-v $VOL_BASE_DIR/hnodeb-tester:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-hnodeb-test \
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index b2d78a7..5395fa3 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -34,6 +34,8 @@
--ulimit core=-1 \
-v $VOL_BASE_DIR/mgw-tester:/data \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.180" \
+ -e "OSMO_SUT_PORT=4243" \
--name ${BUILD_TAG}-ttcn3-mgw-test \
$DOCKER_ARGS \
$REPO_USER/ttcn3-mgw-test
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index d63229b..c42ad18 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -50,6 +50,8 @@
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \
+ -e "OSMO_SUT_PORT=4240" \
-v $VOL_BASE_DIR/pcu-tester:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-pcu-test-sns \
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index dca6dc0..f92a08e 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -46,6 +46,8 @@
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \
+ -e "OSMO_SUT_PORT=4240" \
-v $VOL_BASE_DIR/pcu-tester:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-pcu-test \
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index 2a20dcc..5ccbdf5 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -39,6 +39,8 @@
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \
+ -e "OSMO_SUT_PORT=4256" \
-v $VOL_BASE_DIR/sip-tester:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
--name ${BUILD_TAG}-ttcn3-sip-test \
diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh
index 33a1293..ab284b3 100755
--- a/ttcn3-smlc-test/jenkins.sh
+++ b/ttcn3-smlc-test/jenkins.sh
@@ -47,6 +47,8 @@
$(docker_network_params $SUBNET 203) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \
+ -e "OSMO_SUT_PORT=4271" \
-v $VOL_BASE_DIR/smlc-tester:/data \
--name ${BUILD_TAG}-ttcn3-smlc-test \
$DOCKER_ARGS \
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index f6768f0..4f90a4d 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -40,6 +40,8 @@
$(docker_network_params $SUBNET 203) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.200" \
+ -e "OSMO_SUT_PORT=4239" \
-v $VOL_BASE_DIR/stp-tester:/data \
--name ${BUILD_TAG}-ttcn3-stp-test \
$DOCKER_ARGS \
diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh
index f814975..8bb19e2 100755
--- a/ttcn3-upf-test/jenkins.sh
+++ b/ttcn3-upf-test/jenkins.sh
@@ -33,6 +33,8 @@
$(docker_network_params $SUBNET 203) \
--ulimit core=-1 \
-e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \
+ -e "OSMO_SUT_PORT=4275" \
-v $VOL_BASE_DIR/upf-tester:/data \
--name ${BUILD_TAG}-ttcn3-upf-test \
$DOCKER_ARGS \

To view, visit change 36371. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9
Gerrit-Change-Number: 36371
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged