- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: pull trixie image
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40951?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: pull trixie image ...................................................................... jobs/ttcn3-testsuites-testenv: pull trixie image Change-Id: Id6502c8fdad17feca9e3bc22f8b80d238fad9a8d --- M jobs/ttcn3-testsuites-testenv.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites-testenv.yml b/jobs/ttcn3-testsuites-testenv.yml index 542dcf4..4140ddd 100644 --- a/jobs/ttcn3-testsuites-testenv.yml +++ b/jobs/ttcn3-testsuites-testenv.yml @@ -592,7 +592,7 @@ which-build: last-successful stable: true - shell: |- - DISTRO="debian:bookworm" + DISTRO="debian:trixie" IMAGE="registry.osmocom.org/osmocom-build/"$(echo "$DISTRO" | tr : -)"-osmo-ttcn3-testenv" KERNEL="{kernel}" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id6502c8fdad17feca9e3bc22f8b80d238fad9a8d Gerrit-Change-Number: 40951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: add debian:trixie
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?usp=email ) Change subject: testenv: add debian:trixie ...................................................................... testenv: add debian:trixie Change-Id: Ib62851960724c17f9adddf54a2fc39adef911d32 --- M _testenv/testenv/__init__.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index f0d6629..f23f1f6 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -25,6 +25,7 @@ # from the binary repository distros_repodirs = { "debian:bookworm": "Debian_12", + "debian:trixie": "Debian_13", } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40947?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: Ib62851960724c17f9adddf54a2fc39adef911d32 Gerrit-Change-Number: 40947 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: enable_binary_repo: configure apt pin
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?usp=email ) Change subject: testenv: enable_binary_repo: configure apt pin ...................................................................... testenv: enable_binary_repo: configure apt pin Add an apt-pin to ensure packages from the Osmocom repositories get preferred over Debian's packages. I just ran into this with osmo-mgw, where we have 1.4.0 in osmocom:latest and Debian 13 has 1.14.0+dfsg1-2, which counts as higher version. This results in the wrong package being selected, and also in an error later on when trying to install related debug packages from our repository: The following packages have unmet dependencies: osmo-mgw-dbgsym : Depends: osmo-mgw (= 1.14.0) but 1.14.0+dfsg1-2 is to be installed Change-Id: I3a45de277bbd5299c8b840680b56b52a8731caa4 --- M _testenv/testenv/podman.py 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index bc45b3a..678a0c1 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -301,16 +301,23 @@ def enable_binary_repo(): + # Add the binary repository config = "deb [signed-by=/obs.key]" config += " https://downloads.osmocom.org/packages/" config += testenv.args.binary_repo.replace(":", ":/") config += "/" config += testenv.distros_repodirs[distro] config += "/ ./" - path = "/etc/apt/sources.list.d/osmocom.list" - exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + + # Add an apt-pin to prefer its packages + config = "Package: *\n" + config += 'Pin: origin "downloads.osmocom.org"\n' + config += "Pin-Priority: 1100\n" + path = "/etc/apt/preferences.d/osmocom-apt-pin" + exec_cmd(["sh", "-c", f"echo {shlex.quote(config)} > {path}"]) + exec_cmd(["apt-get", "-q", "update"]) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40948?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: I3a45de277bbd5299c8b840680b56b52a8731caa4 Gerrit-Change-Number: 40948 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: set default distro to debian:trixie
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40949?usp=email ) Change subject: testenv: set default distro to debian:trixie ...................................................................... testenv: set default distro to debian:trixie Related: OS#6826 Change-Id: Ib9c5dafaa7b17e435f61fbedfd92393c0a767f34 --- M _testenv/testenv/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index f23f1f6..7a453a5 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -15,7 +15,7 @@ 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") -distro_default = "debian:bookworm" +distro_default = "debian:trixie" cache_dir_default = os.path.join(os.path.expanduser("~/.cache"), "osmo-ttcn3-testenv") ccache_dir_default = os.path.join(cache_dir_default, "ccache") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40949?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: Ib9c5dafaa7b17e435f61fbedfd92393c0a767f34 Gerrit-Change-Number: 40949 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: init podman: add --distro arg
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40942?usp=email ) Change subject: testenv: init podman: add --distro arg ...................................................................... testenv: init podman: add --distro arg Allow building the podman image for another distribution. This was mostly implemented already, but due to the missing --distro argument for "./testenv.py init podman" it could not be used yet. Change-Id: Iff59b5d403e88046a3f98438394e1e02a36e7c0a --- M _testenv/testenv/__init__.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: 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/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 3de7f0c..49f6368 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -69,6 +69,12 @@ action="store_true", help="build image even if it is up-to-date", ) + sub_podman.add_argument( + "-d", + "--distro", + default=distro_default, + help=f"distribution for podman (default: {distro_default})", + ) sub_run = sub.add_parser("run", help="build components and run a testsuite") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40942?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: Iff59b5d403e88046a3f98438394e1e02a36e7c0a Gerrit-Change-Number: 40942 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: debian 13: fix installing libgcc
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40943?usp=email ) Change subject: testenv: debian 13: fix installing libgcc ...................................................................... testenv: debian 13: fix installing libgcc Use a wildcard to install the proper libgcc-*-dev package (libgcc-11-dev for debian bookworm, libgcc-13-dev for trixie). Change-Id: I9992d8cf8cd68a9e3ec9178909e0766dbd5d12ad --- M _testenv/data/podman/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 961785b..99cc12a 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -46,7 +46,7 @@ libdbd-sqlite3 \ libdbi-dev \ libelf-dev \ - libgcc-11-dev \ + libgcc-*-dev \ libgcrypt-dev \ libgnutls28-dev \ libidn11-dev \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40943?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: I9992d8cf8cd68a9e3ec9178909e0766dbd5d12ad Gerrit-Change-Number: 40943 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: use separate cache dirs per distro
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40941?usp=email ) Change subject: testenv: use separate cache dirs per distro ...................................................................... testenv: use separate cache dirs per distro Change-Id: I0f1c05bb4d8cfababc24477976abf8a0baa3daba --- M _testenv/testenv/cmd.py M _testenv/testenv/podman.py M _testenv/testenv/testsuite.py 3 files changed, 14 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index afe9003..6f50677 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -3,6 +3,7 @@ import logging import os import os.path +import re import subprocess import testenv import testenv.testsuite @@ -14,6 +15,12 @@ make_dir_version = 3 +def distro_cache_suffix(): + if not testenv.args.podman or testenv.args.distro == "debian:bookworm": + return "" + return f"-{re.sub('[^a-zA-Z0-9]', '-', testenv.args.distro)}" + + def init_env(): """Adjust "Environment variables set by testenv" in README.md when making changes here.""" @@ -26,6 +33,7 @@ install_dir = "/" else: install_dir = os.path.join(testenv.args.cache, "podman/install") + install_dir += distro_cache_suffix() else: install_dir = os.path.join(testenv.args.cache, "host/install") @@ -58,6 +66,7 @@ make_dir += str(make_dir_version) if testenv.args.asan: make_dir += "-asan" + make_dir += distro_cache_suffix() env_extra["OSMO_DEV_MAKE_DIR"] = make_dir if testenv.args.kernel == "debian": diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 77a728f..8ce6766 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -102,8 +102,9 @@ global apt_dir_var_lib global run_shell_on_stop - apt_dir_var_cache = os.path.join(testenv.args.cache, "podman", "var-cache-apt") - apt_dir_var_lib = os.path.join(testenv.args.cache, "podman", "var-lib-apt") + suffix = testenv.cmd.distro_cache_suffix() + apt_dir_var_cache = os.path.join(testenv.args.cache, "podman", f"var-cache-apt{suffix}") + apt_dir_var_lib = os.path.join(testenv.args.cache, "podman", f"var-lib-apt{suffix}") os.makedirs(apt_dir_var_cache, exist_ok=True) os.makedirs(apt_dir_var_lib, exist_ok=True) diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 8d89ad8..0e00b0f 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -41,7 +41,8 @@ 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}") + suffix = testenv.cmd.distro_cache_suffix() + builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}{suffix}") path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] builddir_env = { "BUILDDIR": builddir, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40941?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: I0f1c05bb4d8cfababc24477976abf8a0baa3daba Gerrit-Change-Number: 40941 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: debian 13: fix installing eclipse-titan
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40944?usp=email ) Change subject: testenv: debian 13: fix installing eclipse-titan ...................................................................... testenv: debian 13: fix installing eclipse-titan Use the current debian version instead of hardcoding Debian_12. Change-Id: I56be4e3e72a1ad4590e904f9a48d90aa635c9980 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 8 deletions(-) Approvals: laforge: 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 Jenkins Builder: Verified diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 99cc12a..91569ee 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -2,10 +2,6 @@ ARG DISTRO=debian:12 FROM ${REGISTRY}/${DISTRO} -# Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" - # Copy from common dir COPY obs.key /obs.key @@ -146,11 +142,11 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes -RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list -ADD $OSMOCOM_REPO/Release /tmp/Release +# Add eclipse-titan from osmocom:latest RUN set -x && \ + export DEBVER="$(grep ^VERSION_ID /etc/os-release | cut -d '"' -f 2)" && \ + export OSMOCOM_REPO="https://downloads.osmocom.org/packages/osmocom:/latest/Debian_$DEBVER/" && \ + echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" >/etc/apt/sources.list.d/osmocom-latest.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ eclipse-titan-optdir-9.0.0 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40944?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: I56be4e3e72a1ad4590e904f9a48d90aa635c9980 Gerrit-Change-Number: 40944 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: check for --distro without --podman
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40945?usp=email ) Change subject: testenv: check for --distro without --podman ...................................................................... testenv: check for --distro without --podman The --distro option only makes sense with --podman, complain if it is used without --podman. Change-Id: I1b7b26320c65d498a1e812f85f0b98eda95be783 --- M _testenv/testenv/__init__.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/__init__.py b/_testenv/testenv/__init__.py index 49f6368..3a92ff0 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -187,7 +187,7 @@ group.add_argument( "-d", "--distro", - default=distro_default, + default=None, # override in set_args_defaults help=f"distribution for podman (default: {distro_default})", ) group.add_argument( @@ -249,6 +249,9 @@ if args.binary_repo and not args.podman: raise NoTraceException("--binary-repo requires --podman") + if args.distro and not args.podman: + raise NoTraceException("--distro requires --podman") + if args.kernel == "debian" and not args.podman: raise NoTraceException("--kernel-debian requires --podman") @@ -263,9 +266,17 @@ raise NoTraceException(f"testsuite dir not found: {testsuite_dir}") +def set_args_defaults(): + """Some defaults are set later, e.g. after verifying that --distro is not + being used without --podman.""" + if args.distro is None: + args.distro = distro_default + + def init_args(): parse_args() verify_args_run() + set_args_defaults() class ColorFormatter(logging.Formatter): -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40945?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: I1b7b26320c65d498a1e812f85f0b98eda95be783 Gerrit-Change-Number: 40945 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: check value of --distro early
by osmith 27 Aug '25

27 Aug '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40946?usp=email ) Change subject: testenv: check value of --distro early ...................................................................... testenv: check value of --distro early Make sure that the value for --distro is supported early on, instead of only checking it if --binary-repo is set while trying to add the binary repository. Change-Id: I37493f26d71e70a19f4a19b3bbda972c03c84905 --- M _testenv/testenv/__init__.py M _testenv/testenv/podman.py 2 files changed, 10 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: 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 3a92ff0..f0d6629 100644 --- a/_testenv/testenv/__init__.py +++ b/_testenv/testenv/__init__.py @@ -21,6 +21,12 @@ log_prefix = "[testenv]" +# Mapping of supported distros (docker/podman image names) and repository dirs +# from the binary repository +distros_repodirs = { + "debian:bookworm": "Debian_12", +} + def resolve_testsuite_name_alias(name): mapping = { @@ -252,6 +258,9 @@ if args.distro and not args.podman: raise NoTraceException("--distro requires --podman") + if args.distro and args.distro not in distros_repodirs: + raise NoTraceException(f"--distro must be one of {', '.join(distros_repodirs)}") + if args.kernel == "debian" and not args.podman: raise NoTraceException("--kernel-debian requires --podman") diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 8ce6766..bc45b3a 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -300,18 +300,12 @@ sys.exit(1) -def distro_to_repo_dir(distro): - if distro == "debian:bookworm": - return "Debian_12" - raise RuntimeError(f"Can't translate distro {distro} to repo_dir!") - - def enable_binary_repo(): config = "deb [signed-by=/obs.key]" config += " https://downloads.osmocom.org/packages/" config += testenv.args.binary_repo.replace(":", ":/") config += "/" - config += distro_to_repo_dir(distro) + config += testenv.distros_repodirs[distro] config += "/ ./" path = "/etc/apt/sources.list.d/osmocom.list" -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40946?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: I37493f26d71e70a19f4a19b3bbda972c03c84905 Gerrit-Change-Number: 40946 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log