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

[L] Change in osmo-ttcn3-hacks[master]: RSPDefinitions_Templates: use a more realistic data in ts_boundProfil...
by dexter 05 Oct '26

05 Oct '26

Attention is currently required from: jolly. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43762?usp=email ) Change subject: RSPDefinitions_Templates: use a more realistic data in ts_boundProfilePackage ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43762?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: Ia987f4d802b360b6dd5b3cc400f9e20b215cff9d Gerrit-Change-Number: 43762 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 05 Oct 2026 13:18:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: use osmo-dev to build osmo-trx-proxy, trxcon
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43775?usp=email ) Change subject: bts: use osmo-dev to build osmo-trx-proxy, trxcon ...................................................................... bts: use osmo-dev to build osmo-trx-proxy, trxcon Depends: osmo-ci Id7521e9941f651608b39e8b7b2a6437a0e483022 Related: OS#6638#note-12 Change-Id: Ifb6761b3fc15a29404dd0ea17b039fde30053d13 --- M bts/testenv_generic.cfg M bts/testenv_hopping.cfg M bts/testenv_oml.cfg 3 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/43775/1 diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index 87831cd..2cee352 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -12,7 +12,7 @@ prepare=require_ulimit_r.sh 32 program=osmo-trx-proxy make=osmo-trx -package=osmo-trx-proxy +package=no copy=osmo-trx-proxy.cfg # TODO: Remove *_latest after osmo-trx >= 1.9.0 was released program_latest=run_fake_trx.sh @@ -22,7 +22,7 @@ [trxcon] program=trxcon make=trxcon -package=osmocom-bb-trxcon +package=no [bts] prepare=require_ulimit_r.sh 30 diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index b9fadc3..ce2be77 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -15,7 +15,7 @@ prepare=require_ulimit_r.sh 32 program=osmo-trx-proxy make=osmo-trx -package=osmo-trx-proxy +package=no copy=osmo-trx-proxy.cfg # TODO: Remove *_latest after osmo-trx >= 1.9.0 was released program_latest=run_fake_trx.sh @@ -25,7 +25,7 @@ [trxcon] program=trxcon make=trxcon -package=osmocom-bb-trxcon +package=no [bts] prepare=require_ulimit_r.sh 30 diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg index a7f561d..b76f62b 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -6,7 +6,7 @@ prepare=require_ulimit_r.sh 32 program=osmo-trx-proxy make=osmo-trx -package=osmo-trx-proxy +package=no copy=osmo-trx-proxy.cfg # TODO: Remove *_latest after osmo-trx >= 1.9.0 was released program_latest=run_fake_trx.sh @@ -16,7 +16,7 @@ [trxcon] program=trxcon make=trxcon -package=osmocom-bb-trxcon +package=no [bts] prepare=osmo-config-merge osmo-bts.cfg osmo-bts-oml.confmerge > osmo-bts-oml.cfg && require_ulimit_r.sh 30 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43775?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: Ifb6761b3fc15a29404dd0ea17b039fde30053d13 Gerrit-Change-Number: 43775 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: use osmo-dev to build sccp_demo_user
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43776?usp=email ) Change subject: sccp: use osmo-dev to build sccp_demo_user ...................................................................... sccp: use osmo-dev to build sccp_demo_user Now that we can build test components with osmo-dev while running with --binary-packages, we can get rid of a lot of extra code that was used to implement another method for building this test component from source. The osmo-dev version is also more convenient, because it uses the normal libosmocore.git clone instead of making a separate one. Depends: osmo-ci I4def3fa4d88d2f58696b20255b9b0f9fede5536e Change-Id: I50728c4a11a3ef315a721d745762e56e9489645c --- M _testenv/testenv/podman_install.py M sccp/run_sccp_demo_user.sh M sccp/testenv.cfg 3 files changed, 3 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/43776/1 diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 438f875..c761a41 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -146,41 +146,6 @@ show_commit(project, git_dir_project) -def from_source_sccp_demo_user(): - sccp_dir = os.path.join(git_dir, "libosmo-sigtran") - sccp_demo_user_path = os.path.join(sccp_dir, "examples/sccp_demo_user") - - # Install libraries even if not building sccp_demo_user, because it gets - # linked dynamically against them. - apt_install( - [ - "libosmo-netif-dev", - "libosmocore-dev", - ] - ) - - clone_project("libosmo-sigtran") - if not os.path.exists(sccp_demo_user_path): - logging.info("Building sccp_demo_user") - testenv.cmd.run(["autoreconf", "-fi"], cwd=sccp_dir) - - configure_cmd = ["./configure"] - if testenv.args.binary_repo.endswith(":asan"): - configure_cmd += ["--enable-sanitize"] - testenv.cmd.run(configure_cmd, cwd=sccp_dir) - - testenv.cmd.run( - ["make", "-j", f"{jobs}", "libosmo-sigtran.la"], - cwd=os.path.join(sccp_dir, "src"), - ) - testenv.cmd.run( - ["make", "-j", f"{jobs}", "sccp_demo_user"], - cwd=os.path.join(sccp_dir, "examples"), - ) - - testenv.cmd.run(["ln", "-s", sccp_demo_user_path, "/usr/local/bin/sccp_demo_user"]) - - def from_source_osmo_ns_dummy(): libosmocore_dir = os.path.join(git_dir, "libosmocore") osmo_ns_dummy_path = os.path.join(libosmocore_dir, "utils/osmo-ns-dummy") @@ -204,8 +169,6 @@ def from_source(cfg, cfg_name, section): program = cfg[section]["program"].split(" ", 1)[0] - if program == "run_sccp_demo_user.sh": - return from_source_sccp_demo_user() if program == "run_osmo_ns_dummy.sh": return from_source_osmo_ns_dummy() diff --git a/sccp/run_sccp_demo_user.sh b/sccp/run_sccp_demo_user.sh index 88cd507..8cea881 100755 --- a/sccp/run_sccp_demo_user.sh +++ b/sccp/run_sccp_demo_user.sh @@ -1,11 +1,4 @@ #!/bin/sh -ex -if [ -n "$OSMO_DEV_MAKE_DIR" ]; then - # Using osmo-dev: either with or without --podman - exec "$OSMO_DEV_MAKE_DIR"/libosmo-sigtran/examples/sccp_demo_user "$@" -fi - -# Using binary packages: as sccp_demo_user is not packaged it gets -# built by testenv/podman_install.py:from_source_sccp_demo_user() -# and symlinked to /usr/local/bin. -exec sccp_demo_user "$@" +# sccp_demo_user is always built with osmo-dev, even if using --binary-packages +exec "$OSMO_DEV_MAKE_DIR"/libosmo-sigtran/examples/sccp_demo_user "$@" diff --git a/sccp/testenv.cfg b/sccp/testenv.cfg index de7b630..3416409 100644 --- a/sccp/testenv.cfg +++ b/sccp/testenv.cfg @@ -5,4 +5,5 @@ [sccp_demo_user] program=run_sccp_demo_user.sh -l 127.0.0.2 -r 127.0.0.1 -C sccp_demo_user.cfg make=libosmo-sigtran +package=no copy=sccp_demo_user.cfg -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43776?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: I50728c4a11a3ef315a721d745762e56e9489645c Gerrit-Change-Number: 43776 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: build package=no components with osmo-dev
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43774?usp=email ) Change subject: testenv: build package=no components with osmo-dev ...................................................................... testenv: build package=no components with osmo-dev Handle the case of running with --binary-repo, but setting some test components to package=no to have them built from source with osmo-dev. For this to work, the envtype needs to be adjusted and passed through related functions. Related: OS#6638#note-12 Change-Id: I060421a0e79aa4d16a0c6f91f5e153f54d0ab825 --- M _testenv/README.md M _testenv/testenv/cmd.py M _testenv/testenv/daemons.py M _testenv/testenv/osmo_dev.py M _testenv/testenv/podman.py 5 files changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/43774/1 diff --git a/_testenv/README.md b/_testenv/README.md index 047abc0..f10d349 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -105,7 +105,10 @@ * `package=`: debian package(s) to be installed for running a test component and the script in `prepare=`. Multiple values separated by spaces. Set to - `package=no` to not install any package. + `package=no` to not install any package, in which case osmo-dev will be used + to build the `make=` target. With both `package=no` and `make=no`, testenv + assumes that nothing needs to be installed or built before the test component + can be started. * `prepare=`: optional script to run before staring the program (after files are copied to the test directory). Typically this is used to create configs diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 0e35d2a..bf4f4f8 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -144,7 +144,7 @@ envtype = "binary_repo" if getattr(testenv.args, "binary_repo", True) else "osmo_dev" if not no_podman and testenv.args.podman: - return testenv.podman.exec_cmd(cmd, check=check, env=env, **kwargs) + return testenv.podman.exec_cmd(cmd, check=check, env=env, envtype=envtype, **kwargs) logging.debug(f"+ {cmd}") diff --git a/_testenv/testenv/daemons.py b/_testenv/testenv/daemons.py index 2abe8c8..0c402e9 100644 --- a/_testenv/testenv/daemons.py +++ b/_testenv/testenv/daemons.py @@ -59,11 +59,15 @@ if testenv.args.io_uring: env["LIBOSMO_IO_BACKEND"] = "IO_URING" + envtype = "osmo_dev" + if testenv.args.binary_repo and section_data["package"] != "no": + envtype = "binary_repo" + if testenv.args.podman: - daemons[section] = testenv.podman.exec_cmd_background(cmd, cwd=cwd, env=env) + daemons[section] = testenv.podman.exec_cmd_background(cmd, cwd=cwd, env=env, envtype=envtype) else: logging.debug(f"+ {cmd}") - daemons[section] = subprocess.Popen(cmd, cwd=cwd, env=testenv.cmd.generate_env(env)) + daemons[section] = subprocess.Popen(cmd, cwd=cwd, env=testenv.cmd.generate_env(env, envtype)) # Wait 200ms and check if it is still running time.sleep(0.2) diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 65dbfcc..edbe1b2 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -111,7 +111,7 @@ ] + extra_opts cwd = get_osmo_dev_dir() - if testenv.cmd.run(cmd, cwd=cwd, check=False).returncode: + if testenv.cmd.run(cmd, cwd=cwd, check=False, envtype="osmo_dev").returncode: logging.critical("gen_makefile.py from osmo-dev failed!") logging.critical("Your osmo-dev.git clone might be outdated, try:") logging.critical(f"$ git -C {shlex.quote(cwd)} pull") @@ -141,4 +141,4 @@ sys.exit(1) logging.info("Building test components") - testenv.cmd.run(["make"] + targets, cwd=testenv.cmd.make_dir) + testenv.cmd.run(["make"] + targets, cwd=testenv.cmd.make_dir, envtype="osmo_dev") diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index b7ed29d..f78b844 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -80,11 +80,11 @@ ) -def generate_env_podman(env=None): +def generate_env_podman(env=None, envtype="binary_repo"): env = env or {} ret = [] - for key, val in testenv.cmd.generate_env(env, True).items(): + for key, val in testenv.cmd.generate_env(env, True, envtype=envtype).items(): ret += ["-e", f"{key}={val}"] return ret @@ -135,7 +135,7 @@ run_shell_on_stop = True -def exec_cmd(cmd, podman_opts=None, cwd=None, env=None, **kwargs): +def exec_cmd(cmd, podman_opts=None, cwd=None, env=None, envtype="binary_repo", **kwargs): podman_opts = podman_opts or [] env = env or {} @@ -143,7 +143,7 @@ raise RuntimeError(f"Attempting to execute a command in podman, but the container isn't running anymore: {cmd}") podman_opts = list(podman_opts) - podman_opts += generate_env_podman(env) + podman_opts += generate_env_podman(env, envtype) # Attach a fake tty (eclipse-titan won't print colored output otherwise) podman_opts += ["-t"] @@ -160,11 +160,11 @@ ) -def exec_cmd_background(cmd, podman_opts=None, cwd=None, env=None): +def exec_cmd_background(cmd, podman_opts=None, cwd=None, env=None, envtype="binary_repo"): podman_opts = podman_opts or [] env = env or {} - podman_opts = list(podman_opts) + generate_env_podman(env) + podman_opts = list(podman_opts) + generate_env_podman(env, envtype) if cwd: podman_opts += ["-w", cwd] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43774?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: I060421a0e79aa4d16a0c6f91f5e153f54d0ab825 Gerrit-Change-Number: 43774 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: ns: use osmo-dev to build osmo-ns-dummy
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43777?usp=email ) Change subject: ns: use osmo-dev to build osmo-ns-dummy ...................................................................... ns: use osmo-dev to build osmo-ns-dummy Depends: osmo-ci I1eada70c6c27dca13fe69728007d6bcfa8ef02da Change-Id: I32b83957a90b30cca18d02e187984648bd69a891 --- D _testenv/data/scripts/build_osmo_ns_dummy.sh M _testenv/testenv/podman_install.py M ns/run_osmo_ns_dummy.sh M ns/testenv_sgsn_sns.cfg M ns/testenv_sns.cfg M ns/testenv_udp.cfg 6 files changed, 5 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/77/43777/1 diff --git a/_testenv/data/scripts/build_osmo_ns_dummy.sh b/_testenv/data/scripts/build_osmo_ns_dummy.sh deleted file mode 100755 index 12a6a43..0000000 --- a/_testenv/data/scripts/build_osmo_ns_dummy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -ex -# Script used by testenv/podman_install:from_source_osmo_ns_dummy() to build -# osmo-ns-dummy in libosmocore from git when running with "--binary-repo". This -# is needed, because osmo-ns-dummy is not packaged. -MAKE="make -j$1" - -$MAKE -C include/osmocom/core all -$MAKE -C src/core libosmocore.la -$MAKE -C src/vty libosmovty.la -$MAKE -C src/isdn libosmoisdn.la -$MAKE -C src/gsm libosmogsm.la -$MAKE -C src/gb libosmogb.la -$MAKE -C src/ctrl libosmoctrl.la -$MAKE -C utils osmo-ns-dummy diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index c761a41..3aff51e 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -146,32 +146,7 @@ show_commit(project, git_dir_project) -def from_source_osmo_ns_dummy(): - libosmocore_dir = os.path.join(git_dir, "libosmocore") - osmo_ns_dummy_path = os.path.join(libosmocore_dir, "utils/osmo-ns-dummy") - - clone_project("libosmocore") - if not os.path.exists(osmo_ns_dummy_path): - logging.info("Building osmo-ns-dummy") - testenv.cmd.run(["autoreconf", "-fi"], cwd=libosmocore_dir) - - configure_cmd = ["./configure"] - if testenv.args.binary_repo.endswith(":asan"): - configure_cmd += ["--enable-sanitize"] - testenv.cmd.run(configure_cmd, cwd=libosmocore_dir) - - testenv.cmd.run( - [os.path.join(testenv.data_dir, "scripts/build_osmo_ns_dummy.sh"), str(jobs)], cwd=libosmocore_dir - ) - - testenv.cmd.run(["ln", "-s", osmo_ns_dummy_path, "/usr/local/bin/osmo-ns-dummy"]) - - def from_source(cfg, cfg_name, section): - program = cfg[section]["program"].split(" ", 1)[0] - if program == "run_osmo_ns_dummy.sh": - return from_source_osmo_ns_dummy() - logging.error(f"Can't install {section}! Fix this by either:") logging.error(f"* Adding package= to [{section}] in {cfg_name}") logging.error(" (if it can be installed from binary packages)") diff --git a/ns/run_osmo_ns_dummy.sh b/ns/run_osmo_ns_dummy.sh index 5a8cc05..7e84e13 100755 --- a/ns/run_osmo_ns_dummy.sh +++ b/ns/run_osmo_ns_dummy.sh @@ -1,11 +1,4 @@ #!/bin/sh -ex -if [ -n "$OSMO_DEV_MAKE_DIR" ]; then - # Using osmo-dev: either with or without --podman - exec "$OSMO_DEV_MAKE_DIR"/libosmocore/utils/osmo-ns-dummy "$@" -fi - -# Using binary packages: as osmo-ns-dummy is not packaged it gets built by -# testenv/podman_install.py:from_source_osmo_ns_dummy() and symlinked to -# /usr/local/bin. -exec osmo-ns-dummy "$@" +# osmo-ns-dummy is always built with osmo-dev, even if using --binary-packages +exec "$OSMO_DEV_MAKE_DIR"/libosmocore/utils/osmo-ns-dummy "$@" diff --git a/ns/testenv_sgsn_sns.cfg b/ns/testenv_sgsn_sns.cfg index 8037d78..f499720 100644 --- a/ns/testenv_sgsn_sns.cfg +++ b/ns/testenv_sgsn_sns.cfg @@ -5,5 +5,6 @@ [osmo-ns-dummy] program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.sgsn.sns.cfg make=libosmocore +package=no copy=osmo-ns.sgsn.sns.cfg vty_port=4240 diff --git a/ns/testenv_sns.cfg b/ns/testenv_sns.cfg index c19dfba..c691c79 100644 --- a/ns/testenv_sns.cfg +++ b/ns/testenv_sns.cfg @@ -5,5 +5,6 @@ [osmo-ns-dummy] program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.sns.cfg make=libosmocore +package=no copy=osmo-ns.sns.cfg vty_port=4240 diff --git a/ns/testenv_udp.cfg b/ns/testenv_udp.cfg index 7d6e82b..c00c2f8 100644 --- a/ns/testenv_udp.cfg +++ b/ns/testenv_udp.cfg @@ -5,5 +5,6 @@ [osmo-ns-dummy] program=run_osmo_ns_dummy.sh -p 4240 -c osmo-ns.udp.cfg make=libosmocore +package=no copy=osmo-ns.udp.cfg vty_port=4240 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43777?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: I32b83957a90b30cca18d02e187984648bd69a891 Gerrit-Change-Number: 43777 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: podman_install: remove from_source()
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43778?usp=email ) Change subject: testenv: podman_install: remove from_source() ...................................................................... testenv: podman_install: remove from_source() All building from source is now done through osmo-dev. Change-Id: I4e4d16aa665b1c7d744c97f1699229a6607b4fe1 --- M _testenv/testenv.py M _testenv/testenv/podman_install.py 2 files changed, 3 insertions(+), 81 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/43778/1 diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 695a857..ffbff12 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -39,7 +39,6 @@ if osmo_dev_has_any_targets: testenv.osmo_dev.check_init_needed() - testenv.podman_install.init() if osmo_dev_has_any_targets: testenv.cmd.init_env_osmo_dev() if testenv.args.binary_repo: diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 3aff51e..dbadc9d 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -1,10 +1,7 @@ # Copyright 2024 sysmocom - s.f.m.c. GmbH # SPDX-License-Identifier: GPL-3.0-or-later import logging -import multiprocessing import os -import packaging.version -import re import shlex import string import subprocess @@ -12,27 +9,6 @@ import testenv.cmd import testenv.podman -git_dir = None -jobs = None - - -def init(): - global git_dir - global jobs - - # Make the git dir we clone into specific to the repository we build - # against. Replace ":" because the libtool scripts fail to escape it when - # setting LD_LIBRARY_PATH, leading to "cannot open shared object file" - # errors. - git_dir = os.path.join(testenv.args.cache, "git", f"build_against_{testenv.args.binary_repo}".replace(":", "_")) - - if testenv.args.jobs: - jobs = testenv.args.jobs - else: - jobs = multiprocessing.cpu_count() - - os.makedirs(git_dir, exist_ok=True) - def get_dbg_pkgs(dep): ret = [f"{dep}-dbg", f"{dep}-dbgsym"] @@ -99,61 +75,6 @@ testenv.cmd.run(["apt-get", "-q", "install", "-y", "--no-install-recommends"] + pkgs) -def show_commit(project, cwd): - cmd = ["git", "-P", "-C", cwd, "-c", "color.ui=always", "log", "-1", "--oneline"] - logging.info(f"{project}: showing current commit") - testenv.cmd.run(cmd, no_podman=True) - - -def clone_project(project): - git_dir_project = os.path.join(git_dir, project) - if os.path.exists(git_dir_project): - logging.debug(f"{project}: already cloned") - show_commit(project, git_dir_project) - return - - branch = "master" - url = f"https://gerrit.osmocom.org/{project}" - if testenv.args.binary_repo.endswith(":latest"): - ls_remote = testenv.cmd.run(["git", "ls-remote", "--tags", url], capture_output=True, text=True, no_podman=True) - tags = [] - pattern = re.compile("^\\d+\\.\\d+\\.\\d+$") - for line in ls_remote.stdout.split("\n"): - if "refs/tags/" in line: - tag = line.split("refs/tags/")[1].split("^")[0] - if pattern.match(tag): - tags += [tag] - tags.sort(key=packaging.version.Version, reverse=True) - branch = tags[0] - - logging.info(f"{project}: cloning {branch}") - testenv.cmd.run( - [ - "git", - "-c", - "advice.detachedHead=false", - "-C", - git_dir, - "clone", - "--depth", - "1", - "--branch", - branch, - url, - ], - no_podman=True, - ) - show_commit(project, git_dir_project) - - -def from_source(cfg, cfg_name, section): - logging.error(f"Can't install {section}! Fix this by either:") - logging.error(f"* Adding package= to [{section}] in {cfg_name}") - logging.error(" (if it can be installed from binary packages)") - logging.error("* Editing from_source() in testenv/podman_install.py") - sys.exit(1) - - def packages(cfg, cfg_name): packages = [] @@ -166,6 +87,8 @@ continue packages += section_data["package"].split(" ") else: - from_source(cfg, cfg_name, section) + logging.error(f"Missing package= line in [{section}] of {cfg_name}!") + logging.error("See _testenv/README.md for more information.") + sys.exit(1) apt_install(packages) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43778?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: I4e4d16aa665b1c7d744c97f1699229a6607b4fe1 Gerrit-Change-Number: 43778 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: run osmo-dev logic for --binary-repo too
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43772?usp=email ) Change subject: testenv: run osmo-dev logic for --binary-repo too ...................................................................... testenv: run osmo-dev logic for --binary-repo too Check if the testsuite we are running has any test components with package=no. If that is the case, check if osmo-dev is initialized and attempt to build the components with osmo-dev. The actual building needs further work done in follow-up patches. Related: OS#6638#note-12 Change-Id: I414e8e052c32acd8c2148b40eb5f75b57d1f293f --- M _testenv/testenv.py M _testenv/testenv/osmo_dev.py 2 files changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/43772/1 diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 01f6d95..5d6b043 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -35,7 +35,8 @@ testenv.testsrcdir_cfg.init() testenv.testenv_cfg.init() - if not testenv.args.binary_repo: + osmo_dev_has_any_targets = testenv.osmo_dev.has_any_targets() + if osmo_dev_has_any_targets: testenv.osmo_dev.check_init_needed() testenv.podman_install.init() @@ -52,7 +53,7 @@ testenv.testsuite.build() # Build all components first - if not testenv.args.binary_repo: + if osmo_dev_has_any_targets: for cfg_name, cfg in testenv.testenv_cfg.cfgs.items(): testenv.testenv_cfg.set_current(cfg_name) testenv.osmo_dev.init(cfg) diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 8f2fcfd..d67c5eb 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -59,11 +59,20 @@ continue if "make" in section_data and section_data["make"] != "no" and section_data["make"] not in ret: + if testenv.args.binary_repo and section_data.get("package", "no") != "no": + continue ret += [section_data["make"]] return ret +def has_any_targets(): + for cfg in testenv.testenv_cfg.cfgs.values(): + if get_targets(cfg): + return True + return False + + def init(cfg): extra_opts = [] if testenv.args.asan: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43772?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: I414e8e052c32acd8c2148b40eb5f75b57d1f293f Gerrit-Change-Number: 43772 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: podman: always mount osmo-dev dir
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43771?usp=email ) Change subject: testenv: podman: always mount osmo-dev dir ...................................................................... testenv: podman: always mount osmo-dev dir Prepare to be able to use osmo-dev for building some test components from source even if running with --binary-packages. This is needed for e.g. the bts testsuite, where we should always use master for both trxcon and osmo-trx-proxy, regardless of the osmo-bts version (nightly/latest/asan). These are part of the testsuite and not SUT. Related: OS#6638#note-12 Change-Id: Ie470be84dd7b9f34dfe8ed461710c1964b481984 --- M _testenv/testenv/podman.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/43771/1 diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 0293712..b7ed29d 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -264,11 +264,11 @@ "-e", "TESTENV_BINARY_REPO=1", ] - else: - cmd += [ - "--volume", - f"{osmo_dev_dir}:{osmo_dev_dir}", - ] + + cmd += [ + "--volume", + f"{osmo_dev_dir}:{osmo_dev_dir}", + ] if testenv.args.kernel: if not os.environ.get("TESTENV_NO_KVM") and os.path.exists("/dev/kvm"): -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43771?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: Ie470be84dd7b9f34dfe8ed461710c1964b481984 Gerrit-Change-Number: 43771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: testenv: cmd: init_env: split up by envtype
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43773?usp=email ) Change subject: testenv: cmd: init_env: split up by envtype ...................................................................... testenv: cmd: init_env: split up by envtype osmo-dev commands and components built with osmo-dev need to run with other environment variables (e.g. PATH, PKG_CONFIG_PATH) compared to test components that were installed from binary packages. Until now it was not possible to mix both, which means testenv would decide on startup which of the two it is and set everything accordingly. Split init_env and related variables up so we can do both at the same time. This is again needed to run the bts testsuite with binary packages except for osmo-trx-proxy and trxcon. This patch keeps the current behavior of using the binary_repo envtype if --binary-repo is set, and the osmo_dev envtype otherwise. The next patch makes mixing both possible. Related: OS#6638#note-12 Change-Id: Ib5532d8eab0a05d5390a92e88dcc67f5ab00eba9 --- M _testenv/testenv.py M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 3 files changed, 82 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/43773/1 diff --git a/_testenv/testenv.py b/_testenv/testenv.py index 5d6b043..695a857 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -40,7 +40,10 @@ testenv.osmo_dev.check_init_needed() testenv.podman_install.init() - testenv.cmd.init_env() + if osmo_dev_has_any_targets: + testenv.cmd.init_env_osmo_dev() + if testenv.args.binary_repo: + testenv.cmd.init_env_binary_repo() testenv.testdir.init() testenv.daemons.init() diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 4da2360..0e35d2a 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -8,8 +8,8 @@ import testenv import testenv.testsuite -env_extra = {} -install_dir = None +env_extra = {"binary_repo": {}, "osmo_dev": {}} +install_dir = {"binary_repo": None, "osmo_dev": None} make_dir = None # osmo-dev make dir version, bump when making incompatible changes make_dir_version = 4 @@ -21,62 +21,78 @@ return f"-{re.sub('[^a-zA-Z0-9]', '-', testenv.args.distro)}" -def init_env(): +def init_env_common(envtype): """Adjust "Environment variables set by testenv" in README.md when making - changes here.""" + changes here or in other init_env_* functions below.""" + global env_extra + + env_extra[envtype]["TESTENV_INSTALL_DIR"] = install_dir[envtype] + + env_extra[envtype]["CCACHE_DIR"] = testenv.args.ccache + env_extra[envtype]["TESTENV_CACHE_DIR"] = testenv.args.cache + env_extra[envtype]["TESTENV_SRC_DIR"] = testenv.src_dir + + env_extra[envtype]["TERM"] = os.environ.get("TERM", "dumb") + + if testenv.args.kernel == "debian": + env_extra[envtype]["TESTENV_QEMU_KERNEL"] = "debian" + elif testenv.args.kernel == "custom": + env_extra[envtype]["TESTENV_QEMU_KERNEL"] = testenv.custom_kernel_path + if testenv.args.kernel: + env_extra[envtype]["TESTENV_QEMU_SCRIPTS"] = os.path.join(testenv.data_dir, "scripts/qemu") + + +def init_env_binary_repo(): + global install_dir + + if testenv.args.podman: + install_dir["binary_repo"] = "/" + else: + install_dir["binary_repo"] = os.path.join(testenv.args.cache, "host/install") + + init_env_common("binary_repo") + + +def init_env_osmo_dev(): global env_extra global install_dir global make_dir + # install_dir if testenv.args.podman: - if testenv.args.binary_repo: - install_dir = "/" - else: - install_dir = os.path.join(testenv.args.cache, "podman/install") - if testenv.args.asan: - install_dir += "-asan" - install_dir += distro_cache_suffix() - else: - install_dir = os.path.join(testenv.args.cache, "host/install") - - if not testenv.args.binary_repo: - pkg_config_path = os.path.join(install_dir, "lib/pkgconfig") - if "PKG_CONFIG_PATH" in os.environ: - pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" - pkg_config_path += ":/usr/lib/pkgconfig" - - ld_library_path = os.path.join(install_dir, "lib") - if "LD_LIBRARY_PATH" in os.environ: - ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" - ld_library_path += ":/usr/lib" - - env_extra["PKG_CONFIG_PATH"] = pkg_config_path - env_extra["LD_LIBRARY_PATH"] = ld_library_path - - env_extra["CCACHE_DIR"] = testenv.args.ccache - env_extra["TESTENV_CACHE_DIR"] = testenv.args.cache - env_extra["TESTENV_SRC_DIR"] = testenv.src_dir - env_extra["TESTENV_INSTALL_DIR"] = install_dir - - env_extra["TERM"] = os.environ.get("TERM", "dumb") - - if not testenv.args.binary_repo: - if testenv.args.podman: - make_dir = os.path.join(testenv.args.cache, "podman", "make") - else: - make_dir = os.path.join(testenv.args.cache, "host", "make") - make_dir += str(make_dir_version) + install_dir["osmo_dev"] = os.path.join(testenv.args.cache, "podman/install") if testenv.args.asan: - make_dir += "-asan" - make_dir += distro_cache_suffix() - env_extra["OSMO_DEV_MAKE_DIR"] = make_dir + install_dir["osmo_dev"] += "-asan" + install_dir["osmo_dev"] += distro_cache_suffix() + else: + install_dir["osmo_dev"] = os.path.join(testenv.args.cache, "host/install") - if testenv.args.kernel == "debian": - env_extra["TESTENV_QEMU_KERNEL"] = "debian" - elif testenv.args.kernel == "custom": - env_extra["TESTENV_QEMU_KERNEL"] = testenv.custom_kernel_path - if testenv.args.kernel: - env_extra["TESTENV_QEMU_SCRIPTS"] = os.path.join(testenv.data_dir, "scripts/qemu") + # pkgconfig_path + pkg_config_path = os.path.join(install_dir["osmo_dev"], "lib/pkgconfig") + if "PKG_CONFIG_PATH" in os.environ: + pkg_config_path += f":{os.environ.get('PKG_CONFIG_PATH')}" + pkg_config_path += ":/usr/lib/pkgconfig" + env_extra["osmo_dev"]["PKG_CONFIG_PATH"] = pkg_config_path + + # ld_library_path + ld_library_path = os.path.join(install_dir["osmo_dev"], "lib") + if "LD_LIBRARY_PATH" in os.environ: + ld_library_path += f":{os.environ.get('LD_LIBRARY_PATH')}" + ld_library_path += ":/usr/lib" + env_extra["osmo_dev"]["LD_LIBRARY_PATH"] = ld_library_path + + # make_dir + if testenv.args.podman: + make_dir = os.path.join(testenv.args.cache, "podman", "make") + else: + make_dir = os.path.join(testenv.args.cache, "host", "make") + make_dir += str(make_dir_version) + if testenv.args.asan: + make_dir += "-asan" + make_dir += distro_cache_suffix() + env_extra["osmo_dev"]["OSMO_DEV_MAKE_DIR"] = make_dir + + init_env_common("osmo_dev") def exit_error_cmd(completed, error_msg): @@ -88,17 +104,17 @@ raise RuntimeError("shell command related error, find details right above this python trace") -def generate_env(env=None, podman=False): +def generate_env(env=None, podman=False, envtype="binary_repo"): env = env or {} - ret = dict(env_extra) + ret = dict(env_extra[envtype]) 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.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')}" - path += f":{os.path.join(install_dir, 'usr/bin')}" + if install_dir[envtype] and install_dir[envtype] != "/": + path += f":{os.path.join(install_dir[envtype], 'bin')}" + path += f":{os.path.join(install_dir[envtype], 'usr/bin')}" if podman: path += ":/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" @@ -121,8 +137,12 @@ return ret -def run(cmd, check=True, env=None, no_podman=False, stdin=subprocess.DEVNULL, **kwargs): +def run(cmd, check=True, env=None, no_podman=False, stdin=subprocess.DEVNULL, envtype=None, **kwargs): env = env or {} + + if not envtype: + envtype = "binary_repo" if getattr(testenv.args, "binary_repo", True) else "osmo_dev" + if not no_podman and testenv.args.podman: return testenv.podman.exec_cmd(cmd, check=check, env=env, **kwargs) @@ -131,7 +151,7 @@ # Set stdin to /dev/null by default so we can still capture ^C with testenv p = subprocess.run( cmd, - env=generate_env(env), + env=generate_env(env, envtype=envtype), shell=isinstance(cmd, str), stdin=stdin, check=False, diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index d67c5eb..65dbfcc 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -86,7 +86,7 @@ "--build-debug", "--no-make-check", "--install-prefix", - testenv.cmd.install_dir, + testenv.cmd.install_dir["osmo_dev"], "--make-dir", testenv.cmd.make_dir, "--no-ldconfig", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43773?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: Ib5532d8eab0a05d5390a92e88dcc67f5ab00eba9 Gerrit-Change-Number: 43773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/ttcn3: bts: set init-osmo-dev to true
by osmith 05 Oct '26

05 Oct '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43768?usp=email ) Change subject: jobs/ttcn3: bts: set init-osmo-dev to true ...................................................................... jobs/ttcn3: bts: set init-osmo-dev to true Initialize osmo-dev, so it can be used to build osmo-trx-proxy and trxcon from source. These are part of the testsuites and should always be at current master, even if we test latest binary packages. Related: OS#6638#note-12 Related: osmo-ttcn3-hacks Ifb6761b3fc15a29404dd0ea17b039fde30053d13 Change-Id: Id7521e9941f651608b39e8b7b2a6437a0e483022 --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/43768/1 diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 20b0b66..f9a6b10 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -29,6 +29,7 @@ - ttcn3-bts-test: # ~135 min testsuite: bts args: -b osmocom:nightly -c all + init-osmo-dev: true timer: 30 01 * * * node: build5-deb12build-ansible @@ -256,6 +257,7 @@ - ttcn3-bts-test-latest: # ~135 min testsuite: bts args: -b osmocom:latest -c all + init-osmo-dev: true timer: 30 03 * * * node: build4-deb12build-ansible @@ -476,6 +478,7 @@ - ttcn3-bts-test-io_uring: # ~135 min testsuite: bts args: -b osmocom:nightly --io-uring -c all + init-osmo-dev: true timer: 30 01 * * * node: build4-deb12build-ansible @@ -525,6 +528,7 @@ - ttcn3-bts-test-asan: # ~135 min testsuite: bts args: -b osmocom:nightly:asan -c all + init-osmo-dev: true timer: 30 03 * * * node: build5-deb12build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43768?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: Id7521e9941f651608b39e8b7b2a6437a0e483022 Gerrit-Change-Number: 43768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026