laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email )
Change subject: ttcn3-bts: Use PCUIF v11
......................................................................
ttcn3-bts: Use PCUIF v11
Since osmo-bts 1.7.0 which was just released, PCUIF v11 is supported, so
use it both in master and latest.
Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780
---
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, 15 insertions(+), 17 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg
b/ttcn3-bts-test/generic/BTS_Tests.cfg
index 7015111..634d60d 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 := 10;
+PCUIF_Types.mp_pcuif_version := 11;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index c456f37..ed1e095 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -121,31 +121,17 @@
$REPO_USER/ttcn3-bts-test
}
-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.10
- # since in osmo-btw-latest PCUIF v.11 is not yet supported. After the next
release PCUIF
- # v.11 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 :=
10/PCUIF_Types.mp_pcuif_version := 11/g' $1
- fi
-}
-
network_create
mkdir $VOL_BASE_DIR/bts-tester-generic
cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
-set_pcuif_version "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-virtphy
cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-virtphy/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg"
-set_pcuif_version "$VOL_BASE_DIR/bts-tester-virtphy/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-oml
cp oml/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-oml/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg"
-set_pcuif_version "$VOL_BASE_DIR/bts-tester-oml/BTS_Tests.cfg"
mkdir $VOL_BASE_DIR/bts-tester-hopping
cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/
write_mp_osmo_repo "$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg"
diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg
index bcecf28..74afc44 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 := 10;
+PCUIF_Types.mp_pcuif_version := 11;
[MAIN_CONTROLLER]
diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg
b/ttcn3-bts-test/virtphy/BTS_Tests.cfg
index 74d6f53..fe8afe4 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 := 10;
+PCUIF_Types.mp_pcuif_version := 11;
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780
Gerrit-Change-Number: 34398
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-MessageType: merged
