From 305ce55b749cdf3f202639ee728ad20d9f18a89b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 26 Nov 2021 14:09:07 +0100 Subject: ttcn3: write Osmocom repository to configs Write a line like 'Misc_Helpers.mp_osmo_repo := "nightly"' into the TTCN-3 config file (e.g. BSC_Tests.cfg), before starting the testsuite. This allows executing different code paths in the tests based on the repository. Related: OS#5327 Change-Id: Ic06532f7a67e59458652c5cf4c8f6fee8113e703 --- jenkins-common.sh | 35 +++++++++++++++++++++++++++++++++++ ttcn3-bsc-test-vamos/jenkins.sh | 1 + ttcn3-bsc-test/jenkins-sccplite.sh | 1 + ttcn3-bsc-test/jenkins.sh | 1 + ttcn3-bscnat-test/jenkins.sh | 1 + ttcn3-bts-test/jenkins.sh | 4 ++++ ttcn3-cbc-test/jenkins.sh | 1 + ttcn3-fr-test/jenkins.sh | 1 + ttcn3-gbproxy-test-fr/jenkins.sh | 1 + ttcn3-gbproxy-test/jenkins.sh | 1 + ttcn3-ggsn-test/jenkins.sh | 1 + ttcn3-hlr-test/jenkins.sh | 1 + ttcn3-hnodeb-test/jenkins.sh | 1 + ttcn3-mgw-test/jenkins.sh | 1 + ttcn3-msc-test/jenkins.sh | 1 + ttcn3-ns-test/jenkins-fr.sh | 1 + ttcn3-ns-test/jenkins-sgsn-sns.sh | 1 + ttcn3-ns-test/jenkins-sns.sh | 1 + ttcn3-ns-test/jenkins.sh | 1 + ttcn3-pcap-client-test/jenkins.sh | 1 + ttcn3-pcu-test/jenkins-sns.sh | 1 + ttcn3-pcu-test/jenkins.sh | 1 + ttcn3-remsim-test/jenkins.sh | 3 +++ ttcn3-sccp-test/jenkins.sh | 1 + ttcn3-sgsn-test/jenkins.sh | 1 + ttcn3-sip-test/jenkins.sh | 1 + ttcn3-smlc-test/jenkins.sh | 1 + ttcn3-stp-test/jenkins.sh | 1 + 28 files changed, 67 insertions(+) diff --git a/jenkins-common.sh b/jenkins-common.sh index ef6fad9..d4258d2 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -355,6 +355,41 @@ image_suffix_is_master() { 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) +write_mp_osmo_repo() { + local repo="nightly" + local config="$1" + local line + + if ! [ -e "$config" ]; then + set +x + echo + echo "ERROR: TTCN3 config file '$config' not found in $PWD" + echo + exit 1 + fi + + case "$IMAGE_SUFFIX" in + latest*) + repo="latest" + ;; + 20*q*-*) # e.g. 2021q1-centos8 + repo="$(echo "$IMAGE_SUFFIX" | cut -d- -f 1)" # e.g. 2021q1 + ;; + *) + ;; + esac + + line="Misc_Helpers.mp_osmo_repo := \"$repo\"" + + sed \ + -i \ + "s/\[MODULE_PARAMETERS\]/\[MODULE_PARAMETERS\]\n$line/g" \ + "$config" +} + set -x # non-jenkins execution: assume local user name diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 6462977..e8ec34d 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -13,6 +13,7 @@ set -e mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg" mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index bc6eaa0..7565a8d 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -15,6 +15,7 @@ NET_NAME=ttcn3-bsc_sccplite-test mkdir $VOL_BASE_DIR/bsc-tester cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg" mkdir $VOL_BASE_DIR/bsc cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 18236a2..3898491 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -13,6 +13,7 @@ set -e mkdir $VOL_BASE_DIR/bsc-tester cp BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg" mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index 1182df0..a63cdad 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/bscnat-tester cp BSCNAT_Tests.cfg $VOL_BASE_DIR/bscnat-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/bscnat-tester/BSCNAT_Tests.cfg" mkdir $VOL_BASE_DIR/bscnat cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 67c6d07..4ce333e 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -119,12 +119,16 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/bts-tester-generic cp BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ +write_mp_osmo_repo "$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" 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" 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" cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \ $VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 347623f..63bf3f9 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/cbc-tester cp CBC_Tests.cfg $VOL_BASE_DIR/cbc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/cbc-tester/CBC_Tests.cfg" mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index c878000..6dbc6f1 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -16,6 +16,7 @@ mkdir $VOL_BASE_DIR/fr-tester chmod a+w $VOL_BASE_DIR/fr-tester cp FR_Tests.cfg $VOL_BASE_DIR/fr-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/fr-tester/FR_Tests.cfg" mkdir $VOL_BASE_DIR/frnet cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index d1ecb0a..f4827a8 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -29,6 +29,7 @@ mkdir $VOL_BASE_DIR/gbproxy-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/gbproxy-tester cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/gbproxy-tester/GBProxy_Tests.cfg" mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 3595c16..f8fae0f 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -17,6 +17,7 @@ mkdir $VOL_BASE_DIR/gbproxy-tester chmod a+w $VOL_BASE_DIR/gbproxy-tester cp GBProxy_Tests.cfg $VOL_BASE_DIR/gbproxy-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/gbproxy-tester/GBProxy_Tests.cfg" mkdir $VOL_BASE_DIR/gbproxy cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index ba5e76d..cdf9bf8 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -19,6 +19,7 @@ set -e mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index e003e03..6702e40 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -14,6 +14,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index 6ffa98a..8bcfbf4 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/hnodeb-tester cp HNB_Tests.cfg $VOL_BASE_DIR/hnodeb-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/hnodeb-tester/HNB_Tests.cfg" mkdir $VOL_BASE_DIR/hnodeb cp osmo-hnodeb.cfg $VOL_BASE_DIR/hnodeb/ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index f9d0133..c0cf2f5 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/mgw-tester cp MGCP_Test.cfg $VOL_BASE_DIR/mgw-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/mgw-tester/MGCP_Test.cfg" mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index dd91e24..937b91f 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -16,6 +16,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg" mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-ns-test/jenkins-fr.sh b/ttcn3-ns-test/jenkins-fr.sh index df23a35..e30f6f9 100755 --- a/ttcn3-ns-test/jenkins-fr.sh +++ b/ttcn3-ns-test/jenkins-fr.sh @@ -27,6 +27,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/ns-tester cp fr/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" mkdir $VOL_BASE_DIR/ns cp fr/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ diff --git a/ttcn3-ns-test/jenkins-sgsn-sns.sh b/ttcn3-ns-test/jenkins-sgsn-sns.sh index 4460380..4f90421 100755 --- a/ttcn3-ns-test/jenkins-sgsn-sns.sh +++ b/ttcn3-ns-test/jenkins-sgsn-sns.sh @@ -14,6 +14,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/ns-tester cp sgsn-sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" mkdir $VOL_BASE_DIR/ns cp sgsn-sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ diff --git a/ttcn3-ns-test/jenkins-sns.sh b/ttcn3-ns-test/jenkins-sns.sh index 7fb899e..c2fd651 100755 --- a/ttcn3-ns-test/jenkins-sns.sh +++ b/ttcn3-ns-test/jenkins-sns.sh @@ -14,6 +14,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/ns-tester cp sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" mkdir $VOL_BASE_DIR/ns cp sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ diff --git a/ttcn3-ns-test/jenkins.sh b/ttcn3-ns-test/jenkins.sh index aeb1ba9..af0552c 100755 --- a/ttcn3-ns-test/jenkins.sh +++ b/ttcn3-ns-test/jenkins.sh @@ -14,6 +14,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/ns-tester cp NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" mkdir $VOL_BASE_DIR/ns cp osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ diff --git a/ttcn3-pcap-client-test/jenkins.sh b/ttcn3-pcap-client-test/jenkins.sh index 60d44e6..253b6c2 100755 --- a/ttcn3-pcap-client-test/jenkins.sh +++ b/ttcn3-pcap-client-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/pcap-client-tester cp OPCAP_CLIENT_Tests.cfg $VOL_BASE_DIR/pcap-client-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/pcap-client-tester/OPCAP_CLIENT_Tests.cfg" mkdir $VOL_BASE_DIR/pcap-client cp osmo-pcap-client.cfg $VOL_BASE_DIR/pcap-client/ diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index aaed27a..4bd2480 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -15,6 +15,7 @@ network_create $SUBNET 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" 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 11c77ad..dd5b924 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -15,6 +15,7 @@ network_create $SUBNET 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" mkdir $VOL_BASE_DIR/pcu mkdir $VOL_BASE_DIR/pcu/unix diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index ae013d6..2a6a9d8 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -75,6 +75,7 @@ mkdir $VOL_BASE_DIR/client # 1) server test suite start_server cp REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" start_testsuite docker container kill ${BUILD_TAG}-server @@ -82,6 +83,7 @@ docker container kill ${BUILD_TAG}-server echo "Changing to bankd configuration" start_bankd cp bankd/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" start_testsuite docker container kill ${BUILD_TAG}-bankd @@ -89,4 +91,5 @@ docker container kill ${BUILD_TAG}-bankd echo "Changing to client configuration" start_client cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" start_testsuite diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 40ff1f1..687e746 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -12,6 +12,7 @@ set -e mkdir $VOL_BASE_DIR/sccp-tester cp SCCP_Tests.cfg $VOL_BASE_DIR/sccp-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/scpp-tester/SCCP_Tests.cfg" mkdir $VOL_BASE_DIR/sccp cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index df500af..24869c5 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -15,6 +15,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/sgsn-tester cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg" mkdir $VOL_BASE_DIR/sgsn cp osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index ffec3d2..334f791 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -15,6 +15,7 @@ network_create $SUBNET mkdir $VOL_BASE_DIR/sip-tester mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index f16536f..8aeed92 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -12,6 +12,7 @@ set -e mkdir $VOL_BASE_DIR/smlc-tester cp SMLC_Tests.cfg $VOL_BASE_DIR/smlc-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/smlc-tester/SMLC_Tests.cfg" mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index db2ffdd..23434f3 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -11,6 +11,7 @@ set -e mkdir $VOL_BASE_DIR/stp-tester cp STP_Tests.cfg $VOL_BASE_DIR/stp-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg" mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -- cgit v1.2.3