dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38094?usp=email ) Change subject: pcuif: increase PCUIF version number ...................................................................... pcuif: increase PCUIF version number The PCUIF version number had to be increased. This requires an update to the TTCN3 test configuration files and scripts. We also have to add a mechanism that sets the correct version numbers for "latest" Change-Id: I15f7150b51047379a557a1f8df6330eca597f2e3 Related: OS#6507 Depends: osmo-bsc.git Ie92f5833a80b06e78c6cec8f03f054e2e2625fad Depends: osmo-bts.git I5316d3b7cef416eb19bb256f4ccc1468b3efe1c6 Depends: osmo-pcu.git Id01966a1ee52d0f5e465dc2e0eaf85e5b7942f81 Depends: osmo-ttcn3-hacks.git Idce13d55fc5bdbf5b366e3a60d9b46aacfc701a9 --- 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 M ttcn3-pcu-test/PCU_Tests.cfg M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 8 files changed, 20 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/38094/1 diff --git a/ttcn3-bts-test/generic/BTS_Tests.cfg b/ttcn3-bts-test/generic/BTS_Tests.cfg index a87c99f..76fe6ce 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 := 12; +PCUIF_Types.mp_pcuif_version := 13; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 40c00ac..b6660d6 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -127,7 +127,11 @@ set_pcuif_version() { if osmo_repo_is_2023q1; then - sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi + + if osmo_repo_is_latest; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 12/g' $1 fi } diff --git a/ttcn3-bts-test/oml/BTS_Tests.cfg b/ttcn3-bts-test/oml/BTS_Tests.cfg index 1311336..c424ef3 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 := 12; +PCUIF_Types.mp_pcuif_version := 13; [MAIN_CONTROLLER] diff --git a/ttcn3-bts-test/virtphy/BTS_Tests.cfg b/ttcn3-bts-test/virtphy/BTS_Tests.cfg index f71c524..a897873 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 := 12; +PCUIF_Types.mp_pcuif_version := 13; [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 8404f79..f23a5e2 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -35,7 +35,7 @@ } } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU" -PCUIF_Types.mp_pcuif_version := 12 +PCUIF_Types.mp_pcuif_version := 13 [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 4f55612..c464fc3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -11,7 +11,11 @@ set_pcuif_version() { if osmo_repo_is_2023q1; then - sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi + + if osmo_repo_is_latest; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 12/g' $1 fi } diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 6147a73..5c340ee 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -11,7 +11,11 @@ set_pcuif_version() { if osmo_repo_is_2023q1; then - sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 10/g' $1 + fi + + if osmo_repo_is_latest; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 13/PCUIF_Types.mp_pcuif_version := 12/g' $1 fi } diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 2b11462..54a1861 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,7 +59,7 @@ } } } -PCUIF_Types.mp_pcuif_version := 12 +PCUIF_Types.mp_pcuif_version := 13 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I15f7150b51047379a557a1f8df6330eca597f2e3 Gerrit-Change-Number: 38094 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>