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

[XS] Change in osmo-ci[master]: repo-install-test: ignore eclipse-titan-optdir

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40451?usp=email ) Change subject: repo-install-test: ignore eclipse-titan-optdir ...................................................................... repo-install-test: ignore eclipse-titan-optdir The osmocom:latest repository now has eclipse-titan-optdir-9.0.0 and eclipse-titan-optdir-11.1.0 packages, which allow installing multiple titan versions side-by-side. The related -dbgsym packages can conflict with the main eclipse-titan-dbgsym package. Ignore these packages in the repo-install test. Fixes: Unpacking eclipse-titan-optdir-9.0.0-dbgsym (9.0.0~osmocom1.2263.c685) ... dpkg: error processing archive /tmp/apt-dpkg-install-4XXdZ1/205-eclipse-titan-optdir-9.0.0-dbgsym_9.0.0~osmocom1.2263.c685_amd64.deb (--unpack): trying to overwrite '/usr/lib/debug/.build-id/0a/072e12f92a7b564adec3a0896c18aa6c942391.debug', which is also in package eclipse-titan-dbgsym 9.0.0.3.0bbfc~osmocom Related: https://jenkins.osmocom.org/jenkins/job/Osmocom-repo-install-debian12/feed=… Change-Id: If761290f7ff6d30000ccd9327310f78cf90fe793 --- M scripts/repo-install-test/run-inside.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/40451/1 diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index b76f4dc..0e549b0 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -328,6 +328,7 @@ libhyder*) ;; limesuite*) ;; soapysdr*-module-lms7*) ;; + eclipse-titan-optdir*) ;; # Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which # we won't install -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If761290f7ff6d30000ccd9327310f78cf90fe793 Gerrit-Change-Number: 40451 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 week, 5 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: enft_kpi: keep NFT counters intact

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?usp=email ) Change subject: enft_kpi: keep NFT counters intact ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Id6db327b445b8597d39a1d838077e7002d538db5 Gerrit-Change-Number: 40446 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 17:40:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: enft_kpi: use command/expression templates from enftables

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email ) Change subject: enft_kpi: use command/expression templates from enftables ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I421ba5ccc8956586136466d5eb50d6ace69eeb67 Gerrit-Change-Number: 40439 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 17:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

[L] Change in ...osmo-s1gw[master]: enft_kpi: support different UL/DL GTP-U addresses

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?usp=email ) Change subject: enft_kpi: support different UL/DL GTP-U addresses ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icd4a17790062bfcaf2bccb01fa94dcdb65c0872c Gerrit-Change-Number: 40437 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 17:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: move ttcn3_hacks_dir to __init__.py

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?usp=email ) Change subject: testenv: move ttcn3_hacks_dir to __init__.py ...................................................................... testenv: move ttcn3_hacks_dir to __init__.py Move testenv.testsuite.ttcn3_hacks_dir to testenv.ttcn3_hacks_dir. It makes more sense there as the path to osmo-ttcn3-hacks is used by many modules, not just the testenv.testsuite module, and it prevents a cyclic import with future patches when testenv.testsuite will import testenv.testenv_cfg. Change-Id: I4280009da419e6f5b533805732656ec4cc05d5ac --- M _testenv/testenv/__init__.py M _testenv/testenv/cmd.py M _testenv/testenv/requirements.py M _testenv/testenv/testdir.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 6 files changed, 17 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 9b5e944..cb4a02c 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -11,6 +11,7 @@ args = None +ttcn3_hacks_dir = os.path.realpath(f"{__file__}/../../..") src_dir = os.environ.get("TESTENV_SRC_DIR", os.path.realpath(f"{__file__}/../../../..")) data_dir = os.path.join(os.path.realpath(f"{__file__}/../.."), "data") custom_kernel_path = os.path.join(os.path.realpath(f"{__file__}/../../.."), ".linux") @@ -214,8 +215,7 @@ ) raise NoTraceException(f"For --kernel-custom, put a symlink or copy of your kernel to: {custom_kernel_path}") - ttcn3_hacks_dir_src = os.path.realpath(f"{__file__}/../../..") - testsuite_dir = os.path.join(ttcn3_hacks_dir_src, args.testsuite) + testsuite_dir = os.path.join(ttcn3_hacks_dir, args.testsuite) if not os.path.exists(testsuite_dir): raise NoTraceException(f"testsuite dir not found: {testsuite_dir}") diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index e65f777..d4a1e9a 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -79,8 +79,8 @@ ret = dict(env_extra) path = os.path.join(testenv.data_dir, "scripts") path += f":{os.path.join(testenv.data_dir, 'scripts/qemu')}" - if testenv.args.action == "run" and testenv.testsuite.ttcn3_hacks_dir: - path += f":{os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite)}" + if testenv.args.action == "run" and testenv.ttcn3_hacks_dir: + path += f":{os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite)}" if install_dir and install_dir != "/": path += f":{os.path.join(install_dir, 'bin')}" diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 5ab61ad..6e7c32c 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -101,7 +101,7 @@ "-q", "fftranscode", os.path.join( - testenv.testsuite.ttcn3_hacks_dir, + testenv.ttcn3_hacks_dir, testenv.args.testsuite, "regen_makefile.sh", ), diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 929d19c..927ce69 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -66,7 +66,7 @@ testdir = os.path.join(topdir, cfg_name.replace("testenv_", "").replace(".cfg", "")) logging.info(f"Preparing testdir: {testdir}") - testsuite_dir = os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite) + testsuite_dir = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite) atexit.register(clean_run_scripts) @@ -96,13 +96,13 @@ # Referenced in testsuite cfgs: Common.cfg common_cfg = os.path.join(testdir, "testsuite", "Common.cfg") - path = os.path.join(testenv.testsuite.ttcn3_hacks_dir, "Common.cfg") + path = os.path.join(testenv.ttcn3_hacks_dir, "Common.cfg") testenv.cmd.run(["install", "-Dm644", path, common_cfg]) testenv.cmd.run( [ "sed", "-i", - f's#TTCN3_HACKS_PATH := .*#TTCN3_HACKS_PATH := "{testenv.testsuite.ttcn3_hacks_dir}"#', + f's#TTCN3_HACKS_PATH := .*#TTCN3_HACKS_PATH := "{testenv.ttcn3_hacks_dir}"#', common_cfg, ] ) diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index e224815..5b1d32f 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -7,7 +7,6 @@ import os.path import sys import testenv -import testenv.testsuite cfgs = {} current = None @@ -30,7 +29,7 @@ def exit_error_readme(): - readme = os.path.join(testenv.testsuite.ttcn3_hacks_dir, "_testenv/README.md") + readme = os.path.join(testenv.ttcn3_hacks_dir, "_testenv/README.md") logging.error(f"More information: {readme}") sys.exit(1) @@ -215,7 +214,7 @@ def find_configs(): - dir_testsuite = os.path.join(testenv.testsuite.ttcn3_hacks_dir, testenv.args.testsuite) + dir_testsuite = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite) pattern = os.path.join(dir_testsuite, "testenv*.cfg") ret = sorted(glob.glob(pattern)) diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 6d0335e..753773f 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -13,18 +13,17 @@ import testenv.cmd import time -ttcn3_hacks_dir = os.path.realpath(f"{__file__}/../../..") builddir_env = {} testsuite_proc = None def update_deps(): logging.info("Updating osmo-ttcn3-hacks/deps") - testenv.cmd.run(["make", "deps"], cwd=ttcn3_hacks_dir) + testenv.cmd.run(["make", "deps"], cwd=testenv.ttcn3_hacks_dir) def prepare_testsuite_dir(): - testsuite_dir = f"{ttcn3_hacks_dir}/{testenv.args.testsuite}" + testsuite_dir = f"{testenv.ttcn3_hacks_dir}/{testenv.args.testsuite}" logging.info(f"Generating links and Makefile for {testenv.args.testsuite}") testenv.cmd.run(["./gen_links.sh"], cwd=testsuite_dir, env=builddir_env) testenv.cmd.run("USE_CCACHE=1 ./regen_makefile.sh", cwd=testsuite_dir, env=builddir_env) @@ -50,7 +49,7 @@ if testenv.args.jobs: env["PARALLEL_MAKE"] = f"-j{testenv.args.jobs}" - testenv.cmd.run(["make", testenv.args.testsuite], cwd=ttcn3_hacks_dir, env=env) + testenv.cmd.run(["make", testenv.args.testsuite], cwd=testenv.ttcn3_hacks_dir, env=env) def is_running(pid): @@ -70,7 +69,7 @@ cwd = os.path.join(testenv.testdir.testdir, "testsuite") logging.info("Merging log files") - log_merge = os.path.join(ttcn3_hacks_dir, "log_merge.sh") + log_merge = os.path.join(testenv.ttcn3_hacks_dir, "log_merge.sh") # stdout of this script is very verbose, making it harder to see the output # that matters (tests failed or not), so redirect it to /dev/null cmd = f"{shlex.quote(log_merge)} {shlex.quote(section_data['program'])} --rm >/dev/null" @@ -128,9 +127,9 @@ section_data = cfg["testsuite"] cwd = os.path.join(testenv.testdir.testdir, "testsuite") - start_testsuite = os.path.join(ttcn3_hacks_dir, "start-testsuite.sh") - suite = os.path.join(ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) - suite = os.path.relpath(suite, ttcn3_hacks_dir) + start_testsuite = os.path.join(testenv.ttcn3_hacks_dir, "start-testsuite.sh") + suite = os.path.join(testenv.ttcn3_hacks_dir, testenv.args.testsuite, section_data["program"]) + suite = os.path.relpath(suite, testenv.ttcn3_hacks_dir) env = copy.copy(builddir_env) env["TTCN3_PCAP_PATH"] = os.path.join(testenv.testdir.testdir, "testsuite") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?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: I4280009da419e6f5b533805732656ec4cc05d5ac Gerrit-Change-Number: 40449 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 week, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: add titan_min to all configs

by osmith

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 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40448?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: Ibd81812227f947cf1f437bdc4b087779194bc5dc Gerrit-Change-Number: 40448 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 week, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: support using multiple titan versions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?usp=email ) Change subject: testenv: support using multiple titan versions ...................................................................... testenv: support using multiple titan versions Install eclipse-titan versions 9.0.0 and 11.1.0 into /opt/eclipse-titan-$version inside the podman container by using the new optdir packages. Choose the appropriate version by setting related environment variables. Use the version in $PATH on the host, unless /opt/eclipse-titan-$version is also present on the host system. Add a new --titan-version argument to explicitly set a version to use when running a testsuite. Rewrite the version check code to take titan_min, --titan-version and the host version (if not using optdir) into account. Related: OS#6490 Change-Id: I48d711da57c874cf7cd557480a163eea1a4167bd --- M _testenv/README.md M _testenv/data/podman/Dockerfile M _testenv/testenv.py M _testenv/testenv/__init__.py M _testenv/testenv/podman.py M _testenv/testenv/requirements.py M _testenv/testenv/testenv_cfg.py M _testenv/testenv/testsuite.py 8 files changed, 121 insertions(+), 36 deletions(-) Approvals: osmith: Looks good to me, approved jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/README.md b/_testenv/README.md index a712dc8..ecc8701 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -66,7 +66,8 @@ #### Testsuite section * `titan_min=`: the minimum required eclipse-titan version for building and - running this testsuite. + running this testsuite. See the eclipse-titan versions section below for + details. * `program=`: the executable for starting the testsuite, without arguments. @@ -275,6 +276,17 @@ * `TERM`: Is set to the same `TERM` passed to testenv with fallback to `dumb`. +## Eclipse-titan versions + +It is possible to change the eclipse-titan version that is used to build and +run a testsuite if multiple versions are installed. This is the case when +running in podman (see `testenv/data/podman/Dockerfile`) or if multiple +versions are installed as `/opt/eclipse-titan-$VERSION` paths on the host +system. + +Switching between the versions is done either by setting a `titan_min` version +in the `[testsuite]` section, or by using `-T` / `--titan-version`. + ## Troubleshooting ### Timeout waiting for RESET-ACK after sending RESET diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index dca8a75..84aa0db 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -147,7 +147,8 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ - eclipse-titan \ + eclipse-titan-optdir-9.0.0 \ + eclipse-titan-optdir-11.1.0 \ && \ apt-get clean && \ rm /etc/apt/sources.list.d/osmocom-latest.list diff --git a/_testenv/testenv.py b/_testenv/testenv.py index f852c0c..2aac11e 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -43,6 +43,7 @@ if testenv.args.podman: testenv.podman.init() testenv.podman.start() + testenv.podman.check_titan_version() if not testenv.args.binary_repo: testenv.osmo_dev.init() diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index cb4a02c..511ec58 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -86,6 +86,7 @@ help="which testenv.cfg to use (supports * wildcards via fnmatch)", ) group.add_argument("-i", "--io-uring", action="store_true", help="set LIBOSMO_IO_BACKEND=IO_URING") + group.add_argument("-T", "--titan-version", help="which eclipse-titan version to use") group = sub_run.add_argument_group("source/binary options", "All components are built from source by default.") group.add_argument( diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index f8812e4..5099a95 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -12,6 +12,7 @@ import testenv.testdir import testenv.coredump import time +import sys image_name = None distro = None @@ -283,6 +284,20 @@ exec_cmd(["apt-get", "-q", "update"]) +def check_titan_version(): + version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + if not testenv.cmd.run(["test", "-d", f"/opt/eclipse-titan-{version}"], check=False).returncode: + return + + up_to_date = testenv.podman.image_up_to_date() + logging.error(f"/opt/eclipse-titan-{version} not found in the podman container!") + if up_to_date: + logging.error("Consider modifying _testenv/data/podman/Dockerfile.") + else: + logging.error("Try './testenv.py init podman' to update the container.") + sys.exit(1) + + def distro_to_repo_dir(distro): if distro == "debian:bookworm": return "Debian_12" diff --git a/_testenv/testenv/requirements.py b/_testenv/testenv/requirements.py index 6e7c32c..540fe55 100644 --- a/_testenv/testenv/requirements.py +++ b/_testenv/testenv/requirements.py @@ -1,10 +1,8 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later -from packaging.version import Version import logging import os.path import shutil -import subprocess import sys import testenv import testenv.cmd @@ -71,30 +69,6 @@ sys.exit(1) -def check_ttcn3_compiler_version(): - if testenv.args.podman: - return - - ttcn3_min_version = "9.0.0" - - v = subprocess.run(["ttcn3_compiler", "-v"], capture_output=True, text=True) - current = None - for line in v.stderr.split("\n"): - if not line.startswith("Version: "): - continue - - current = line.split(":", 1)[1].strip() - if Version(current) >= Version(ttcn3_min_version): - return - - logging.error(f"Found ttcn3_compiler version {current}, but {ttcn3_min_version} or higher is required.") - - if not current: - logging.error("Could not parse ttcn3_compiler version.") - logging.error(f"Please install at least version {ttcn3_min_version} and try again.") - sys.exit(1) - - def check_fftranscode(): cmd = [ "grep", @@ -124,7 +98,6 @@ def check(): check_programs() - check_ttcn3_compiler_version() if not testenv.args.podman: check_fftranscode() diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 5b1d32f..84176d7 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -1,5 +1,6 @@ # 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 @@ -10,6 +11,8 @@ cfgs = {} current = None +titan_version_in_path = None +titan_min_previous = None def set_current(cfg_name, loop_count=0): @@ -74,6 +77,76 @@ 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 verify_qemu_cfgs(): """Check if passed -C or -K args make sense with the testenv configs.""" testsuite = testenv.args.testsuite @@ -194,6 +267,7 @@ 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/testsuite.py b/_testenv/testenv/testsuite.py index 753773f..8452a80 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -11,6 +11,7 @@ import subprocess import testenv import testenv.cmd +import testenv.testenv_cfg import time builddir_env = {} @@ -35,15 +36,21 @@ atexit.register(stop) update_deps() - if testenv.args.podman: - builddir = os.path.join(testenv.args.cache, "podman", "ttcn3") - builddir_env = {"BUILDDIR": builddir} + titan_version, _ = testenv.testenv_cfg.get_titan_version_first_cfg() + ttcn3_dir = f"/opt/eclipse-titan-{titan_version}" + + if testenv.args.podman or os.path.exists(ttcn3_dir): + cache_dir = "podman" if testenv.args.podman else "host" + builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}") + path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] + builddir_env = {"BUILDDIR": builddir, "TTCN3_DIR": ttcn3_dir, "PATH": f"{ttcn3_dir}/bin:{path_old}"} prepare_testsuite_dir() def build(): - logging.info("Building testsuite") + titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + logging.info(f"Building testsuite (eclipse-titan {titan_version}, {titan_reason})") env = copy.copy(builddir_env) if testenv.args.jobs: @@ -73,7 +80,7 @@ # stdout of this script is very verbose, making it harder to see the output # that matters (tests failed or not), so redirect it to /dev/null cmd = f"{shlex.quote(log_merge)} {shlex.quote(section_data['program'])} --rm >/dev/null" - testenv.cmd.run(cmd, cwd=cwd) + testenv.cmd.run(cmd, cwd=cwd, env=builddir_env) def format_log_files(cfg): @@ -81,7 +88,7 @@ logging.info("Formatting log files") cmd = os.path.join(testenv.data_dir, "scripts/log_format.sh") - testenv.cmd.run(cmd, cwd=cwd) + testenv.cmd.run(cmd, cwd=cwd, env=builddir_env) def get_junit_logs(topdir): @@ -151,7 +158,8 @@ else: cmd += [f"{section_data['program']}.{test_arg}"] - logging.info("Running testsuite") + titan_version, titan_reason = testenv.testenv_cfg.get_titan_version_first_cfg() + logging.info(f"Running testsuite (eclipse-titan {titan_version}, {titan_reason})") if testenv.podman.is_running(): testsuite_proc = testenv.podman.exec_cmd_background(cmd, cwd=cwd, env=env) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?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: I48d711da57c874cf7cd557480a163eea1a4167bd Gerrit-Change-Number: 40450 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 week, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: support using multiple titan versions

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?usp=email ) Change subject: testenv: support using multiple titan versions ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40450?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: I48d711da57c874cf7cd557480a163eea1a4167bd Gerrit-Change-Number: 40450 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 13:52:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: move ttcn3_hacks_dir to __init__.py

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?usp=email ) Change subject: testenv: move ttcn3_hacks_dir to __init__.py ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40449?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: I4280009da419e6f5b533805732656ec4cc05d5ac Gerrit-Change-Number: 40449 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 13:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: add titan_min to all configs

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40448?usp=email ) Change subject: testenv: add titan_min to all configs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40448?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: Ibd81812227f947cf1f437bdc4b087779194bc5dc Gerrit-Change-Number: 40448 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jun 2025 13:51:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2025