diff options
author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-12-15 14:57:00 +0700 |
---|---|---|
committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-12-15 14:57:28 +0700 |
commit | 39d26ce8deb3b71639c16a9724fc82ec36b9f068 (patch) | |
tree | 8e5462772074a364443b714870abdbb5ad011476 | |
parent | f4e2d5c1e59779786e04f58125a73570dd4e80a4 (diff) |
ttcn3-pcu-test: set PCUIFv12 for both -master and -latest
osmo-pcu v1.4.0 (recently tagged) now also speaks PCUIFv12.
Change-Id: If0b2209af645f391817f65b4227736b52ca59e2e
Related: OS#6191
-rw-r--r-- | ttcn3-pcu-test/PCU_Tests.cfg | 2 | ||||
-rwxr-xr-x | ttcn3-pcu-test/jenkins-sns.sh | 11 | ||||
-rwxr-xr-x | ttcn3-pcu-test/jenkins.sh | 11 | ||||
-rw-r--r-- | ttcn3-pcu-test/sns/PCU_Tests.cfg | 2 |
4 files changed, 4 insertions, 22 deletions
diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index b3f3b8f..8404f79 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -35,7 +35,7 @@ SGSN_Components.mp_nsconfig := { } } Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU" -PCUIF_Types.mp_pcuif_version := 11 +PCUIF_Types.mp_pcuif_version := 12 [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 06f833e..d63229b 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -11,16 +11,7 @@ set -e set_pcuif_version() { 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 + sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 fi } diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 116f06c..dca6dc0 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -11,16 +11,7 @@ set -e set_pcuif_version() { 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 + sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 fi } diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index d62f52d..2b11462 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,7 +59,7 @@ SGSN_Components.mp_nsconfig := { } } } -PCUIF_Types.mp_pcuif_version := 11 +PCUIF_Types.mp_pcuif_version := 12 [MAIN_CONTROLLER] |