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

[M] Change in libosmo-gprs[master]: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere
by pespin 28 Jul '23

28 Jul '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 ) Change subject: rlcmac: Use enum gprs_rlcmac_radio_priority internally everywhere ...................................................................... Patch Set 2: (2 comments) File src/rlcmac/gre.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33981/comment/55624109_5cefb879 PS2, Line 226: ll_pdu_len, get_value_string(osmo_gprs_rlcmac_llc_sapi_names, sapi), radio_prio + 1); > I wonder if it made sense to adjust the enum in types_private.h: […] No, that enum is encoding transmitted in the wire, cannot be changed. Furthermore, it's more confortable having them 0..3 since we are indexing arrays in llc_queue based on that. File tests/rlcmac/rlcmac_prim_test.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33981/comment/396c4d1a_7c6b334a PS2, Line 991: 2 > 2 instead of 1 on purpose? Yes, in general SNDCP has lower prio than GMM. It doesn't matter much here, but then we also test other values here. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If2d1946522bc4a1c19d65acb23605f1a3f05ab45 Gerrit-Change-Number: 33981 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Jul 2023 11:40:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: Reimplement ust_service_activate and ust_service_deactivate for USIM/...
by laforge 28 Jul '23

28 Jul '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33985 ) Change subject: Reimplement ust_service_activate and ust_service_deactivate for USIM/EF.UST ...................................................................... Patch Set 1: (1 comment) File pySim/ts_31_102_telecom.py: https://gerrit.osmocom.org/c/pysim/+/33985/comment/e63cd83b_adf6045a PS1, Line 143: I guess a library function also shouldn't print hex-dumps to the command line. This looks more like a left-over debug printf? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Gerrit-Change-Number: 33985 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 28 Jul 2023 10:58:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: tests: add test script for pySim-trace
by dexter 28 Jul '23

28 Jul '23

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33963 ) Change subject: tests: add test script for pySim-trace ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > this is good for a very basic test, but *not raising an exception* is of course a rather vague "pass […] I think matching the number of APDUs is a good idea. (Unfortunately I already spotted discrepancies between the number of packets shown in Wireshark and the number of APDUs we currently get - but the end looks good.) Comparing the output might be prone to produce false alarms from time to time. Fortunately the test does not need any special environment, so it should be easy to manage. I would say we should try it. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icfabfa7c59968021eef0399991bd05b92467d8d2 Gerrit-Change-Number: 33963 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 28 Jul 2023 09:30:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: README.md: Add note about pySim-trace.py dependencies
by dexter 28 Jul '23

28 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33994 ) Change subject: README.md: Add note about pySim-trace.py dependencies ...................................................................... README.md: Add note about pySim-trace.py dependencies Related: OS#6094 Change-Id: I2e03f9c827bd6ee73891bba34bd2f2efe3ded7e6 --- M README.md 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/33994/1 diff --git a/README.md b/README.md index 2a89c9a..c3c5a25 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,9 @@ After installing all dependencies, the pySim applications ``pySim-read.py``, ``pySim-prog.py`` and ``pySim-shell.py`` may be started directly from the cloned repository. +In addition to the dependencies above ``pySim-trace.py`` requires ``tshark`` and the python package ``pyshark`` to be installed. It is known that the ``tshark`` package +in Debian versions before 11 may not work with pyshark. + ### Archlinux Package Archlinux users may install the package ``python-pysim-git`` -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2e03f9c827bd6ee73891bba34bd2f2efe3ded7e6 Gerrit-Change-Number: 33994 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: isdn: mux_timeslot_provide_bits(): remove unused 'count'
by fixeria 28 Jul '23

28 Jul '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33984 ) Change subject: isdn: mux_timeslot_provide_bits(): remove unused 'count' ...................................................................... isdn: mux_timeslot_provide_bits(): remove unused 'count' Change-Id: Id2c6d05c56424fa79ade84a29b8b70293dc690e4 --- M src/isdn/i460_mux.c 1 file changed, 10 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/isdn/i460_mux.c b/src/isdn/i460_mux.c index 0e84816..b070bbd 100644 --- a/src/isdn/i460_mux.c +++ b/src/isdn/i460_mux.c @@ -245,16 +245,14 @@ /* provide one byte of multiplexed I.460 bits */ static uint8_t mux_timeslot_provide_bits(struct osmo_i460_timeslot *ts) { - int i, count = 0; uint8_t ret = 0xff; /* unused bits must be '1' as per I.460 */ - for (i = 0; i < ARRAY_SIZE(ts->schan); i++) { + for (int i = 0; i < ARRAY_SIZE(ts->schan); i++) { struct osmo_i460_subchan *schan = &ts->schan[i]; uint8_t bits, mask; if (schan->rate == OSMO_I460_RATE_NONE) continue; - count++; bits = mux_subchan_provide_bits(schan, &mask); ret &= ~mask; ret |= bits; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2c6d05c56424fa79ade84a29b8b70293dc690e4 Gerrit-Change-Number: 33984 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: fix binpkgs for libusrp
by osmith 28 Jul '23

28 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33989 ) Change subject: jobs/gerrit-verifications: fix binpkgs for libusrp ...................................................................... jobs/gerrit-verifications: fix binpkgs for libusrp Don't build libusrp for centos8/almalinux. libusrp does have a .spec.in file, but it needs SDCC for the build and SDCC is not available there. In theory we could build the rpm in CI for opensuse tumbleweed, but it requires adding support for building for opensuse in scripts/obs/data/build_binpkg.Dockerfile and scripts/obs/data/build_rpm.sh first, and since it works quite differently than centos8 and libusrp changes rarely (last code change in 2021) I've decided to not do that now. Fixes: OS#5898 Change-Id: If61765fe628321cae004307f4845d8927a1c7019 --- M jobs/gerrit-verifications.yml 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/33989/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f2c8bec..7fbc328 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -128,7 +128,9 @@ - libtelnet: pipeline_binpkgs: "" - - libusrp + - libusrp: + # centos8/almalinux doesn't have SDCC (OS#5898) + pipeline_binpkgs: "debian:11" - openbsc: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If61765fe628321cae004307f4845d8927a1c7019 Gerrit-Change-Number: 33989 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: build for debian 10, 12
by osmith 28 Jul '23

28 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33990 ) Change subject: jobs/gerrit-verifications: build for debian 10, 12 ...................................................................... jobs/gerrit-verifications: build for debian 10, 12 Build packages in CI for the oldest and newest debian release, for which we provide binary packages in the Osmocom OBS repositories. See "jobs: master/gerrit: use debian bookworm (12)" for reasoning: I079e55a1325083714c8d39f922b2563e843fc0bc Related: OS#6057 Change-Id: I959b466865bd327cc72cde4a1763ac13c2c2d797 --- M jobs/gerrit-verifications.yml 1 file changed, 23 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/33990/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 7fbc328..1324df6 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -92,7 +92,7 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true - pipeline_binpkgs: "almalinux:8 debian:11" + pipeline_binpkgs: "almalinux:8 debian:10 debian:12" pipeline_endianness: true # in alphabetical order @@ -102,7 +102,7 @@ pipeline_lint: false - cellmgr-ng: - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - docker-playground: pipeline_build: false @@ -130,7 +130,7 @@ - libusrp: # centos8/almalinux doesn't have SDCC (OS#5898) - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - openbsc: docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) @@ -193,7 +193,7 @@ gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-e1-hardware: a2_name: JOB_TYPE @@ -233,7 +233,7 @@ - osmo-gsm-manuals: pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo_gsup: repos_url: '{gerrit_url}/erlang/{repos}' @@ -295,7 +295,7 @@ repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' pipeline_endianness: false - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-sgsn: a1_name: IU @@ -348,7 +348,7 @@ pipeline_binpkgs: "" - osmo-sysmon: - pipeline_binpkgs: "debian:11" + pipeline_binpkgs: "debian:10 debian:12" - osmo-remsim - simtrace2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I959b466865bd327cc72cde4a1763ac13c2c2d797 Gerrit-Change-Number: 33990 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: make assert more verbose
by osmith 28 Jul '23

28 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33991 ) Change subject: scripts/jenkins-gerrit: make assert more verbose ...................................................................... scripts/jenkins-gerrit: make assert more verbose Change-Id: I0ea40663220f7eb8ee72e43f3f6b776be5835db2 --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/33991/1 diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index e96893c..147faac 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -97,7 +97,8 @@ assert stage in ret, f"found result for stage {stage}, but" \ " didn't find where it was started. The" \ " re_start_build regex probably needs to be adjusted" \ - " to match the related gerrit-*-build job." + " to match the related gerrit-*-build job.\n\n" \ + f"ret: {ret}" ret[stage]["passed"] = (match.group(2) == "SUCCESS") return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0ea40663220f7eb8ee72e43f3f6b776be5835db2 Gerrit-Change-Number: 33991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: sort jobs list
by osmith 28 Jul '23

28 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33992 ) Change subject: scripts/jenkins-gerrit: sort jobs list ...................................................................... scripts/jenkins-gerrit: sort jobs list Having two debian entries in there in random order looks weird so sort the job lists. Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/33992/1 diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index 147faac..e127c4c 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -171,10 +171,10 @@ def get_jobs_list_str(jobs): - ret = "" + lines = [] for job in jobs: - ret += f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n" - return ret + lines += [f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n"] + return "".join(sorted(lines)) def get_comment_result(build_url, notify_on_success): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 Gerrit-Change-Number: 33992 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs/master,gerrit: don't use bullseye for python2
by osmith 28 Jul '23

28 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/33993 ) Change subject: jobs/master,gerrit: don't use bullseye for python2 ...................................................................... jobs/master,gerrit: don't use bullseye for python2 openbsc, osmo-e1-recorder, osmo-smlc have been adjusted to not require python2 anymore. Let them use debian 12 for building. Closes: OS#5950 Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/93/33993/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 1324df6..d2aaaae 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -133,7 +133,6 @@ pipeline_binpkgs: "debian:10 debian:12" - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -367,7 +366,6 @@ - osmo-cbc - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) pipeline_binpkgs: "" - gapk: @@ -378,9 +376,7 @@ - osmo-el2tpd: pipeline_binpkgs: "" - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - + - osmo-smlc - osmo-gbproxy - osmo-hnodeb diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4b1609a..6837d78 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,7 +222,6 @@ trigger: master-osmo-trx - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -464,13 +463,11 @@ - osmo-e1d - osmo-cbc - - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-smlc - osmo-gbproxy - osmo-hnodeb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 Gerrit-Change-Number: 33993 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0