From 709a30b536ae9f725f675edcfe3ba855fee0e577 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Tue, 14 Dec 2021 22:09:27 +0300 Subject: [PATCH] ttcn3-{sgsn,ggsn}-test: set OSMO_SUT_{HOST,PORT} This enables the test suite to obtain talloc reports between the test case executions, which get stored together with the PCAP files. Change-Id: I61fef7763e6445c231ff2664036e243a9ac96ff6 Related: Icd4c2d80db934535d499598282ed9416d8088163 --- ttcn3-ggsn-test/jenkins.sh | 4 ++++ ttcn3-sgsn-test/jenkins.sh | 2 ++ 2 files changed, 6 insertions(+) diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index cdf9bf88..53da74d3 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -46,12 +46,14 @@ if [ "$KERNEL_TEST" = "1" ]; then -v "$KERNEL_TEST_DIR:/kernel-test:ro" -v "$CACHE_DIR:/cache" " + OSMO_SUT_HOST="172.18.$SUBNET.200" else cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) " + OSMO_SUT_HOST="172.18.$SUBNET.201" fi docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ @@ -74,6 +76,8 @@ docker run --rm \ --ulimit core=-1 \ -v $VOL_BASE_DIR/ggsn-tester:/data \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=$OSMO_SUT_HOST" \ + -e "OSMO_SUT_PORT=4260" \ --name ${BUILD_TAG}-ggsn-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-ggsn-test diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index 24869c58..dde90a2e 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -49,6 +49,8 @@ docker run --rm \ $(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=4245" \ -v $VOL_BASE_DIR/sgsn-tester:/data \ --name ${BUILD_TAG}-ttcn3-sgsn-test \ $DOCKER_ARGS \