June 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: testenv: move titan_min to testsrcdir.cfg
by jolly 03 Jun '26

03 Jun '26

Attention is currently required from: osmith. jolly has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email ) Change subject: testenv: move titan_min to testsrcdir.cfg ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife12e3b3294ce16ebedee1b7998d3b89856f0328 Gerrit-Change-Number: 42815 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jun 2026 13:13:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: introduce testsrcdir.cfg
by osmith 03 Jun '26

03 Jun '26

Attention is currently required from: fixeria, jolly. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email ) Change subject: testenv: introduce testsrcdir.cfg ...................................................................... Patch Set 2: Code-Review+2 (2 comments) Patchset: PS2: re-apply +2 after updating the commit message Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814/comment/747dc03a_7056… : PS1, Line 20: be optionally in the source directory > be optionally ... present ... […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 Gerrit-Change-Number: 42814 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jun 2026 12:19:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: introduce testsrcdir.cfg
by osmith 03 Jun '26

03 Jun '26

Attention is currently required from: fixeria, jolly, osmith. Hello Jenkins Builder, fixeria, jolly, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by jolly Change subject: testenv: introduce testsrcdir.cfg ...................................................................... testenv: introduce testsrcdir.cfg Source directories can have more than one testenv.cfg file. Some options have been added to testenv.cfg that are not really specific to a single testsuite or how it gets executed, but to the whole source directory. This is not ideal, because we need to have additional code that ensures these options have the same value across all testenv.cfg files in the same source directory, and we need functions that just pick the value from the first of these configs. When we change such a value, we also need to potentially make the change in multiple files. Resolve this by introducing a new config file testsrcdir.cfg, that can be optionally present in the source directory, and has options that count for all testsuites in the same source directory. Move max_jobs_per_gb_ram= as first option to the new file. The following patches will move all other source directory specific options to testsrcdir.cfg. I have also considered naming the new file testdir.cfg, but the name "testdir" is already used in the source code for the place where we execute the individual testsuites after copying configs into that directory. Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 --- M 5gc/testenv.cfg A 5gc/testsrcdir.cfg M _testenv/README.md M _testenv/testenv.py M _testenv/testenv/testenv_cfg.py A _testenv/testenv/testsrcdir_cfg.py M _testenv/testenv/testsuite.py 7 files changed, 105 insertions(+), 70 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/42814/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 Gerrit-Change-Number: 42814 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: move titan_min to testsrcdir.cfg
by fixeria 03 Jun '26

03 Jun '26

Attention is currently required from: jolly, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email ) Change subject: testenv: move titan_min to testsrcdir.cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife12e3b3294ce16ebedee1b7998d3b89856f0328 Gerrit-Change-Number: 42815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 03 Jun 2026 12:08:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: introduce testsrcdir.cfg
by fixeria 03 Jun '26

03 Jun '26

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email ) Change subject: testenv: introduce testsrcdir.cfg ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814/comment/1bde902c_faa6… : PS1, Line 20: be optionally in the source directory be optionally ... present ... in the source directory? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 Gerrit-Change-Number: 42814 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jun 2026 11:40:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: introduce testsrcdir.cfg
by jolly 03 Jun '26

03 Jun '26

Attention is currently required from: fixeria, osmith. jolly has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email ) Change subject: testenv: introduce testsrcdir.cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 Gerrit-Change-Number: 42814 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Jun 2026 11:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: move podman_extra to testsrcdir.cfg
by osmith 03 Jun '26

03 Jun '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42816?usp=email ) Change subject: testenv: move podman_extra to testsrcdir.cfg ...................................................................... testenv: move podman_extra to testsrcdir.cfg Move podman_extra to testsrcdir.cfg, as it also needs to be set for the whole source directory at once. We actually didn't have a function that ensures it is the same in all testenv.cfg files, which could lead to subtle bugs such as setting it in only one of two testenv_*.cfg files in a source directory and then having testenv pick the file where it is not set and therefore not using the option when starting the podman container that is used for all testsuites. This problem is resolved with this patch. Change-Id: I12e187726673e1ca1b1ecfff6b34b1803127be86 --- M _testenv/README.md M _testenv/testenv/podman.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsrcdir_cfg.py 4 files changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/42816/1 diff --git a/_testenv/README.md b/_testenv/README.md index 710c021..09acb05 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -84,11 +84,6 @@ depending on when the script runs. The script will not run on crash if podman is used, as the container gets shutdown beforehand. -* `podman_extra=`: optional value that can be set to add extra parameters to - podman. For example, it can be used to mount an additional volume to pass- - through USB devices. Use spaces to separate parameters, use quotes to include - spaces into parameters. - #### Component section * `program=`: executable for starting a test component, may contain arguments. @@ -187,6 +182,11 @@ running any of the testsuites in this directory. See the eclipse-titan versions section below for details. +* `podman_extra=`: optional value that can be set to add extra parameters to + podman. For example, it can be used to mount an additional volume to pass- + through USB devices. Use spaces to separate parameters, use quotes to include + spaces into parameters. + ## Environment variables ### Environment variables read by testenv diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 072b20e..fdba2b3 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -267,7 +267,7 @@ dest = os.readlink(testenv.custom_kernel_path) cmd += ["--volume", f"{dest}:{dest}:ro"] - podman_extra = testenv.testenv_cfg.get_podman_extra_first_cfg() + podman_extra = testenv.testsrcdir_cfg.cfg["podman_extra"] if podman_extra: cmd += shlex.split(podman_extra) diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 3146ae1..e64a7c9 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -74,11 +74,6 @@ return host, port -def get_podman_extra_first_cfg(): - _, cfg = next(iter(cfgs.items())) - return cfg["testsuite"].get("podman_extra", None) - - def verify_qemu_cfgs(): """Check if passed -C or -K args make sense with the testenv configs.""" testsuite = testenv.args.testsuite @@ -125,7 +120,6 @@ "copy", "prepare", "program", - "podman_extra", ] keys_valid_component = [ "clean", @@ -150,6 +144,7 @@ ] keys_moved_to_testsrcdir_cfg = [ "max_jobs_per_gb_ram", + "podman_extra", "titan_min", ] diff --git a/_testenv/testenv/testsrcdir_cfg.py b/_testenv/testenv/testsrcdir_cfg.py index d72317f..2b344fe 100644 --- a/_testenv/testenv/testsrcdir_cfg.py +++ b/_testenv/testenv/testsrcdir_cfg.py @@ -11,6 +11,7 @@ cfg = { "max_jobs_per_gb_ram": None, + "podman_extra": None, "titan_min": "11.1.0", } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I12e187726673e1ca1b1ecfff6b34b1803127be86 Gerrit-Change-Number: 42816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: move titan_min to testsrcdir.cfg
by osmith 03 Jun '26

03 Jun '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email ) Change subject: testenv: move titan_min to testsrcdir.cfg ...................................................................... testenv: move titan_min to testsrcdir.cfg Adjust the code so it gets titan_min= from testsrcdir.cfg, instead of having it in testenv.cfg and enforcing that the value is the same across all files in the same source directory. While at it, set the default to 11.1.0 (the value that is currently in all testenv.cfg files), so we don't need to repeat it in all source directories. Change-Id: Ife12e3b3294ce16ebedee1b7998d3b89856f0328 --- M 5gc/testenv.cfg M _testenv/README.md M _testenv/testenv/podman.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsrcdir_cfg.py M _testenv/testenv/testsuite.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_all.cfg M ggsn_tests/testenv_osmo_v4_only.cfg M ggsn_tests/testenv_osmo_v4v6_only.cfg M ggsn_tests/testenv_osmo_v6_only.cfg M hlr/testenv_osmo.cfg M hlr/testenv_pyhss.cfg M hnbgw/testenv_generic.cfg M hnbgw/testenv_with-pfcp.cfg M hnodeb/testenv.cfg M hss/testenv_open5gs.cfg M hss/testenv_pyhss.cfg M mgw/testenv.cfg M mme/testenv_emergency.cfg M mme/testenv_generic.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 pgw/testenv.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 stp/testenv_tcap.cfg M upf/testenv.cfg 55 files changed, 72 insertions(+), 139 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/42815/1 diff --git a/5gc/testenv.cfg b/5gc/testenv.cfg index d70c135..2008d9a 100644 --- a/5gc/testenv.cfg +++ b/5gc/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=C5G_Tests config=C5G_Tests.cfg copy=testsuite_prepare.sh diff --git a/_testenv/README.md b/_testenv/README.md index 9c5c35a..710c021 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -49,7 +49,6 @@ ```ini [testsuite] -titan_min=9.0.0 program=MGCP_Test config=MGCP_Test.cfg @@ -65,10 +64,6 @@ #### Testsuite section -* `titan_min=`: the minimum required eclipse-titan version for building and - running this testsuite. See the eclipse-titan versions section below for - details. - * `program=`: the executable for starting the testsuite, without arguments. * `config=`: the testsuite configuration file. @@ -177,6 +172,7 @@ ```ini [testsrcdir] max_jobs_per_gb_ram=0.3 +titan_min=9.0.0 ``` ### Keys @@ -187,6 +183,10 @@ whole RAM and freezing (or possibly getting killed from an out-of-memory daemon). +* `titan_min=`: the minimum required eclipse-titan version for building and + running any of the testsuites in this directory. See the eclipse-titan + versions section below for details. + ## Environment variables ### Environment variables read by testenv @@ -307,7 +307,7 @@ system. Switching between the versions is done either by setting a `titan_min` version -in the `[testsuite]` section, or by using `-T` / `--titan-version`. +in `testsrcdir.cfg`, or by using `-T` / `--titan-version`. ## Troubleshooting diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 92dfeb4..072b20e 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -9,8 +9,9 @@ import shlex import subprocess import testenv.cmd -import testenv.testdir import testenv.coredump +import testenv.testdir +import testenv.testsrcdir_cfg import time import sys @@ -296,7 +297,7 @@ def check_titan_version(): - version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + version, _ = testenv.testsrcdir_cfg.get_titan_version() if not testenv.cmd.run(["test", "-d", f"/opt/eclipse-titan-{version}"], check=False).returncode: return diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index ec65ac0..3146ae1 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -1,6 +1,5 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later -from packaging.version import Version import configparser import fnmatch import glob @@ -11,8 +10,6 @@ cfgs = {} current = None -titan_version_in_path = None -titan_min_previous = None def set_current(cfg_name, loop_count=0): @@ -77,76 +74,6 @@ return host, port -def get_titan_version_in_path(): - global titan_version_in_path - - if titan_version_in_path: - return titan_version_in_path - - ret = None - v = testenv.cmd.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) - for line in v.stderr.split("\n"): - if line.startswith("Version: "): - ret = line.split(":", 1)[1].strip() - logging.debug(f"eclipse-titan version: {ret}") - break - titan_version_in_path = ret - return ret - - -def get_titan_version(cfg, path=None): - global titan_min_previous - - ret_version = cfg["testsuite"]["titan_min"] - ret_reason = "from titan_min= in testenv.cfg" - - if titan_min_previous and titan_min_previous["version"] != ret_version: - logging.error("Found different titan_min= versions in testenv.cfg files of the same directory:") - logging.error(f" titan_min={ret_version} in {path}") - logging.error(f" titan_min={titan_min_previous['version']} in {titan_min_previous['path']}") - logging.error("This is not supported, please fix it.") - sys.exit(1) - titan_min_previous = {"version": ret_version, "path": path} - - if testenv.args.titan_version: - if Version(ret_version) > Version(testenv.args.titan_version): - logging.error( - f"--titan-version={testenv.args.titan_version} is lower than titan_min={ret_version} in {path}" - ) - sys.exit(1) - ret_version = testenv.args.titan_version - ret_reason = "from --titan-version" - - if not testenv.args.podman and not os.path.exists(f"/opt/eclipse-titan-{ret_version}"): - path_version = get_titan_version_in_path() - if not path_version: - logging.error("Failed to parse the ttcn3_compiler version.") - logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") - sys.exit(1) - if testenv.args.titan_version and ret_version != path_version: - logging.error( - f"Installed eclipse-titan version {path_version} is not the same as --titan-version={ret_version}." - ) - sys.exit(1) - if Version(ret_version) > Version(path_version): - logging.error( - f"Installed eclipse-titan version {path_version} is lower than titan_min={ret_version} in {path}." - ) - logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") - sys.exit(1) - ret_version = path_version - ret_reason = "installed on host system" - - return ret_version, ret_reason - - -def get_titan_version_first_cfg(): - """The titan version is the same for all testenv.cfg files in the same - testsuite directory, this is enforced in get_titan_version().""" - _, cfg = next(iter(cfgs.items())) - return get_titan_version(cfg) - - def get_podman_extra_first_cfg(): _, cfg = next(iter(cfgs.items())) return cfg["testsuite"].get("podman_extra", None) @@ -198,7 +125,6 @@ "copy", "prepare", "program", - "titan_min", "podman_extra", ] keys_valid_component = [ @@ -224,6 +150,7 @@ ] keys_moved_to_testsrcdir_cfg = [ "max_jobs_per_gb_ram", + "titan_min", ] if "testsuite" not in cfg: @@ -232,9 +159,6 @@ 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 titan_min= in [testsuite]") - exit_error_readme() if " " in cfg["testsuite"]["program"]: logging.error(f"{path}: program= in [testsuite] must not have arguments") exit_error_readme() @@ -278,7 +202,6 @@ sys.exit(1) get_vty_host_port(cfg, path) - get_titan_version(cfg, path) def raise_error_config_arg(glob_result, config_arg): diff --git a/_testenv/testenv/testsrcdir_cfg.py b/_testenv/testenv/testsrcdir_cfg.py index d1d560d..d72317f 100644 --- a/_testenv/testenv/testsrcdir_cfg.py +++ b/_testenv/testenv/testsrcdir_cfg.py @@ -1,5 +1,6 @@ # Copyright 2026 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later +from packaging.version import Version import configparser import logging import math @@ -10,8 +11,11 @@ cfg = { "max_jobs_per_gb_ram": None, + "titan_min": "11.1.0", } +titan_version_in_path = None + def get_titan_make_job_count(): max_jobs_per_gb_ram = cfg["max_jobs_per_gb_ram"] @@ -45,6 +49,59 @@ return testenv.args.jobs +def get_titan_version_in_path(): + global titan_version_in_path + + if titan_version_in_path: + return titan_version_in_path + + ret = None + v = testenv.cmd.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) + for line in v.stderr.split("\n"): + if line.startswith("Version: "): + ret = line.split(":", 1)[1].strip() + logging.debug(f"eclipse-titan version: {ret}") + break + titan_version_in_path = ret + return ret + + +def get_titan_version(): + ret_version = cfg["titan_min"] + ret_reason = "from titan_min= in testsrcdir.cfg" + + if testenv.args.titan_version: + if Version(ret_version) > Version(testenv.args.titan_version): + logging.error( + f"--titan-version={testenv.args.titan_version} is lower than titan_min={ret_version} in testsrcdir.cfg" + ) + sys.exit(1) + ret_version = testenv.args.titan_version + ret_reason = "from --titan-version" + + if not testenv.args.podman and not os.path.exists(f"/opt/eclipse-titan-{ret_version}"): + path_version = get_titan_version_in_path() + if not path_version: + logging.error("Failed to parse the ttcn3_compiler version.") + logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") + sys.exit(1) + if testenv.args.titan_version and ret_version != path_version: + logging.error( + f"Installed eclipse-titan version {path_version} is not the same as --titan-version={ret_version}." + ) + sys.exit(1) + if Version(ret_version) > Version(path_version): + logging.error( + f"Installed eclipse-titan version {path_version} is lower than titan_min={ret_version} in testsrcdir.cfg." + ) + logging.error(f"Install eclipse-titan {ret_version} or higher or use --podman.") + sys.exit(1) + ret_version = path_version + ret_reason = "installed on host system" + + return ret_version, ret_reason + + def init(): global cfg @@ -71,3 +128,5 @@ logging.error("Invalid key {key}= in {cfg_path}") sys.exit(1) cfg[key] = parser["testsrcdir"][key] + + get_titan_version() diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index cdea60e..6a85cd5 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -37,7 +37,7 @@ atexit.register(stop) update_deps() - titan_version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + titan_version, _ = testenv.testsrcdir_cfg.get_titan_version() ttcn3_dir = f"/opt/eclipse-titan-{titan_version}" if testenv.args.podman or os.path.exists(ttcn3_dir): @@ -55,7 +55,7 @@ def build(): - titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + titan_version, titan_reason = testenv.testsrcdir_cfg.get_titan_version() logging.info(f"Building testsuite (eclipse-titan {titan_version}, {titan_reason})") env = copy.copy(builddir_env) @@ -166,7 +166,7 @@ else: cmd += [f"{section_data['program']}.{test_arg}"] - titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + titan_version, titan_reason = testenv.testsrcdir_cfg.get_titan_version() logging.info(f"Running testsuite (eclipse-titan {titan_version}, {titan_reason})") if testenv.podman.is_running(): diff --git a/bsc/testenv_generic.cfg b/bsc/testenv_generic.cfg index af9032c..b4ed393 100644 --- a/bsc/testenv_generic.cfg +++ b/bsc/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.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 610699e..5d64467 100644 --- a/bsc/testenv_sccplite.cfg +++ b/bsc/testenv_sccplite.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=BSC_Tests config=BSC_Tests_SCCPlite.cfg diff --git a/bsc/testenv_vamos.cfg b/bsc/testenv_vamos.cfg index 588f66e..51f309f 100644 --- a/bsc/testenv_vamos.cfg +++ b/bsc/testenv_vamos.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=BSC_Tests config=BSC_Tests_VAMOS.cfg diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index 3b4a7f1..5094177 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=BTS_Tests config=BTS_Tests.cfg diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index 3e1e1c9..99943f1 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.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 1921536..7b7651e 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=BTS_Tests config=BTS_Tests_OML.cfg diff --git a/cbc/testenv.cfg b/cbc/testenv.cfg index b5661bd..b16babe 100644 --- a/cbc/testenv.cfg +++ b/cbc/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=CBC_Tests config=CBC_Tests.cfg diff --git a/dia2gsup/testenv.cfg b/dia2gsup/testenv.cfg index 3de2285..217a505 100644 --- a/dia2gsup/testenv.cfg +++ b/dia2gsup/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=DIA2GSUP_Tests config=DIA2GSUP_Tests.cfg diff --git a/epdg/testenv.cfg b/epdg/testenv.cfg index 779b547..e8980bd 100644 --- a/epdg/testenv.cfg +++ b/epdg/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=EPDG_Tests config=EPDG_Tests.cfg diff --git a/gbproxy/testenv.cfg b/gbproxy/testenv.cfg index 7adb482..416264f 100644 --- a/gbproxy/testenv.cfg +++ b/gbproxy/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GBProxy_Tests config=GBProxy_Tests.cfg diff --git a/ggsn_tests/testenv_open5gs.cfg b/ggsn_tests/testenv_open5gs.cfg index 3f4f81b..6d951f2 100644 --- a/ggsn_tests/testenv_open5gs.cfg +++ b/ggsn_tests/testenv_open5gs.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GGSN_Tests config=GGSN_Tests.cfg diff --git a/ggsn_tests/testenv_osmo_all.cfg b/ggsn_tests/testenv_osmo_all.cfg index 11446ce..c389064 100644 --- a/ggsn_tests/testenv_osmo_all.cfg +++ b/ggsn_tests/testenv_osmo_all.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GGSN_Tests config=GGSN_Tests.cfg diff --git a/ggsn_tests/testenv_osmo_v4_only.cfg b/ggsn_tests/testenv_osmo_v4_only.cfg index 2e1fc93..604864d 100644 --- a/ggsn_tests/testenv_osmo_v4_only.cfg +++ b/ggsn_tests/testenv_osmo_v4_only.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GGSN_Tests config=GGSN_Tests.cfg diff --git a/ggsn_tests/testenv_osmo_v4v6_only.cfg b/ggsn_tests/testenv_osmo_v4v6_only.cfg index 4da0153..b037c0c 100644 --- a/ggsn_tests/testenv_osmo_v4v6_only.cfg +++ b/ggsn_tests/testenv_osmo_v4v6_only.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GGSN_Tests config=GGSN_Tests.cfg diff --git a/ggsn_tests/testenv_osmo_v6_only.cfg b/ggsn_tests/testenv_osmo_v6_only.cfg index 7179ad7..fdaa395 100644 --- a/ggsn_tests/testenv_osmo_v6_only.cfg +++ b/ggsn_tests/testenv_osmo_v6_only.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=GGSN_Tests config=GGSN_Tests.cfg diff --git a/hlr/testenv_osmo.cfg b/hlr/testenv_osmo.cfg index b403b85..11d0309 100644 --- a/hlr/testenv_osmo.cfg +++ b/hlr/testenv_osmo.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HLR_Tests config=HLR_Tests.cfg diff --git a/hlr/testenv_pyhss.cfg b/hlr/testenv_pyhss.cfg index 2e81987..e7b32a3 100644 --- a/hlr/testenv_pyhss.cfg +++ b/hlr/testenv_pyhss.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HLR_Tests config=HLR_Tests.cfg copy=pyhss/HLR_Tests.cfg diff --git a/hnbgw/testenv_generic.cfg b/hnbgw/testenv_generic.cfg index b0e4355..d1daeab 100644 --- a/hnbgw/testenv_generic.cfg +++ b/hnbgw/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HNBGW_Tests config=HNBGW_Tests.cfg diff --git a/hnbgw/testenv_with-pfcp.cfg b/hnbgw/testenv_with-pfcp.cfg index 03785d2..4f19a31 100644 --- a/hnbgw/testenv_with-pfcp.cfg +++ b/hnbgw/testenv_with-pfcp.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.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 339a98d..b2f29df 100644 --- a/hnodeb/testenv.cfg +++ b/hnodeb/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HNB_Tests config=HNB_Tests.cfg diff --git a/hss/testenv_open5gs.cfg b/hss/testenv_open5gs.cfg index 84bf9a2..79ccede 100644 --- a/hss/testenv_open5gs.cfg +++ b/hss/testenv_open5gs.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HSS_Tests config=HSS_Tests.cfg diff --git a/hss/testenv_pyhss.cfg b/hss/testenv_pyhss.cfg index d0ef90c..e186c8f 100644 --- a/hss/testenv_pyhss.cfg +++ b/hss/testenv_pyhss.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=HSS_Tests config=HSS_Tests.cfg copy=pyhss/HSS_Tests.cfg diff --git a/mgw/testenv.cfg b/mgw/testenv.cfg index 29444c8..7891477 100644 --- a/mgw/testenv.cfg +++ b/mgw/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=MGCP_Test config=MGCP_Test.cfg diff --git a/mme/testenv_emergency.cfg b/mme/testenv_emergency.cfg index 4c1ff91..85b9edd 100644 --- a/mme/testenv_emergency.cfg +++ b/mme/testenv_emergency.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=MME_Tests config=MME_Tests_emergency.cfg diff --git a/mme/testenv_generic.cfg b/mme/testenv_generic.cfg index f148c4f..3470fe5 100644 --- a/mme/testenv_generic.cfg +++ b/mme/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=MME_Tests config=MME_Tests.cfg diff --git a/msc/testenv.cfg b/msc/testenv.cfg index bd306c6..70df365 100644 --- a/msc/testenv.cfg +++ b/msc/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=MSC_Tests config=MSC_Tests.cfg diff --git a/ns/testenv_sgsn_sns.cfg b/ns/testenv_sgsn_sns.cfg index fa83d12..8037d78 100644 --- a/ns/testenv_sgsn_sns.cfg +++ b/ns/testenv_sgsn_sns.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=NS_Tests config=NS_Tests.sgsn.sns.cfg diff --git a/ns/testenv_sns.cfg b/ns/testenv_sns.cfg index b724d0b..c19dfba 100644 --- a/ns/testenv_sns.cfg +++ b/ns/testenv_sns.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=NS_Tests config=NS_Tests.sns.cfg diff --git a/ns/testenv_udp.cfg b/ns/testenv_udp.cfg index 8b09e3f..7d6e82b 100644 --- a/ns/testenv_udp.cfg +++ b/ns/testenv_udp.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=NS_Tests config=NS_Tests.udp.cfg diff --git a/pcap-client/testenv.cfg b/pcap-client/testenv.cfg index e511457..3a915f3 100644 --- a/pcap-client/testenv.cfg +++ b/pcap-client/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=OPCAP_CLIENT_Tests config=OPCAP_CLIENT_Tests.cfg diff --git a/pcrf/testenv.cfg b/pcrf/testenv.cfg index 6fe36e4..221e4a9 100644 --- a/pcrf/testenv.cfg +++ b/pcrf/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=PCRF_Tests config=PCRF_Tests.cfg diff --git a/pcu/testenv_generic.cfg b/pcu/testenv_generic.cfg index 7e37482..7d506cf 100644 --- a/pcu/testenv_generic.cfg +++ b/pcu/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=PCU_Tests config=PCU_Tests.cfg diff --git a/pcu/testenv_sns.cfg b/pcu/testenv_sns.cfg index 07852e5..0bf4e13 100644 --- a/pcu/testenv_sns.cfg +++ b/pcu/testenv_sns.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=PCU_Tests config=PCU_Tests_SNS.cfg diff --git a/pgw/testenv.cfg b/pgw/testenv.cfg index 7455f15..c078c42 100644 --- a/pgw/testenv.cfg +++ b/pgw/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=PGW_Tests config=PGW_Tests.cfg clean=testenv.sh diff --git a/remsim/testenv_bankd.cfg b/remsim/testenv_bankd.cfg index 1cda9b0..b023251 100644 --- a/remsim/testenv_bankd.cfg +++ b/remsim/testenv_bankd.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=REMSIM_Tests config=bankd/REMSIM_Tests.cfg diff --git a/remsim/testenv_client.cfg b/remsim/testenv_client.cfg index f514663..95df982 100644 --- a/remsim/testenv_client.cfg +++ b/remsim/testenv_client.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=REMSIM_Tests config=client/REMSIM_Tests.cfg diff --git a/remsim/testenv_server.cfg b/remsim/testenv_server.cfg index 729fd85..f28296a 100644 --- a/remsim/testenv_server.cfg +++ b/remsim/testenv_server.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=REMSIM_Tests config=server/REMSIM_Tests.cfg diff --git a/s1gw/testenv.cfg b/s1gw/testenv.cfg index 7456ec2..5ddc9de 100644 --- a/s1gw/testenv.cfg +++ b/s1gw/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=S1GW_Tests config=S1GW_Tests.cfg diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index dc14d9b..de7b630 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=SCCP_Tests config=SCCP_Tests.cfg diff --git a/sgsn/testenv_generic.cfg b/sgsn/testenv_generic.cfg index a9ea0f6..d58b49d 100644 --- a/sgsn/testenv_generic.cfg +++ b/sgsn/testenv_generic.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=SGSN_Tests config=SGSN_Tests.cfg diff --git a/sgsn/testenv_sns.cfg b/sgsn/testenv_sns.cfg index e084bbc..4972e4d 100644 --- a/sgsn/testenv_sns.cfg +++ b/sgsn/testenv_sns.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=SGSN_Tests config=SGSN_Tests_SNS.cfg diff --git a/sip/testenv.cfg b/sip/testenv.cfg index b3c3bdb..59d628e 100644 --- a/sip/testenv.cfg +++ b/sip/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=SIP_Tests config=SIP_Tests.cfg diff --git a/smlc/testenv.cfg b/smlc/testenv.cfg index 1268300..2fbdbf3 100644 --- a/smlc/testenv.cfg +++ b/smlc/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=SMLC_Tests config=SMLC_Tests.cfg diff --git a/stp/testenv_ipa-m3ua.cfg b/stp/testenv_ipa-m3ua.cfg index 53a43e0..144e6a9 100644 --- a/stp/testenv_ipa-m3ua.cfg +++ b/stp/testenv_ipa-m3ua.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=STP_Tests config=STP_Tests_IPA_M3UA.cfg diff --git a/stp/testenv_ipa.cfg b/stp/testenv_ipa.cfg index d993643..91320e1 100644 --- a/stp/testenv_ipa.cfg +++ b/stp/testenv_ipa.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=STP_Tests config=STP_Tests_IPA.cfg diff --git a/stp/testenv_m3ua-tcp.cfg b/stp/testenv_m3ua-tcp.cfg index 2259af9..37b2338 100644 --- a/stp/testenv_m3ua-tcp.cfg +++ b/stp/testenv_m3ua-tcp.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=STP_Tests config=STP_Tests_M3UA_TCP.cfg diff --git a/stp/testenv_m3ua.cfg b/stp/testenv_m3ua.cfg index bcd2e3d..d645d4d 100644 --- a/stp/testenv_m3ua.cfg +++ b/stp/testenv_m3ua.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=STP_Tests config=STP_Tests_M3UA.cfg diff --git a/stp/testenv_tcap.cfg b/stp/testenv_tcap.cfg index d9816e2..5848a70 100644 --- a/stp/testenv_tcap.cfg +++ b/stp/testenv_tcap.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=STP_Tests config=STP_Tests_TCAP.cfg diff --git a/upf/testenv.cfg b/upf/testenv.cfg index 53273b5..7152e71 100644 --- a/upf/testenv.cfg +++ b/upf/testenv.cfg @@ -1,5 +1,4 @@ [testsuite] -titan_min=11.1.0 program=UPF_Tests config=UPF_Tests.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife12e3b3294ce16ebedee1b7998d3b89856f0328 Gerrit-Change-Number: 42815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: introduce testsrcdir.cfg
by osmith 03 Jun '26

03 Jun '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email ) Change subject: testenv: introduce testsrcdir.cfg ...................................................................... testenv: introduce testsrcdir.cfg Source directories can have more than one testenv.cfg file. Some options have been added to testenv.cfg that are not really specific to a single testsuite or how it gets executed, but to the whole source directory. This is not ideal, because we need to have additional code that ensures these options have the same value across all testenv.cfg files in the same source directory, and we need functions that just pick the value from the first of these configs. When we change such a value, we also need to potentially make the change in multiple files. Resolve this by introducing a new config file testsrcdir.cfg, that can be optionally in the source directory, and has options that count for all testsuites in the same source directory. Move max_jobs_per_gb_ram= as first option to the new file. The following patches will move all other source directory specific options to testsrcdir.cfg. I have also considered naming the new file testdir.cfg, but the name "testdir" is already used in the source code for the place where we execute the individual testsuites after copying configs into that directory. Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 --- M 5gc/testenv.cfg A 5gc/testsrcdir.cfg M _testenv/README.md M _testenv/testenv.py M _testenv/testenv/testenv_cfg.py A _testenv/testenv/testsrcdir_cfg.py M _testenv/testenv/testsuite.py 7 files changed, 105 insertions(+), 70 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/42814/1 diff --git a/5gc/testenv.cfg b/5gc/testenv.cfg index 876aacf..d70c135 100644 --- a/5gc/testenv.cfg +++ b/5gc/testenv.cfg @@ -1,6 +1,5 @@ [testsuite] titan_min=11.1.0 -max_jobs_per_gb_ram=0.3 program=C5G_Tests config=C5G_Tests.cfg copy=testsuite_prepare.sh diff --git a/5gc/testsrcdir.cfg b/5gc/testsrcdir.cfg new file mode 100644 index 0000000..7f19289 --- /dev/null +++ b/5gc/testsrcdir.cfg @@ -0,0 +1,2 @@ +[testsrcdir] +max_jobs_per_gb_ram=0.3 diff --git a/_testenv/README.md b/_testenv/README.md index 196af94..9c5c35a 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -89,11 +89,6 @@ depending on when the script runs. The script will not run on crash if podman is used, as the container gets shutdown beforehand. -* `max_jobs_per_gb_ram=`: optional value that can be set to reduce the amount - of parallel jobs when compiling the testsuite. This is set in the 5gc - testsuite to avoid consuming the whole RAM and freezing (or possibly getting - killed from an out-of-memory daemon). - * `podman_extra=`: optional value that can be set to add extra parameters to podman. For example, it can be used to mount an additional volume to pass- through USB devices. Use spaces to separate parameters, use quotes to include @@ -171,6 +166,27 @@ * `bts/testenv_hopping.cfg` * `bts/testenv_oml.cfg` +## testsrcdir.cfg + +Directories can optionally also have a `testsrcdir.cfg` file next to the +`testenv*.cfg` files. These `testsrcdir.cfg` files set configurations for all +testsuites in that directory. The file has one `[testsrcdir]` section. + +### Example + +```ini +[testsrcdir] +max_jobs_per_gb_ram=0.3 +``` + +### Keys + +* `max_jobs_per_gb_ram=`: optional value that can be set to reduce the amount + of parallel jobs when compiling testsuites from this directory and their + dependency sources. This is set in the 5gc testsuite to avoid consuming the + whole RAM and freezing (or possibly getting killed from an out-of-memory + daemon). + ## Environment variables ### Environment variables read by testenv diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 55d7896..9450c8f 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -13,6 +13,7 @@ import testenv.podman_install import testenv.requirements import testenv.testdir +import testenv.testsrcdir_cfg import testenv.testenv_cfg import testenv.testsuite @@ -31,6 +32,7 @@ def run(): testenv.requirements.check() + testenv.testsrcdir_cfg.init() testenv.testenv_cfg.init() if not testenv.args.binary_repo: diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index eb9e030..ec65ac0 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -5,11 +5,9 @@ import fnmatch import glob import logging -import math import os.path import sys import testenv -import traceback cfgs = {} current = None @@ -149,64 +147,6 @@ return get_titan_version(cfg) -def verify_max_jobs_per_gb_ram(cfgs_all): - error = False - max_jobs_per_gb_ram = None - - for cfg_name, cfg in cfgs_all.items(): - cfg_max = cfg["testsuite"].get("max_jobs_per_gb_ram", None) - if cfg_max is not None: - if max_jobs_per_gb_ram is not None: - if cfg_max != max_jobs_per_gb_ram: - error = True - break - else: - max_jobs_per_gb_ram = cfg_max - elif max_jobs_per_gb_ram: - error = True - break - - if not error: - return - - logging.error("Found different max_jobs_per_gb_ram= values in testenv.cfg files of the same directory.") - logging.error("This is not supported, please fix it.") - sys.exit(1) - - -def get_titan_make_job_count(): - _, cfg = next(iter(cfgs.items())) - max_jobs_per_gb_ram = cfg["testsuite"].get("max_jobs_per_gb_ram", None) - max_jobs = None - - if max_jobs_per_gb_ram: - try: - gb_ram = 0 - with open("/proc/meminfo") as f: - line = f.readline() - # Parse e.g. "MemTotal: 15571604 kB" - if line.startswith("MemTotal:"): - gb_ram = int(line.split(" ")[-2]) / 1024 / 1024 - logging.debug(f"Building with {round(gb_ram, 2)} GB of RAM") - max_jobs = math.floor(gb_ram * float(max_jobs_per_gb_ram)) - if max_jobs < 1: - raise RuntimeError(f"max_jobs is invalid: max_jobs={max_jobs}, gb_ram={gb_ram}") - - except Exception as ex: - traceback.print_exception(type(ex), ex, ex.__traceback__) - logging.error(f"Calculating max jobs with max_jobs_per_gb_ram={max_jobs_per_gb_ram} failed, assuming 4") - max_jobs = 4 - - if max_jobs and max_jobs < testenv.args.jobs: - logging.info( - f"Using only {max_jobs} jobs instead of {testenv.args.jobs} because of" - f" max_jobs_per_gb_ram={max_jobs_per_gb_ram} in testenv.cfg" - ) - return max_jobs - - return testenv.args.jobs - - def get_podman_extra_first_cfg(): _, cfg = next(iter(cfgs.items())) return cfg["testsuite"].get("podman_extra", None) @@ -259,7 +199,6 @@ "prepare", "program", "titan_min", - "max_jobs_per_gb_ram", "podman_extra", ] keys_valid_component = [ @@ -283,6 +222,9 @@ "copy", "package", ] + keys_moved_to_testsrcdir_cfg = [ + "max_jobs_per_gb_ram", + ] if "testsuite" not in cfg: logging.error(f"{path}: missing [testsuite] section") @@ -315,6 +257,8 @@ msg = f"{path}: [{section}]: {key}= is invalid" if key in keys_invalid and keys_invalid[key] in valid: msg += f", did you mean {keys_invalid[key]}=?" + if key in keys_moved_to_testsrcdir_cfg: + msg += " (this key has been moved to testsrcdir.cfg)" logging.error(msg) exit_error_readme() @@ -413,8 +357,6 @@ cfgs_all[basename] = cfg - verify_max_jobs_per_gb_ram(cfgs_all) - # Select configs based on --config argument(s) for config_arg in testenv.args.config: if config_arg == "all": diff --git a/_testenv/testenv/testsrcdir_cfg.py b/_testenv/testenv/testsrcdir_cfg.py new file mode 100644 index 0000000..d1d560d --- /dev/null +++ b/_testenv/testenv/testsrcdir_cfg.py @@ -0,0 +1,73 @@ +# Copyright 2026 sysmocom - s.f.m.c. GmbH +# SPDX-License-Identifier: GPL-3.0-or-later +import configparser +import logging +import math +import os +import sys +import testenv +import traceback + +cfg = { + "max_jobs_per_gb_ram": None, +} + + +def get_titan_make_job_count(): + max_jobs_per_gb_ram = cfg["max_jobs_per_gb_ram"] + max_jobs = None + + if max_jobs_per_gb_ram: + try: + gb_ram = 0 + with open("/proc/meminfo") as f: + line = f.readline() + # Parse e.g. "MemTotal: 15571604 kB" + if line.startswith("MemTotal:"): + gb_ram = int(line.split(" ")[-2]) / 1024 / 1024 + logging.debug(f"Building with {round(gb_ram, 2)} GB of RAM") + max_jobs = math.floor(gb_ram * float(max_jobs_per_gb_ram)) + if max_jobs < 1: + raise RuntimeError(f"max_jobs is invalid: max_jobs={max_jobs}, gb_ram={gb_ram}") + + except Exception as ex: + traceback.print_exception(type(ex), ex, ex.__traceback__) + logging.error(f"Calculating max jobs with max_jobs_per_gb_ram={max_jobs_per_gb_ram} failed, assuming 4") + max_jobs = 4 + + if max_jobs and max_jobs < testenv.args.jobs: + logging.info( + f"Using only {max_jobs} jobs instead of {testenv.args.jobs} because of" + f" max_jobs_per_gb_ram={max_jobs_per_gb_ram} in testsrcdir.cfg" + ) + return max_jobs + + return testenv.args.jobs + + +def init(): + global cfg + + cfg_path = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite, "testsrcdir.cfg") + if not os.path.exists(cfg_path): + return + + parser = configparser.ConfigParser() + parser.read(cfg_path) + + if "testsrcdir" not in parser: + logging.error(f"Missing section [testsrcdir] in {cfg_path}") + sys.exit(1) + + for section in parser: + if section == "DEFAULT": + continue + if section != "testsrcdir": + logging.error(f"Invalid section [{section}] in {cfg_path}") + sys.exit(1) + + for key in parser["testsrcdir"]: + if key not in cfg: + logging.error("Invalid key {key}= in {cfg_path}") + sys.exit(1) + cfg[key] = parser["testsrcdir"][key] diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 3fdafa8..cdea60e 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -12,6 +12,7 @@ import testenv import testenv.cmd import testenv.testenv_cfg +import testenv.testsrcdir_cfg import time builddir_env = {} @@ -58,7 +59,7 @@ logging.info(f"Building testsuite (eclipse-titan {titan_version}, {titan_reason})") env = copy.copy(builddir_env) - env["PARALLEL_MAKE"] = f"-j{testenv.testenv_cfg.get_titan_make_job_count()}" + env["PARALLEL_MAKE"] = f"-j{testenv.testsrcdir_cfg.get_titan_make_job_count()}" testenv.cmd.run(["make", testenv.args.testsuite], cwd=testenv.ttcn3_hacks_dir, env=env) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42814?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eceea7b874ce1352e2cc9780b77d2a8e694cd28 Gerrit-Change-Number: 42814 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: CCID: Disable set/reset parameter tests
by jolly 03 Jun '26

03 Jun '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42785?usp=email ) Change subject: CCID: Disable set/reset parameter tests ...................................................................... CCID: Disable set/reset parameter tests These tests are currently not supported by octsim, so they are disabled. Change-Id: Iebcfe05742d53941f2cbc758c2414d4372068a61 --- M ccid/CCID_Tests.ttcn 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ccid/CCID_Tests.ttcn b/ccid/CCID_Tests.ttcn index e650f37..d158f64 100644 --- a/ccid/CCID_Tests.ttcn +++ b/ccid/CCID_Tests.ttcn @@ -20,6 +20,7 @@ USB_Device_Match mp_usb_dev_match := { vid_pid := { vid := '1d50'H, pid := '6141'H } }; integer mp_use_slot_count := 8; boolean mp_test_power_off := true; + boolean mp_test_set_params := false; boolean mp_quirk_resetpar_returns_slotsts := false; } /* global test component; manages CCID device */ @@ -464,8 +465,10 @@ } execute( TC_select_mf() ); execute( TC_get_params() ); - execute( TC_set_params() ); - execute( TC_reset_params() ); + if (mp_test_set_params) { + execute( TC_set_params() ); + execute( TC_reset_params() ); + } /* error handling */ execute( TC_inval_slot() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42785?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iebcfe05742d53941f2cbc758c2414d4372068a61 Gerrit-Change-Number: 42785 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log June 2026