From 38f51b709f1e9102468dc3cb21271c8a43692851 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 19 Aug 2019 19:24:37 +0200 Subject: ttcn3-bsc/msc: Drop fixups for latest releases not supporting osmux Last releases of osmo-bsc and osmo-bsc already support Osmux, so we can drop those lines as indicated. Change-Id: Id6a18f2d691f6e9234a5a0cf91ed5c840a6394de --- ttcn3-bsc-test/jenkins-sccplite.sh | 3 --- ttcn3-bsc-test/jenkins.sh | 4 ---- ttcn3-msc-test/jenkins.sh | 4 ---- 3 files changed, 11 deletions(-) diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index ed8ffc3..0a2ff8b 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -14,9 +14,6 @@ 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 453fcf0..af5c965 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -12,10 +12,6 @@ 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/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index ca2936a..a0a5f87 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -14,10 +14,6 @@ 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/ -- cgit v1.2.3