diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:57:01 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:57:01 +0100 |
| commit | f14d94d26b4662b98d2db9aea2805b4938a3ed4d (patch) | |
| tree | 1993edfc39946c2512e03fab620636cf7d93479a | |
| parent | ad4f342b7dd00acef81cc555dd93760d75acd064 (diff) | |
ggsn-test: Switch to new common/shared config file structure
This requires I491819c8bad8efa45cee161ea6f47c3f97941a17 in
osmo-ttcn3-hacks
| -rw-r--r-- | ggsn-test/Dockerfile | 3 | ||||
| -rw-r--r-- | ggsn-test/GGSN_Tests.cfg | 24 | ||||
| -rwxr-xr-x | ggsn-test/jenkins.sh | 1 |
3 files changed, 9 insertions, 19 deletions
diff --git a/ggsn-test/Dockerfile b/ggsn-test/Dockerfile index cb684f0..412ba59 100644 --- a/ggsn-test/Dockerfile +++ b/ggsn-test/Dockerfile @@ -14,6 +14,9 @@ RUN cd osmo-ttcn3-hacks && \ VOLUME /data +RUN ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-start.sh / && \ + ln -s /osmo-ttcn3-hacks/ttcn3-tcpdump-stop.sh / + COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD cd /data && \ diff --git a/ggsn-test/GGSN_Tests.cfg b/ggsn-test/GGSN_Tests.cfg index 4b34ce1..da56a1b 100644 --- a/ggsn-test/GGSN_Tests.cfg +++ b/ggsn-test/GGSN_Tests.cfg @@ -1,15 +1,11 @@ -[LOGGING] -ConsoleMask := DEBUG | LOG_ALL | MATCHING | DEBUG_TESTPORT +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests.default" -LogSourceInfo := Yes -SourceInfoFormat := Single -LoggerPlugins := { JUnitLogger := "libjunitlogger2" } -#*.JUnitLogger.filename_stem := "MyJunitLogFile" -*.JUnitLogger.testsuite_name := "myJUnitTest" +[LOGGING] +*.JUnitLogger.testsuite_name := "GGSN_Tests" [TESTPORT_PARAMETERS] -*.*.lazy_conn_id_handling := "YES" -system.*.lazy_conn_id_handling := "YES" [MODULE_PARAMETERS] # our Own IP address @@ -20,13 +16,3 @@ GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201" GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.201" [EXECUTE] -#GGSN_Tests.TC_dummy -GGSN_Tests.TC_pdp4_act_deact -GGSN_Tests.TC_pdp4_act_deact_ipcp -GGSN_Tests.TC_pdp4_act_deact_pcodns - -GGSN_Tests.TC_pdp6_act_deact -GGSN_Tests.TC_pdp6_act_deact_pcodns -GGSN_Tests.TC_pdp6_act_deact_icmp6 - -GGSN_Tests.TC_echo_req_resp diff --git a/ggsn-test/jenkins.sh b/ggsn-test/jenkins.sh index 38d50b3..f84dd98 100755 --- a/ggsn-test/jenkins.sh +++ b/ggsn-test/jenkins.sh @@ -26,6 +26,7 @@ docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --network $NET_NAME --ip 172.18.3.202 \ -v $VOL_BASE_DIR/ggsn-tester:/data \ + -e "TTCN3_PCAP_PATH=/data" \ --name ${BUILD_TAG}-ggsn-test \ $REPO_USER/ggsn-test |