osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41216?usp=email )
Change subject: testenv: set PYTHONUNBUFFERED=1
......................................................................
testenv: set PYTHONUNBUFFERED=1
Prepare to run PyHSS, which needs this variable to be set or else no log
messages are printed. This problem exists with potentially all python
scripts that testenv would run, so set the env var for all commands.
Change-Id: I155f7c7bd9b985094e36fee6c6a2acfe556f580d
---
M _testenv/testenv/cmd.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/41216/1
diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py
index d637129..c14f694 100644
--- a/_testenv/testenv/cmd.py
+++ b/_testenv/testenv/cmd.py
@@ -106,6 +106,7 @@
ret["PATH"] = path
ret["HOME"] = os.environ.get("HOME")
+ ret["PYTHONUNBUFFERED"] = "1"
for var in env:
ret[var] = env[var]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41216?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: I155f7c7bd9b985094e36fee6c6a2acfe556f580d
Gerrit-Change-Number: 41216
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?usp=email )
Change subject: testenv: add --install-packages
......................................................................
testenv: add --install-packages
Add an option to quickly install packages in the container. This is
useful when making a new SUT run with osmo-ttcn3-hacks and figuring out
which packages need to be installed to make the build pass (without
rebuilding the whole container for each missing dependency). It can also
be used to quickly install additional debugging tools (strace, valgrind,
etc.). A cache for the deb files is already getting mounted inside the
container.
Change-Id: Ie54817e6c0334a224a612521beb378537c10d39d
---
M _testenv/testenv/__init__.py
M _testenv/testenv/podman.py
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/41215/1
diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py
index 44259c2..35338a4 100644
--- a/_testenv/testenv/__init__.py
+++ b/_testenv/testenv/__init__.py
@@ -210,6 +210,13 @@
action="store_true",
help="run an interactive shell before stopping daemons/container",
)
+ group.add_argument(
+ "-I",
+ "--install-packages",
+ action="append",
+ metavar="PACKAGE",
+ help="temporarily install debian packages in the container",
+ )
group = sub_run.add_argument_group("output options")
group.add_argument(
@@ -272,6 +279,9 @@
if args.kernel == "debian" and not args.podman:
raise NoTraceException("--kernel-debian requires --podman")
+ if args.install_packages and not args.podman:
+ raise NoTraceException("--install-packages requires --podman")
+
if args.kernel == "custom" and not os.path.exists(custom_kernel_path):
logging.critical(
"See _testenv/README.md for more information on downloading a pre-built kernel or building your own kernel."
diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py
index 678a0c1..2013699 100644
--- a/_testenv/testenv/podman.py
+++ b/_testenv/testenv/podman.py
@@ -285,6 +285,9 @@
if not os.path.exists(pkgcache):
exec_cmd(["apt-get", "-q", "update"])
+ if testenv.args.install_packages:
+ exec_cmd(["apt-get", "install", "-y", "--no-install-recommends"] + testenv.args.install_packages)
+
def check_titan_version():
version, _ = testenv.testenv_cfg.get_titan_version_first_cfg()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41215?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: Ie54817e6c0334a224a612521beb378537c10d39d
Gerrit-Change-Number: 41215
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Attention is currently required from: osmith.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: gen_makefile: support building PyHSS
......................................................................
gen_makefile: support building PyHSS
Support cloning and building PyHSS and "interesting" dependencies (that
we might want to patch while hacking on PyHSS). Other dependencies such
as sqlalchemy get installed via pip into a venv that is currently shared
by all python projects that osmo-dev can build. We can change this later
on to use multiple venvs or change the dependencies that get built from
source, if needed.
Python projects get built with "python3 -m build" into a whl file, and
then installed into the venv with "pip install".
The above works with projects that have a pyproject.toml. PyHSS
currently doesn't have this yet, but this patchset adds one:
https://github.com/nickvsnetworking/pyhss/pull/258
python-venv-requirements.txt in this patch is a combination of the
relevant dependencies from PyHSS and dependencies that get built from
source.
Related: OS#6862
Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae
---
M all.buildsystems
M all.deps
M all.urls
M gen_makefile.py
A python-venv-requirements.txt
5 files changed, 75 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/13/41213/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41213?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: If40c9e8ea07c9f6c7d379f6d5ff659e95165e4ae
Gerrit-Change-Number: 41213
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email )
Change subject: gen_makefile: erlang: fix missing clone and deps
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Fix for the CI error (unrelated): https://gerrit.osmocom.org/c/docker-playground/+/41214
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27
Gerrit-Change-Number: 41212
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Thu, 09 Oct 2025 12:37:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email )
Change subject: gen_makefile: erlang: fix missing clone and deps
......................................................................
gen_makefile: erlang: fix missing clone and deps
Add a dummy configure target for erlang that ensures the git clone and
building of dependencies is done before attempting to build erlang
projects. A dummy target is used to make the logic consistent with
autotools and meson.
This is in preparation for building python libraries for pyhss, which
will work similarly.
Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27
---
M gen_makefile.py
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/12/41212/1
diff --git a/gen_makefile.py b/gen_makefile.py
index 3885e10..e5f07ab 100755
--- a/gen_makefile.py
+++ b/gen_makefile.py
@@ -382,7 +382,10 @@
touch $@
'''
elif buildsystem == "erlang":
- return ""
+ return f'''
+.make.{proj}.configure: .make.{proj}.clone {deps_installed}
+ touch $@
+ '''
else:
assert False, f"unknown buildsystem: {buildsystem}"
@@ -414,7 +417,7 @@
'''
elif buildsystem == "erlang":
return f'''
-.make.{proj}.build: $({proj}_files)
+.make.{proj}.build: .make.{proj}.configure $({proj}_files)
@echo "\\n\\n\\n===== $@\\n"
set -x && \\
export REBAR_BASE_DIR="$$PWD/{build_proj}" && \\
--
To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/41212?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-dev
Gerrit-Branch: master
Gerrit-Change-Id: I627e78f9317d99755cfad5d5c8526c3b7f1b3a27
Gerrit-Change-Number: 41212
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>