osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34698?usp=email ) Change subject: ttcn3-pcu-test: use PFUIF v10 for 2023q1 ...................................................................... ttcn3-pcu-test: use PFUIF v10 for 2023q1 Change-Id: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 --- M jenkins-common.sh 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 5 files changed, 34 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jenkins-common.sh b/jenkins-common.sh index e72a28d..c9299df 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -503,6 +503,14 @@ esac } +# Check if IMAGE_SUFFIX starts with "2023q1" (e.g. "2023q1-centos8") +image_suffix_is_2023q1() { + case "$IMAGE_SUFFIX" in + 2023q1*) return 0 ;; + *) return 1 ;; + esac +} + # Write the Osmocom repository to the TTCN3 config file, so the tests may take # different code paths (OS#5327) # $1: path to TTCN3 config file (e.g. BSC_Tests.cfg) diff --git a/ttcn3-pcu-test/PCU_Tests.cfg b/ttcn3-pcu-test/PCU_Tests.cfg index 40b8e2c..b3f3b8f 100644 --- a/ttcn3-pcu-test/PCU_Tests.cfg +++ b/ttcn3-pcu-test/PCU_Tests.cfg @@ -34,7 +34,8 @@ } } } -Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU"; +Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoPCU" +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 393e828..50027d3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -9,10 +9,17 @@ set_clean_up_trap 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 +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index ee53bb7..0a1eb67 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -9,10 +9,17 @@ set_clean_up_trap 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 +} + mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" +set_pcuif_version "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 1036f5a..d62f52d 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,6 +59,7 @@ } } } +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34698?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: Iae895240276fa68bfd9fdb2e13358a3a7fb65f59 Gerrit-Change-Number: 34698 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged