March 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-pcu[master]: fix pcu_l1if_tx_pch_dt(): use OSMO_STRLCPY_ARRAY
by fixeria 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/31955 to look at the new patch set (#3). Change subject: fix pcu_l1if_tx_pch_dt(): use OSMO_STRLCPY_ARRAY ...................................................................... fix pcu_l1if_tx_pch_dt(): use OSMO_STRLCPY_ARRAY strcpy() is an unsafe function, it may overflow the destination buffer. Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Fixes: CID#310961 --- M src/pcu_l1_if.cpp 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/55/31955/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Gerrit-Change-Number: 31955 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-MessageType: newpatchset

1 0

[M] Change in osmocom-bb[master]: layer23: implement Rx/Tx API for GPRS related messages
by laforge 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31571 ) Change subject: layer23: implement Rx/Tx API for GPRS related messages ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I87950e893ef96ff8328f43f1548111aa9f66439b Gerrit-Change-Number: 31571 Gerrit-PatchSet: 7 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: Fri, 17 Mar 2023 12:11:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmocom-bb[master]: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation
by laforge 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30743 ) Change subject: {trxcon,virt_phy}: shared GPRS L1 (MAC) implementation ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9567d64f9d00262e36147e8d7e541e5e246bda5f Gerrit-Change-Number: 30743 Gerrit-PatchSet: 11 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 Mar 2023 12:10:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: route L1CTL prims to/from libosmo-gprs-rlcmac
by laforge 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31572 ) Change subject: modem: route L1CTL prims to/from libosmo-gprs-rlcmac ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I38e9a686f8edc3fe55f961d75e68602c33bbbaaf Gerrit-Change-Number: 31572 Gerrit-PatchSet: 8 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: Fri, 17 Mar 2023 12:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: Limit maximum number of open file descriptors to overcome titan bug
by fixeria 17 Mar '23

17 Mar '23

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31944 ) Change subject: Limit maximum number of open file descriptors to overcome titan bug ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: BTW, this might be related to https://osmocom.org/issues/4565. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iafa8cfa769386e63e1d879d8cce6e24b244d9a6f Gerrit-Change-Number: 31944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 Mar 2023 12:08:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy()
by pespin 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31955 ) Change subject: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: This could be OSMO_STRLCPY_ARRAY() -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Gerrit-Change-Number: 31955 Gerrit-PatchSet: 2 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: Fri, 17 Mar 2023 12:07:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: add --allow-unknown-package
by laforge 17 Mar '23

17 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31935 ) Change subject: obs: add --allow-unknown-package ...................................................................... obs: add --allow-unknown-package Prepare to add a wireshark package. It will be in its own osmocom:wireshark repository, and not in osmocom:nightly, :latest, :master, so it's not added to lib/config.py. Move lib.set_args() before parse_packages(), so the latter is able to use lib.args.allow_unknown_package. Related: OS#2537 Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 --- M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 2 files changed, 24 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 675bcec..964b298 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -27,6 +27,9 @@ " other feeds build their respective branch.", metavar="FEED", default="nightly", choices=lib.config.feeds) + parser.add_argument("-a", "--allow-unknown-package", action="store_true", + help="don't complain if the name of the package is not" + " stored in lib/config.py") parser.add_argument("-b", "--git-branch", help="instead of using a branch" " based on the feed, checkout this git branch", metavar="BRANCH", default=None) @@ -102,6 +105,9 @@ if os.path.basename(package_cfg) == package: return package_cfg + if lib.args.allow_unknown_package: + return package + print(f"ERROR: unknown package: {package}") print("See packages_osmocom and packages_other in obs/lib/config.py") exit(1) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 24dba8f..da796ad 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -194,9 +194,8 @@ help="package name, e.g. libosmocore or open5gs," " default is all packages") args = parser.parse_args() - packages = parse_packages(args.package) - lib.set_args(args) + packages = parse_packages(args.package) if args.docker: lib.docker.run_in_docker_and_exit("update_obs_project.py", True) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 Gerrit-Change-Number: 31935 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: jobs: add Osmocom_OBS_wireshark
by laforge 17 Mar '23

17 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31937 ) Change subject: jobs: add Osmocom_OBS_wireshark ...................................................................... jobs: add Osmocom_OBS_wireshark Add a nightly jenkins job that does the following: * Clone Wireshark from upstream * Merge several Osmocom branches on top * Build a source package * Submit it to the osmocom:wireshark OBS project Related: OS#2537 Change-Id: Ifb49c5cb22a4de0da30a920e5450a27172b11d73 --- A jobs/osmocom-obs-wireshark.yml A scripts/obs/update_obs_wireshark.sh 2 files changed, 103 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/osmocom-obs-wireshark.yml b/jobs/osmocom-obs-wireshark.yml new file mode 100644 index 0000000..7bf7ccd --- /dev/null +++ b/jobs/osmocom-obs-wireshark.yml @@ -0,0 +1,38 @@ +--- +- project: + name: Osmocom_OBS + jobs: + - Osmocom_OBS_wireshark + +- job: + name: 'Osmocom_OBS_wireshark' + project-type: freestyle + defaults: global + description: | + See <a href="https://osmocom.org/issues/2537">OS#2537</a> + for more information. + node: obs + parameters: + - string: + name: BRANCH + description: osmo-ci.git branch + default: 'master' + builders: + - shell: | + export PYTHONUNBUFFERED=1 + ./scripts/obs/update_obs_wireshark.sh osmocom:wireshark + scm: + - git: + branches: + - '$BRANCH' + url: https://gerrit.osmocom.org/osmo-ci + git-config-name: 'Jenkins Builder' + git-config-email: 'jenkins(a)osmocom.org' + wipe-workspace: true + triggers: + - timed: "H 05 * * *" + + publishers: + - email: + notify-every-unstable-build: true + recipients: 'jenkins-notifications(a)lists.osmocom.org' diff --git a/scripts/obs/update_obs_wireshark.sh b/scripts/obs/update_obs_wireshark.sh new file mode 100755 index 0000000..70a0392 --- /dev/null +++ b/scripts/obs/update_obs_wireshark.sh @@ -0,0 +1,49 @@ +#!/bin/sh -e +DIR="$(realpath "$(dirname "$0")")" +PROJ="$1" + +BRANCHES=" + osmith/deb-packaging + laforge/amr-2023 + laforge/doc-fixes + osmocom/qcdiag + laforge/rspro +" + +prepare_git_repo() { + cd "$DIR" + if ! [ -d _cache/wireshark ]; then + mkdir -p _cache + git -C _cache clone https://gitlab.com/wireshark/wireshark.git + git -C _cache/wireshark remote add osmocom https://gitea.osmocom.org/osmocom/wireshark + fi + + cd _cache/wireshark + git fetch --all + git clean -fdx + git checkout -f -B osmocom/all-in-one origin/master + + for b in $BRANCHES; do + git merge --no-edit "osmocom/$b" + done +} + +update_obs_project() { + cd "$DIR" + ./update_obs_project.py \ + --apiurl obs.osmocom.org \ + --docker \ + --allow-unknown-package \ + --git-skip-checkout \ + --git-skip-fetch \ + --version-append "~osmocom" \ + "$PROJ" \ + wireshark +} + +set -x +prepare_git_repo + +if [ -n "$PROJ" ]; then + update_obs_project +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifb49c5cb22a4de0da30a920e5450a27172b11d73 Gerrit-Change-Number: 31937 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: obs: add --version-append argument
by laforge 17 Mar '23

17 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31936 ) Change subject: obs: add --version-append argument ...................................................................... obs: add --version-append argument Related: OS#2537 Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 --- M scripts/obs/lib/__init__.py M scripts/obs/lib/srcpkg.py 2 files changed, 20 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 964b298..9682b19 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -63,6 +63,10 @@ parser.add_argument("-v", "--verbose", action="store_true", help="always print shell commands and their output," " instead of only printing them on error") + parser.add_argument("-e", "--version-append", + help="add a string at the end of the version, e.g." + " '~osmocom' for the wireshark package to" + " indicate that it is the version from our repo") def set_cmds_verbose(new_val): diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 5dbc862..a58ae15 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -136,15 +136,21 @@ def build(project, gerrit_id=0): conflict_version = lib.args.conflict_version feed = lib.args.feed + version_append = lib.args.version_append + lib.git.clone(project) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) else: checkout_for_feed(project) + version = get_version_for_feed(project) + if version_append: + version += version_append epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version + has_rpm_spec = lib.rpm_spec.get_spec_in_path(project) is not None print(f"{project}: building source package {version_epoch}") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 Gerrit-Change-Number: 31936 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: jobs: add Osmocom_OBS_wireshark
by laforge 17 Mar '23

17 Mar '23

Attention is currently required from: osmith, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31937 ) Change subject: jobs: add Osmocom_OBS_wireshark ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifb49c5cb22a4de0da30a920e5450a27172b11d73 Gerrit-Change-Number: 31937 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 17 Mar 2023 12:07:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0