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

[S] Change in osmo-ci[master]: OBS: lib/debian: generate valid strongswan version

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email to look at the new patch set (#2). Change subject: OBS: lib/debian: generate valid strongswan version ...................................................................... OBS: lib/debian: generate valid strongswan version Ensure debian versions start with a number. For strongswan versions that look like "osmo-epdg-0.1.1", adjust them to be like "0.1.1-osmo-epdg". Fix for: dpkg-buildpackage: error: version number does not start with digit Related: OS#6488 Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17 --- M scripts/obs/lib/debian.py 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/37521/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17 Gerrit-Change-Number: 37521 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: lib/debian: generate valid versions for strongswan

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email ) Change subject: lib/debian: generate valid versions for strongswan ...................................................................... lib/debian: generate valid versions for strongswan Ensure debian versions start with a number. For strongswan versions that look like "osmo-epdg-0.1.1", adjust them to be like "0.1.1-osmo-epdg". Fix for: dpkg-buildpackage: error: version number does not start with digit Related: OS#6488 Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17 --- M scripts/obs/lib/debian.py 1 file changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/37521/1 diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index efe4ff3..1e48046 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -112,6 +112,10 @@ # from wireshark. Don't abort here if that is the case. pass + # Debian versions must start with a digit + if version.startswith("osmo-epdg-"): + version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" + if version_changelog == version: return -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17 Gerrit-Change-Number: 37521 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-build-tags…: fix workspace clean

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37520?usp=email ) Change subject: jobs/osmocom-build-tags…: fix workspace clean ...................................................................... jobs/osmocom-build-tags…: fix workspace clean As this job tries to archive the build logs after running, don't remove the entire workspace. Instead remove the paths that take up the most space, which are the one with the git clones and build artifacts (_deps) as well as the one with the temporary installation dirs (_temp/_inst*). Fixes: b20e8e8b ("jobs/various: clean workspace on success") Change-Id: Ied86ba80b38a9b10a7a96631e6dedee9f3762c3b --- M jobs/osmocom-build-tags-against-master.yml 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/20/37520/1 diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 8ae4a63..b242103 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -33,8 +33,10 @@ "$USER/debian-bookworm-build" \ scripts/osmocom-build-old-tags-against-master.sh - # Remove workspace on success to free up space - rm -rf "$WORKSPACE" + # Remove git repos and build results on success to free up space + # Logs are kept + rm -rf "$WORKSPACE"/_deps + rm -rf "$WORKSPACE"/_temp/_inst* scm: - git: branches: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ied86ba80b38a9b10a7a96631e6dedee9f3762c3b Gerrit-Change-Number: 37520 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_call_mo_holdswitchresume_mo

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37513?usp=email ) Change subject: asterisk: Introduce test TC_ims_call_mo_holdswitchresume_mo ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37513?usp=email 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: I80ec326524501a2f0784291250e3d5fad6b04378 Gerrit-Change-Number: 37513 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 Jul 2024 07:25:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications-dahdi: set concurrent: false

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37505?usp=email ) Change subject: gerrit-verifications-dahdi: set concurrent: false ...................................................................... gerrit-verifications-dahdi: set concurrent: false Each of the gerrit-dahdi-linux-* jobs has a 3-4 GiB workspace directory with a full linux tree. We keep them on disk so we don't need to clone the linux tree with each build. This makes sense, but set concurrent to false to not create more of these than necessary. These directories stood out when investigating why build4 was running out of space. Change-Id: I4fd4e85f0930b15b6c67e70fb2c140392c910bf5 --- M jobs/gerrit-verifications-dahdi.yml 1 file changed, 23 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml index 5a8b3a6..2cf9e95 100644 --- a/jobs/gerrit-verifications-dahdi.yml +++ b/jobs/gerrit-verifications-dahdi.yml @@ -23,7 +23,12 @@ name: 'gerrit-dahdi-linux-{type}-{linux-ver}' project-type: freestyle node: osmocom-gerrit - concurrent: true + # These jobs need an entire linux tree. We try to avoid cloning it more + # often than necessary, therefore we keep the workspace directory between + # job runs. Jenkins creates a new workspace for each concurrent job, which + # ends up consuming a lot of disk space so we disable it here. Besides disk + # space considerations, this job would run fine concurrently. + concurrent: false retry-count: 0 # scm checkout properties: - build-discarder: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37505?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4fd4e85f0930b15b6c67e70fb2c140392c910bf5 Gerrit-Change-Number: 37505 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/various: clean workspace on success

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37506?usp=email ) Change subject: jobs/various: clean workspace on success ...................................................................... jobs/various: clean workspace on success When investigating why space run out on build4, I found that some of the jenkins workspaces take up a lot of space after everything is built. If the build was successful, we don't need to keep the workspaces around so remove them. Examples: * ~3 GiB: gerrit-osmo-ttcn3-hacks-build * ~1 GiB: Osmocom_OBS_nightly * ~1 GiB: Osmocom-build-tags-against-master * ~1 GiB: master-osmo-bts Change-Id: Ibedef518782ea9f68c6386f1ce7fba216e1886bc --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml M jobs/osmocom-build-tags-against-master.yml M jobs/osmocom-obs-nightly-asan.yml M jobs/osmocom-obs.yml 5 files changed, 38 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3f7f47f..a1a7c0c 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -720,6 +720,8 @@ builders: - shell: '{obj:cmd}' + # Remove workspace on success to free up space + - shell: 'rm -rf "$WORKSPACE"' publishers: - warnings: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index ff7307c..9a5c1f7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -634,6 +634,11 @@ builders: - shell: '{obj:cmd}' + - shell: | + # Remove workspace on success to free up space. Create an empty dir + # so the job does not abort when attempting to collect artifacts. + rm -rf "$WORKSPACE" + mkdir -p "$WORKSPACE" publishers: - archive: diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index e33c9a3..8ae4a63 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -32,6 +32,9 @@ -w /build \ "$USER/debian-bookworm-build" \ scripts/osmocom-build-old-tags-against-master.sh + + # Remove workspace on success to free up space + rm -rf "$WORKSPACE" scm: - git: branches: diff --git a/jobs/osmocom-obs-nightly-asan.yml b/jobs/osmocom-obs-nightly-asan.yml index 14ddbef..a08eefd 100644 --- a/jobs/osmocom-obs-nightly-asan.yml +++ b/jobs/osmocom-obs-nightly-asan.yml @@ -45,6 +45,9 @@ osmocom:nightly:asan \ ALL_OSMOCOM_PACKAGES \ --exclude-package $EXCLUDE_PACKAGES + + # Remove workspace on success to free up space + rm -rf "$WORKSPACE" scm: - git: branches: diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index eb77f4d..e61b16b 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -42,6 +42,10 @@ --feed {type} \ --meta \ osmocom:{type} + + # Remove workspace on success to free up space + rm -rf "$WORKSPACE" + scm: - git: branches: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37506?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibedef518782ea9f68c6386f1ce7fba216e1886bc Gerrit-Change-Number: 37506 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-lint: wipe workspace

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37507?usp=email ) Change subject: jobs/gerrit-lint: wipe workspace ...................................................................... jobs/gerrit-lint: wipe workspace On build4 the gerrit-lint workspace has grown to 6 GiB. Use fresh clones of the git repositories instead of storing all of them combined in .git. Change-Id: Ifc1a3a5d5037b373014654e75d1d3b968bcfe141 --- M jobs/gerrit-lint.yml 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 3039829..a607268 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -34,7 +34,6 @@ - $GERRIT_BRANCH refspec: $GERRIT_REFSPEC choosing-strategy: gerrit - wipe-workspace: false skip-tag: true submodule: recursive: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37507?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc1a3a5d5037b373014654e75d1d3b968bcfe141 Gerrit-Change-Number: 37507 Gerrit-PatchSet: 3 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> Gerrit-MessageType: merged

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Fix BTS_Tests_ASCI.TC_vbs_notification, add missing SI1

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37519?usp=email ) Change subject: Fix BTS_Tests_ASCI.TC_vbs_notification, add missing SI1 ...................................................................... Fix BTS_Tests_ASCI.TC_vbs_notification, add missing SI1 Because System Information Type 1 was missing, the BTS could not assign time slots to NCH. Without NCH, notification is not possible. Related: OS#6467 Change-Id: I65dc55da78bc53a1265124e6b6f6bb9a1650206e --- M bts/BTS_Tests.ttcn M bts/BTS_Tests_ASCI.ttcn 2 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/37519/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 29879b9..c667851 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -439,13 +439,13 @@ } } -private function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) +function f_rsl_bcch_fill_raw(RSL_IE_SysinfoType rsl_si_type, octetstring si_enc) runs on test_CT { log("Setting ", rsl_si_type, ": ", si_enc); RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_BCCH_INFO(rsl_si_type, si_enc))); } -private function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) +friend function f_rsl_bcch_fill(RSL_IE_SysinfoType rsl_si_type, template (value) SystemInformation si_dec) runs on test_CT { var octetstring si_enc := enc_SystemInformation(valueof(si_dec)); log("Setting ", rsl_si_type, ": ", si_dec); @@ -4922,7 +4922,7 @@ /* helper function: Set given SI via RSL + validate scheduling. * CALLER MUST MAKE SURE TO CHANGE GLOBAL si_cfg! */ -private function f_TC_si_sched(float duration := 8.0) runs on test_CT { +function f_TC_si_sched(float duration := 8.0) runs on test_CT { var SystemInformationVectorPerTc si_per_tc; f_init_l1ctl(); f_l1_tune(L1CTL); diff --git a/bts/BTS_Tests_ASCI.ttcn b/bts/BTS_Tests_ASCI.ttcn index 6814295..d262929 100644 --- a/bts/BTS_Tests_ASCI.ttcn +++ b/bts/BTS_Tests_ASCI.ttcn @@ -43,6 +43,12 @@ +/* Set up NCH channel: 1 block, starting at slot 0 */ +friend function f_init_nch_position() runs on test_CT { + si_cfg.si1_present := true; + f_rsl_bcch_fill_raw(RSL_SYSTEM_INFO_1, '5506198fb38000000000000000000000000000e5040083'O); +} + /* convert from boolean value to BIT1 */ private function bool2bit1(boolean inp) return BIT1 { if (inp) { @@ -75,6 +81,7 @@ timer T; f_init(); + f_init_nch_position(); f_init_l1ctl(); f_l1_tune(L1CTL); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37519?usp=email 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: I65dc55da78bc53a1265124e6b6f6bb9a1650206e Gerrit-Change-Number: 37519 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

11 months, 2 weeks

1
0
0 0

[M] Change in pysim[master]: contrib/es9p_client: Add support for reporting notifications to SM-DP+

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37499?usp=email ) Change subject: contrib/es9p_client: Add support for reporting notifications to SM-DP+ ...................................................................... Patch Set 3: (4 comments) File pySim/esim/__init__.py: https://gerrit.osmocom.org/c/pysim/+/37499/comment/a126df97_f2fefdbd PS3, Line 7: pmo4operation Looks like you want this to be an `enum.IntEnum`? ``` class PMO(IntEnum): INSTALL = 0x80 ENABLE = 0x40 ... ``` This gives you int/enum conversion API out of box. Not critical. https://gerrit.osmocom.org/c/pysim/+/37499/comment/bda6ef1e_4d4b1396 PS3, Line 23: _num_bits FYI, this can be implemented as: * `data.bit_count()` - (Python 3.10 or later) * `bin(data).count("1")` - (Python 3.9 or earlier) https://gerrit.osmocom.org/c/pysim/+/37499/comment/a84922e9_5535b32e PS3, Line 35: from_int If this class was an `enum.IntEnum`, this API would look like: ``` def from_int(cls, i: int): cls(i) ``` https://gerrit.osmocom.org/c/pysim/+/37499/comment/abbc4c44_b264806c PS3, Line 35: str `str` is not a valid type hint for this function, should be `-> 'PMO'` I think -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37499?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iefba7fa0471b34eae30700ed43531a515af0eb93 Gerrit-Change-Number: 37499 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jul 2024 22:28:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

[S] Change in pysim[master]: osmo-smdpp: Implement 'other' notification signature validation

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37508?usp=email ) Change subject: osmo-smdpp: Implement 'other' notification signature validation ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/37508?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If610058b7af6f9fc7822576c93f9970e2ce9aba9 Gerrit-Change-Number: 37508 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jul 2024 22:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024