fixeria has uploaded this change for review.
ttcn3-bts-test: set PCUIFv12 for both -master and -latest
osmo-bts v1.7.2 (recently tagged) now also speaks PCUIFv12.
Take a chance to fix ttcn3-bts-test-2023q1 by setting PCUIFv10.
Change-Id: I70f0c30d6c514614095dcbbcac5d025001861fbc
---
M ttcn3-bts-test/generic/BTS_Tests.cfg
M ttcn3-bts-test/jenkins.sh
M ttcn3-bts-test/oml/BTS_Tests.cfg
M ttcn3-bts-test/virtphy/BTS_Tests.cfg
4 files changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/35369/1
diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg
index 634d60d..cd1e739 100644
--- a/ttcn3-bts-test/generic/BTS_Tests.cfg
+++ b/ttcn3-bts-test/generic/BTS_Tests.cfg
@@ -18,7 +18,7 @@
BTS_Tests.mp_rtpem_bind_ip := "172.18.9.10"
BTS_Tests.mp_osmuxem_bind_ip := "172.18.9.10"
BTS_Tests.mp_l1_supports_gprs := true
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 08df03c..4128e08 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -122,13 +122,8 @@
}
set_pcuif_version() {
- # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is
- # executed for current master. For latest the PCUIF module parameter must stay at v.11
- # since in osmo-bts-latest PCUIF v.12 is not yet supported. After the next release, PCUIF
- # v.12 will be supported in osmo-bts-latest as well and this function, including the
- # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed.
- if image_suffix_is_master; then
- sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1
+ if image_suffix_is_2023q1; then
+ sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
}
diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg
index 74afc44..1311336 100644
--- a/ttcn3-bts-test/oml/BTS_Tests.cfg
+++ b/ttcn3-bts-test/oml/BTS_Tests.cfg
@@ -19,7 +19,7 @@
BTS_Tests_OML.mp_oml_ip := "172.18.9.10"
BTS_Tests_OML.mp_oml_port := 3002
BTS_Tests_OML.mp_pcu_socket := "/data/unix/pcu_sock"
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
index fe8afe4..f71c524 100644
--- a/ttcn3-bts-test/virtphy/BTS_Tests.cfg
+++ b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
@@ -17,7 +17,7 @@
BTS_Tests.mp_ctrl_ip := "172.18.9.20"
BTS_Tests.mp_l1_supports_gprs := true
BTS_Tests.mp_bts_trxc_port := -1;
-PCUIF_Types.mp_pcuif_version := 11;
+PCUIF_Types.mp_pcuif_version := 12;
[MAIN_CONTROLLER]
To view, visit change 35369. To unsubscribe, or for help writing mail filters, visit settings.