From 2cdab85e5f42c876a3024ca2154c67c21d1d78cc Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 28 May 2019 18:41:58 +0200 Subject: bsc: Disable osmux for ttcn3-bsc-test-latest Latest tagged version of osmo-bsc doesn't support "osmux on/off" VTY commands, so we have to enable osmux use on that version to avoid most TTCN3 tests failing during set up phase. Depends: osmo-ttcn3-hacks I61e4c59b2926f3f70cb6d0190a8683861e54179a Change-Id: I745b210f43cb147d323a15f78c294f70ee077729 --- ttcn3-bsc-test/BSC_Tests.cfg | 1 + ttcn3-bsc-test/jenkins-sccplite.sh | 3 +++ ttcn3-bsc-test/jenkins.sh | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/ttcn3-bsc-test/BSC_Tests.cfg b/ttcn3-bsc-test/BSC_Tests.cfg index 24e8a61..97ce617 100644 --- a/ttcn3-bsc-test/BSC_Tests.cfg +++ b/ttcn3-bsc-test/BSC_Tests.cfg @@ -11,6 +11,7 @@ [MODULE_PARAMETERS] BSC_Tests.mp_bsc_ip := "172.18.2.20"; BSC_Tests.mp_test_ip := "172.18.2.203"; +BSC_Tests.mp_enable_osmux_test := true; BSC_Tests.mp_bssap_cfg := { transport := BSSAP_TRANSPORT_AoIP, sccp_service_type := "mtp3_itu", diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 0a2ff8b..ed8ffc3 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -14,6 +14,9 @@ NET_NAME=ttcn3-bsc_sccplite-test mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg +fi mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index af5c965..453fcf0 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -12,6 +12,10 @@ docker_images_require \ mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ +# osmux must be disabled until release AFTER osmo-bsc 1.4.1 is tagged +if [ "$IMAGE_SUFFIX" = "latest" ]; then + sed "s/BSC_Tests.mp_enable_osmux_test := true;/BSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg +fi mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- cgit v1.2.3