pespin submitted this change.

View Change

ttcn3-bts: Add osmux configurations

Requires: osmo-ttcn3-hacks.git I1af23c7a60b05edc3b544f1fea0023f48e89f7a7
Requires: osmo-bts.git Ib80be434c06d07b3611bd18ae25dff8b14a7aad9
Related: SYS#5987
Change-Id: I185b77eb4fa05501f098d89b80b66168349175bb
---
M ttcn3-bts-test/generic/BTS_Tests.cfg
M ttcn3-bts-test/generic/osmo-bts.confmerge
M ttcn3-bts-test/jenkins.sh
3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
index fd2e05d..dbf7ae0 100644
--- a/ttcn3-bts-test/generic/BTS_Tests.cfg
+++ b/ttcn3-bts-test/generic/BTS_Tests.cfg
@@ -16,6 +16,7 @@
 L1CTL_PortType.m_l1ctl_sock_path := "/data/unix/osmocom_l2"
 BTS_Tests.mp_ctrl_ip   := "172.18.9.20"
 BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10"
+BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10"
 
 [MAIN_CONTROLLER]
 
diff --git a/ttcn3-bts-test/generic/osmo-bts.confmerge b/ttcn3-bts-test/generic/osmo-bts.confmerge
index 7837748..9015904 100644
--- a/ttcn3-bts-test/generic/osmo-bts.confmerge
+++ b/ttcn3-bts-test/generic/osmo-bts.confmerge
@@ -7,5 +7,7 @@
  oml remote-ip 172.18.9.11
  gsmtap-remote-host 172.18.9.10
  pcu-socket /data/unix/pcu_sock
+ osmux
+  local-ip 172.18.9.20
 ctrl
  bind 0.0.0.0
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index c16be80..3438771 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -144,6 +144,11 @@
 mkdir $VOL_BASE_DIR/bts
 mkdir $VOL_BASE_DIR/bts/unix
 cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
+# Disable until osmo-bts release > 1.5.0
+if ! image_suffix_is_master; then
+	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+fi
 
 mkdir $VOL_BASE_DIR/unix
 
@@ -165,6 +170,11 @@
 docker container kill ${BUILD_TAG}-fake_trx
 docker container kill ${BUILD_TAG}-bts
 cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
+# Disable until osmo-bts release > 1.5.0
+if ! image_suffix_is_master; then
+	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+fi
 start_bts virtual 0
 start_virtphy
 # ... and execute the testsuite again with different cfg
@@ -177,6 +187,11 @@
 docker container kill ${BUILD_TAG}-bts
 
 cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
+# Disable until osmo-bts release > 1.5.0
+if ! image_suffix_is_master; then
+	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+fi
 start_bts trx 1
 start_fake_trx
 start_trxcon
@@ -186,6 +201,11 @@
 # 4) Frequency hopping tests require different configuration files
 cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
 cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
+# Disable until osmo-bts release > 1.5.0
+if ! image_suffix_is_master; then
+	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
+fi
 # restart the BSC/BTS and run the testsuite again
 docker container kill ${BUILD_TAG}-bts
 start_bsc

To view, visit change 29338. To unsubscribe, or for help writing mail filters, visit settings.