dexter has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/34998?usp=email )
Change subject: ttcn3-bts/pcu-test: Use PCUIF v12 for current master and PCUIF
v11 for latest
......................................................................
ttcn3-bts/pcu-test: Use PCUIF v12 for current master and PCUIF v11 for latest
At the moment we use PCUIF v11 in latest and in master. This will now
change (see Depends) so that we will have to use v12 in master. This
patch adds the necessary conditional config changes.
Depends: osmo-pcu.git I48eb75f65ab54fdec41ef913e24c1f18cd4a4047
Change-Id: I5c0914c0bf906b51a500a3b099578700798cf8c0
Related: OS#6191
---
M ttcn3-bts-test/jenkins.sh
M ttcn3-pcu-test/jenkins.sh
2 files changed, 38 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index ed1e095..08df03c 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -121,17 +121,31 @@
$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.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
+ 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-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index 0a1eb67..116f06c 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -13,6 +13,15 @@
if image_suffix_is_2023q1; then
sed -i 's/PCUIF_Types.mp_pcuif_version :=
11/PCUIF_Types.mp_pcuif_version := 10/g' $1
fi
+
+ # 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-pcu-latest PCUIF v.12 is not yet supported. After the
next release, PCUIF
+ # v.12 will be supported in osmo-pcu-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
+ fi
}
mkdir $VOL_BASE_DIR/pcu-tester
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34998?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: I5c0914c0bf906b51a500a3b099578700798cf8c0
Gerrit-Change-Number: 34998
Gerrit-PatchSet: 3
Gerrit-Owner: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
