Change in docker-playground[master]: bsc: Disable osmux for ttcn3-bsc-test-latest

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Tue May 28 16:43:21 UTC 2019


Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/14229


Change subject: bsc: Disable osmux for ttcn3-bsc-test-latest
......................................................................

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
---
M ttcn3-bsc-test/BSC_Tests.cfg
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
3 files changed, 8 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/14229/1

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 @@
 
 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 @@
 
 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/

-- 
To view, visit https://gerrit.osmocom.org/14229
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I745b210f43cb147d323a15f78c294f70ee077729
Gerrit-Change-Number: 14229
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190528/f3915a8f/attachment.html>


More information about the gerrit-log mailing list