osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40448?usp=email )
Change subject: testenv: add titan_min to all configs ......................................................................
testenv: add titan_min to all configs
Add the minimum required eclipse-titan version to each testenv.cfg. This is in preparation for a future patch that will allow using a different eclipse-titan version, depending on titan_min in the config and a new --titan-version argument.
Supporting this is desired because: * We can't simply upgrade from 9.0.0 to 11.1.0 as there are regressions with some of the testsuites, but we need 11.1.0 for at least one new testsuite. * By quickly switching between the versions we can check for regressions easily.
Related: OS#6490 Change-Id: Ibd81812227f947cf1f437bdc4b087779194bc5dc --- M 5gc/testenv.cfg M _testenv/README.md M _testenv/testenv/testenv_cfg.py M bsc/testenv_generic.cfg M bsc/testenv_sccplite.cfg M bsc/testenv_vamos.cfg M bts/testenv_generic.cfg M bts/testenv_hopping.cfg M bts/testenv_oml.cfg M cbc/testenv.cfg M dia2gsup/testenv.cfg M epdg/testenv.cfg M gbproxy/testenv.cfg M ggsn_tests/testenv_open5gs.cfg M ggsn_tests/testenv_osmo_ggsn_all.cfg M ggsn_tests/testenv_osmo_ggsn_v4_only.cfg M ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg M ggsn_tests/testenv_osmo_ggsn_v6_only.cfg M hlr/testenv.cfg M hnbgw/testenv_generic.cfg M hnbgw/testenv_with-pfcp.cfg M hnodeb/testenv.cfg M hss/testenv.cfg M mgw/testenv.cfg M mme/testenv.cfg M msc/testenv.cfg M ns/testenv_sgsn_sns.cfg M ns/testenv_sns.cfg M ns/testenv_udp.cfg M pcap-client/testenv.cfg M pcrf/testenv.cfg M pcu/testenv_generic.cfg M pcu/testenv_sns.cfg M remsim/testenv_bankd.cfg M remsim/testenv_client.cfg M remsim/testenv_server.cfg M s1gw/testenv.cfg M sccp/testenv.cfg M sgsn/testenv_generic.cfg M sgsn/testenv_sns.cfg M sip/testenv.cfg M smlc/testenv.cfg M stp/testenv_ipa-m3ua.cfg M stp/testenv_ipa.cfg M stp/testenv_m3ua-tcp.cfg M stp/testenv_m3ua.cfg M upf/testenv.cfg 47 files changed, 53 insertions(+), 0 deletions(-)
Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve
diff --git a/5gc/testenv.cfg b/5gc/testenv.cfg index 89c4727..6a0e510 100644 --- a/5gc/testenv.cfg +++ b/5gc/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=C5G_Tests config=C5G_Tests.cfg
diff --git a/_testenv/README.md b/_testenv/README.md index e8eb2a2..a712dc8 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -49,6 +49,7 @@
```ini [testsuite] +titan_min=9.0.0 program=MGCP_Test config=MGCP_Test.cfg
@@ -64,6 +65,9 @@
#### Testsuite section
+* `titan_min=`: the minimum required eclipse-titan version for building and + running this testsuite. + * `program=`: the executable for starting the testsuite, without arguments.
* `config=`: the testsuite configuration file. diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index e517a02..e224815 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -121,6 +121,7 @@ "copy", "prepare", "program", + "titan_min", ] keys_valid_component = [ "clean", @@ -150,6 +151,9 @@ if "program" not in cfg["testsuite"]: logging.error(f"{path}: missing program= in [testsuite]") exit_error_readme() + if "titan_min" not in cfg["testsuite"]: + logging.error(f"{path}: missing program= in [testsuite]") + exit_error_readme() if " " in cfg["testsuite"]["program"]: logging.error(f"{path}: program= in [testsuite] must not have arguments") exit_error_readme() diff --git a/bsc/testenv_generic.cfg b/bsc/testenv_generic.cfg index b4ed393..9f68727 100644 --- a/bsc/testenv_generic.cfg +++ b/bsc/testenv_generic.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 prepare=podman_set_lo_mtu.sh 1500 # OS#6602 program=BSC_Tests config=BSC_Tests.cfg diff --git a/bsc/testenv_sccplite.cfg b/bsc/testenv_sccplite.cfg index 5d64467..cccb8bc 100644 --- a/bsc/testenv_sccplite.cfg +++ b/bsc/testenv_sccplite.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=BSC_Tests config=BSC_Tests_SCCPlite.cfg
diff --git a/bsc/testenv_vamos.cfg b/bsc/testenv_vamos.cfg index 51f309f..cbe4c5c 100644 --- a/bsc/testenv_vamos.cfg +++ b/bsc/testenv_vamos.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=BSC_Tests config=BSC_Tests_VAMOS.cfg
diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index 34a39dc..80e065d 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=BTS_Tests config=BTS_Tests.cfg
diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index a97c050..fd4fab1 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=BTS_Tests config=BTS_Tests_FH.cfg copy=BTS_Tests.cfg diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg index d6354fd..04fee2d 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=BTS_Tests config=BTS_Tests_OML.cfg
diff --git a/cbc/testenv.cfg b/cbc/testenv.cfg index b16babe..b2302c7 100644 --- a/cbc/testenv.cfg +++ b/cbc/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=CBC_Tests config=CBC_Tests.cfg
diff --git a/dia2gsup/testenv.cfg b/dia2gsup/testenv.cfg index 217a505..f04b313 100644 --- a/dia2gsup/testenv.cfg +++ b/dia2gsup/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=DIA2GSUP_Tests config=DIA2GSUP_Tests.cfg
diff --git a/epdg/testenv.cfg b/epdg/testenv.cfg index e8980bd..4c14d48 100644 --- a/epdg/testenv.cfg +++ b/epdg/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=EPDG_Tests config=EPDG_Tests.cfg
diff --git a/gbproxy/testenv.cfg b/gbproxy/testenv.cfg index 416264f..57645fa 100644 --- a/gbproxy/testenv.cfg +++ b/gbproxy/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GBProxy_Tests config=GBProxy_Tests.cfg
diff --git a/ggsn_tests/testenv_open5gs.cfg b/ggsn_tests/testenv_open5gs.cfg index 6d951f2..e847085 100644 --- a/ggsn_tests/testenv_open5gs.cfg +++ b/ggsn_tests/testenv_open5gs.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GGSN_Tests config=GGSN_Tests.cfg
diff --git a/ggsn_tests/testenv_osmo_ggsn_all.cfg b/ggsn_tests/testenv_osmo_ggsn_all.cfg index c389064..a6ef42b 100644 --- a/ggsn_tests/testenv_osmo_ggsn_all.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_all.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GGSN_Tests config=GGSN_Tests.cfg
diff --git a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg index 604864d..91159c2 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GGSN_Tests config=GGSN_Tests.cfg
diff --git a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg index b037c0c..d28bdee 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GGSN_Tests config=GGSN_Tests.cfg
diff --git a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg index fdaa395..819add2 100644 --- a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg +++ b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=GGSN_Tests config=GGSN_Tests.cfg
diff --git a/hlr/testenv.cfg b/hlr/testenv.cfg index 11d0309..7dbb492 100644 --- a/hlr/testenv.cfg +++ b/hlr/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=HLR_Tests config=HLR_Tests.cfg
diff --git a/hnbgw/testenv_generic.cfg b/hnbgw/testenv_generic.cfg index d1daeab..1649a69 100644 --- a/hnbgw/testenv_generic.cfg +++ b/hnbgw/testenv_generic.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=HNBGW_Tests config=HNBGW_Tests.cfg
diff --git a/hnbgw/testenv_with-pfcp.cfg b/hnbgw/testenv_with-pfcp.cfg index 4f19a31..3113baf 100644 --- a/hnbgw/testenv_with-pfcp.cfg +++ b/hnbgw/testenv_with-pfcp.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=HNBGW_Tests config=HNBGW_Tests-with-pfcp.cfg clean=rename_junit_xml_classname.sh :with-pfcp diff --git a/hnodeb/testenv.cfg b/hnodeb/testenv.cfg index b2f29df..72b23a6 100644 --- a/hnodeb/testenv.cfg +++ b/hnodeb/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=HNB_Tests config=HNB_Tests.cfg
diff --git a/hss/testenv.cfg b/hss/testenv.cfg index 79ccede..8e8ec7e 100644 --- a/hss/testenv.cfg +++ b/hss/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=HSS_Tests config=HSS_Tests.cfg
diff --git a/mgw/testenv.cfg b/mgw/testenv.cfg index 7891477..d59f4b7 100644 --- a/mgw/testenv.cfg +++ b/mgw/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=MGCP_Test config=MGCP_Test.cfg
diff --git a/mme/testenv.cfg b/mme/testenv.cfg index 3470fe5..f232240 100644 --- a/mme/testenv.cfg +++ b/mme/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=MME_Tests config=MME_Tests.cfg
diff --git a/msc/testenv.cfg b/msc/testenv.cfg index 70df365..717737c 100644 --- a/msc/testenv.cfg +++ b/msc/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=MSC_Tests config=MSC_Tests.cfg
diff --git a/ns/testenv_sgsn_sns.cfg b/ns/testenv_sgsn_sns.cfg index 8037d78..5cf75c7 100644 --- a/ns/testenv_sgsn_sns.cfg +++ b/ns/testenv_sgsn_sns.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=NS_Tests config=NS_Tests.sgsn.sns.cfg
diff --git a/ns/testenv_sns.cfg b/ns/testenv_sns.cfg index c19dfba..dbe9014 100644 --- a/ns/testenv_sns.cfg +++ b/ns/testenv_sns.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=NS_Tests config=NS_Tests.sns.cfg
diff --git a/ns/testenv_udp.cfg b/ns/testenv_udp.cfg index 7d6e82b..8f7e60e 100644 --- a/ns/testenv_udp.cfg +++ b/ns/testenv_udp.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=NS_Tests config=NS_Tests.udp.cfg
diff --git a/pcap-client/testenv.cfg b/pcap-client/testenv.cfg index 3a915f3..3a1f45d 100644 --- a/pcap-client/testenv.cfg +++ b/pcap-client/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=OPCAP_CLIENT_Tests config=OPCAP_CLIENT_Tests.cfg
diff --git a/pcrf/testenv.cfg b/pcrf/testenv.cfg index 221e4a9..9a6d4bd 100644 --- a/pcrf/testenv.cfg +++ b/pcrf/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=PCRF_Tests config=PCRF_Tests.cfg
diff --git a/pcu/testenv_generic.cfg b/pcu/testenv_generic.cfg index 7d506cf..764da04 100644 --- a/pcu/testenv_generic.cfg +++ b/pcu/testenv_generic.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=PCU_Tests config=PCU_Tests.cfg
diff --git a/pcu/testenv_sns.cfg b/pcu/testenv_sns.cfg index 0bf4e13..3cc514c 100644 --- a/pcu/testenv_sns.cfg +++ b/pcu/testenv_sns.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=PCU_Tests config=PCU_Tests_SNS.cfg
diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg index 484203c..ead984d 100644 --- a/remsim/testenv_bankd.cfg +++ b/remsim/testenv_bankd.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=REMSIM_Tests config=bankd/REMSIM_Tests.cfg
diff --git a/remsim/testenv_client.cfg b/remsim/testenv_client.cfg index 95df982..2ef8303 100644 --- a/remsim/testenv_client.cfg +++ b/remsim/testenv_client.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=REMSIM_Tests config=client/REMSIM_Tests.cfg
diff --git a/remsim/testenv_server.cfg b/remsim/testenv_server.cfg index f28296a..c9a0ab7 100644 --- a/remsim/testenv_server.cfg +++ b/remsim/testenv_server.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=REMSIM_Tests config=server/REMSIM_Tests.cfg
diff --git a/s1gw/testenv.cfg b/s1gw/testenv.cfg index ff74821..f8549a5 100644 --- a/s1gw/testenv.cfg +++ b/s1gw/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=S1GW_Tests config=S1GW_Tests.cfg
diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index de7b630..e727d66 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=SCCP_Tests config=SCCP_Tests.cfg
diff --git a/sgsn/testenv_generic.cfg b/sgsn/testenv_generic.cfg index d58b49d..ff32d0b 100644 --- a/sgsn/testenv_generic.cfg +++ b/sgsn/testenv_generic.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=SGSN_Tests config=SGSN_Tests.cfg
diff --git a/sgsn/testenv_sns.cfg b/sgsn/testenv_sns.cfg index 4972e4d..6d8e511 100644 --- a/sgsn/testenv_sns.cfg +++ b/sgsn/testenv_sns.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=SGSN_Tests config=SGSN_Tests_SNS.cfg
diff --git a/sip/testenv.cfg b/sip/testenv.cfg index 59d628e..78a0b64 100644 --- a/sip/testenv.cfg +++ b/sip/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=SIP_Tests config=SIP_Tests.cfg
diff --git a/smlc/testenv.cfg b/smlc/testenv.cfg index 2fbdbf3..a6954d4 100644 --- a/smlc/testenv.cfg +++ b/smlc/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=SMLC_Tests config=SMLC_Tests.cfg
diff --git a/stp/testenv_ipa-m3ua.cfg b/stp/testenv_ipa-m3ua.cfg index 144e6a9..e0dc4b2 100644 --- a/stp/testenv_ipa-m3ua.cfg +++ b/stp/testenv_ipa-m3ua.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=STP_Tests config=STP_Tests_IPA_M3UA.cfg
diff --git a/stp/testenv_ipa.cfg b/stp/testenv_ipa.cfg index 91320e1..fbc65d5 100644 --- a/stp/testenv_ipa.cfg +++ b/stp/testenv_ipa.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=STP_Tests config=STP_Tests_IPA.cfg
diff --git a/stp/testenv_m3ua-tcp.cfg b/stp/testenv_m3ua-tcp.cfg index 37b2338..8cb2a9e 100644 --- a/stp/testenv_m3ua-tcp.cfg +++ b/stp/testenv_m3ua-tcp.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=STP_Tests config=STP_Tests_M3UA_TCP.cfg
diff --git a/stp/testenv_m3ua.cfg b/stp/testenv_m3ua.cfg index d645d4d..eccfd32 100644 --- a/stp/testenv_m3ua.cfg +++ b/stp/testenv_m3ua.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=STP_Tests config=STP_Tests_M3UA.cfg
diff --git a/upf/testenv.cfg b/upf/testenv.cfg index 7152e71..aa2f87c 100644 --- a/upf/testenv.cfg +++ b/upf/testenv.cfg @@ -1,4 +1,5 @@ [testsuite] +titan_min=9.0.0 program=UPF_Tests config=UPF_Tests.cfg
-
osmith