aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-05-31 18:04:29 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-05-31 18:05:40 +0200
commitbf0d5075cb6cc43c30fb3538e258e366fe80d47d (patch)
tree6fb67b3ccb8828be1c64aab6d9bd777b4dedc34c
parent0e59f1e8bfbfa0168adad158063230f61c4d3596 (diff)
msc: Disable osmux for ttcn3-msc-test-latest
Latest tagged version of osmo-msc 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.git I53d58b2d905905ebf1df322d0389b3715a48212f Change-Id: I6b3be3981978661de2fa90be130f6f1811a3d1f9
-rw-r--r--ttcn3-msc-test/MSC_Tests.cfg1
-rwxr-xr-xttcn3-msc-test/jenkins.sh4
2 files changed, 5 insertions, 0 deletions
diff --git a/ttcn3-msc-test/MSC_Tests.cfg b/ttcn3-msc-test/MSC_Tests.cfg
index c36e08b..1614d24 100644
--- a/ttcn3-msc-test/MSC_Tests.cfg
+++ b/ttcn3-msc-test/MSC_Tests.cfg
@@ -51,6 +51,7 @@ MSC_Tests.mp_msc_ip := "172.18.1.10";
# local (emulation) side)
MSC_Tests.mp_hlr_ip := "172.18.1.103";
MSC_Tests.mp_mgw_ip := "172.18.1.103";
+MSC_Tests.mp_enable_osmux_test := true;
[MAIN_CONTROLLER]
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index a0a5f87..ca2936a 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -14,6 +14,10 @@ network_create 172.18.1.0/24
mkdir $VOL_BASE_DIR/msc-tester
mkdir $VOL_BASE_DIR/msc-tester/unix
cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/
+# osmux must be disabled until release AFTER osmo-msc 1.3.1 is tagged
+if [ "$IMAGE_SUFFIX" = "latest" ]; then
+ sed "s/MSC_Tests.mp_enable_osmux_test := true;/MSC_Tests.mp_enable_osmux_test := false;/g" -i $VOL_BASE_DIR/msc-tester/MSC_Tests.cfg
+fi
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/