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

[XS] Change in osmo-ci[master]: jobs/osmocom-build-tags…: set seccomp profile

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39914?usp=email ) Change subject: jobs/osmocom-build-tags…: set seccomp profile ...................................................................... jobs/osmocom-build-tags…: set seccomp profile Set the seccomp profile to make io_uring work in docker, so the regression test in libosmocore using io_uring does not fail. This happened to work previously on the build4 jenkins node because of an older docker version. Related: OS#6718#note-2 Change-Id: I9636ce30a0515b773be0581a8018bf1f62c1341c --- M jobs/osmocom-build-tags-against-master.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index b242103..6953dfd 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -26,6 +26,7 @@ - shell: | docker run \ --rm=true \ + --security-opt seccomp=$HOME/osmo-ci/_docker_playground/seccomp_profile.json \ -e PARALLEL_MAKE="-j8" \ -u build \ -v "$PWD:/build" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39914?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: I9636ce30a0515b773be0581a8018bf1f62c1341c Gerrit-Change-Number: 39914 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email ) Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... sccp: testenv: fix run with asan + latest binaries When running against osmocom:nightly:asan, build sccp_demo_user with --enable-sanitize. Otherwise this code is not running with asan and doesn't even start (as the libraries we link against are built with --enable-sanitize). When running against osmocom:latest, check out the latest tag instead of current master. Fixes: OS#5899 Change-Id: I5307125560694feae9f0978ebd27607a77ed8675 --- M _testenv/testenv/podman_install.py 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/podman_install.py b/_testenv/testenv/podman_install.py index 2c5ae5a..a27abd8 100644 --- a/_testenv/testenv/podman_install.py +++ b/_testenv/testenv/podman_install.py @@ -20,7 +20,12 @@ global sccp_dir global jobs - git_dir = os.path.join(testenv.args.cache, "git") + # 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(":", "_")) + sccp_dir = os.path.join(git_dir, "libosmo-sigtran") jobs = multiprocessing.cpu_count() + 1 @@ -97,6 +102,14 @@ logging.debug("libosmo-sigtran: already cloned") return + branch = "master" + if testenv.args.binary_repo.endswith(":latest"): + ls_remote = testenv.cmd.run( + ["git", "ls-remote", "--tags", "https://gerrit.osmocom.org/libosmo-sigtran"], capture_output=True, text=True + ) + branch = ls_remote.stdout.split("\n")[-2].split("refs/tags/")[1].split("^")[0] + + logging.info(f"libosmo-sigtran: cloning {branch}") testenv.cmd.run( [ "git", @@ -105,6 +118,8 @@ "clone", "--depth", "1", + "--branch", + branch, "https://gerrit.osmocom.org/libosmo-sigtran", ] ) @@ -126,7 +141,12 @@ clone_libosmo_sigtran() logging.info("Building sccp_demo_user") testenv.cmd.run(["autoreconf", "-fi"], cwd=sccp_dir) - testenv.cmd.run(["./configure"], 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"), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?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: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: remove TESTENV_GIT_DIR

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39936?usp=email ) Change subject: testenv: remove TESTENV_GIT_DIR ...................................................................... testenv: remove TESTENV_GIT_DIR This variable is not used anymore, remove it. Change-Id: Iabb9fa3b9b393b2cb7f18fb877746e5d1e510e63 --- M _testenv/testenv/cmd.py 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 864b8b9..df57b79 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -41,9 +41,7 @@ env_extra["TERM"] = os.environ.get("TERM", "dumb") - if testenv.args.binary_repo: - env_extra["TESTENV_GIT_DIR"] = testenv.podman_install.git_dir - else: + if not testenv.args.binary_repo: if testenv.args.podman: env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") else: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39936?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: Iabb9fa3b9b393b2cb7f18fb877746e5d1e510e63 Gerrit-Change-Number: 39936 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: remove TESTENV_GIT_DIR

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39936?usp=email ) Change subject: testenv: remove TESTENV_GIT_DIR ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39936?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: Iabb9fa3b9b393b2cb7f18fb877746e5d1e510e63 Gerrit-Change-Number: 39936 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 09:57:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sccp: testenv: fix run with asan + latest binaries

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?usp=email ) Change subject: sccp: testenv: fix run with asan + latest binaries ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39934?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: I5307125560694feae9f0978ebd27607a77ed8675 Gerrit-Change-Number: 39934 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 09:56:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: repo-install-test: ignore bladerf packages

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39937?usp=email ) Change subject: repo-install-test: ignore bladerf packages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39937?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9e40c83f44cbbcc500967a89bb9fbafe17849eae Gerrit-Change-Number: 39937 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 09:53:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/osmocom-build-tags…: set seccomp profile

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39914?usp=email ) Change subject: jobs/osmocom-build-tags…: set seccomp profile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39914?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9636ce30a0515b773be0581a8018bf1f62c1341c Gerrit-Change-Number: 39914 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 09:53:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites: run sccp with testenv

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39935?usp=email ) Change subject: jobs/ttcn3-testsuites: run sccp with testenv ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39935?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70a2289820c3ef50aeb3499d36245121387c0475 Gerrit-Change-Number: 39935 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Apr 2025 09:52:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in pysim[master]: saip-tool: add ProfileElement class for application PE

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/39883?usp=email ) Change subject: saip-tool: add ProfileElement class for application PE ...................................................................... saip-tool: add ProfileElement class for application PE The application profile element has no ProfileElement class yet, so let's create a ProfileElementApplication class and move the existing extract-apps code into a method of ProfileElementApplication. Change-Id: Iaa43036d388fbf1714c53cab1fc21092c4667a21 --- M contrib/saip-tool.py M pySim/esim/saip/__init__.py 2 files changed, 26 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/saip-tool.py b/contrib/saip-tool.py index 64aba93..4747ab9 100755 --- a/contrib/saip-tool.py +++ b/contrib/saip-tool.py @@ -19,14 +19,12 @@ import sys import argparse import logging -import zipfile from pathlib import Path as PlPath from typing import List from osmocom.utils import h2b, b2h, swap_nibbles from pySim.esim.saip import * from pySim.esim.saip.validation import CheckBasicStructure -from pySim import javacard from pySim.pprint import HexBytesPrettyPrinter pp = HexBytesPrettyPrinter(indent=4,width=500) @@ -231,16 +229,9 @@ apps = pes.pe_by_type.get('application', []) for app_pe in apps: package_aid = b2h(app_pe.decoded['loadBlock']['loadPackageAID']) - fname = os.path.join(opts.output_dir, '%s-%s.%s' % (pes.iccid, package_aid, opts.format)) - load_block_obj = app_pe.decoded['loadBlock']['loadBlockObject'] print("Writing Load Package AID: %s to file %s" % (package_aid, fname)) - if opts.format == 'ijc': - with open(fname, 'wb') as f: - f.write(load_block_obj) - else: - with io.BytesIO(load_block_obj) as f, zipfile.ZipFile(fname, 'w') as z: - javacard.ijc_to_cap(f, z, package_aid) + app_pe.to_file(fname) def do_tree(pes:ProfileElementSequence, opts): pes.mf.print_tree() diff --git a/pySim/esim/saip/__init__.py b/pySim/esim/saip/__init__.py index 64ea7cb..d6b41ba 100644 --- a/pySim/esim/saip/__init__.py +++ b/pySim/esim/saip/__init__.py @@ -22,6 +22,8 @@ from typing import Tuple, List, Optional, Dict, Union from collections import OrderedDict import asn1tools +import zipfile +from pySim import javacard from osmocom.utils import b2h, h2b, Hexstr from osmocom.tlv import BER_TLV_IE, bertlv_parse_tag, bertlv_parse_len from osmocom.construct import build_construct, parse_construct, GreedyInteger @@ -506,7 +508,7 @@ # TODO: cdmaParameter 'securityDomain': ProfileElementSD, 'rfm': ProfileElementRFM, - # TODO: application + 'application': ProfileElementApplication, # TODO: nonStandard 'end': ProfileElementEnd, 'mf': ProfileElementMF, @@ -1087,6 +1089,28 @@ 'uiccToolkitApplicationSpecificParametersField': h2b('01000001000000020112036C756500'), } +class ProfileElementApplication(ProfileElement): + """Class representing an application ProfileElement.""" + type = 'application' + + def __init__(self, decoded: Optional[dict] = None, **kwargs): + super().__init__(decoded, **kwargs) + + def to_file(self, filename:str): + """Write loadBlockObject contents of application ProfileElement to a .cap or .ijc file.""" + + load_package_aid = b2h(self.decoded['loadBlock']['loadPackageAID']) + load_block_object = self.decoded['loadBlock']['loadBlockObject'] + + if filename.lower().endswith('.cap'): + with io.BytesIO(load_block_object) as f, zipfile.ZipFile(filename, 'w') as z: + javacard.ijc_to_cap(f, z, load_package_aid) + elif filename.lower().endswith('.ijc'): + with open(filename, 'wb') as f: + f.write(load_block_object) + else: + raise ValueError('Invalid file type, file must either .cap or .ijc') + class ProfileElementRFM(ProfileElement): type = 'rfm' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa43036d388fbf1714c53cab1fc21092c4667a21 Gerrit-Change-Number: 39883 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

4 months, 1 week

1
0
0 0

[XS] Change in libosmocore[master]: vty: cpu_sched_vty.c: remove tdef references

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/39939?usp=email ) Change subject: vty: cpu_sched_vty.c: remove tdef references ...................................................................... vty: cpu_sched_vty.c: remove tdef references Change-Id: Ic2f3a7553ffbb964036e81f0f7c67ad2e0c34b20 --- M src/vty/cpu_sched_vty.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/39/39939/1 diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 60fe930..4f3eeb1 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -45,12 +45,10 @@ #include <osmocom/vty/vty.h> #include <osmocom/vty/command.h> -#include <osmocom/vty/tdef_vty.h> -#include <osmocom/core/tdef.h> #include <osmocom/core/fsm.h> #include <osmocom/core/linuxlist.h> -/*! \addtogroup Tdef_VTY +/*! \addtogroup cpu_sched_vty * * CPU Scheduling related VTY API. * -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39939?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic2f3a7553ffbb964036e81f0f7c67ad2e0c34b20 Gerrit-Change-Number: 39939 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025