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

[L] Change in osmo-ci[master]: jobs: update trigger timers

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34400?usp=email ) Change subject: jobs: update trigger timers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34400?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: Ib68f9a78bae27a63706a8c95715bf6a244b7bf1d Gerrit-Change-Number: 34400 Gerrit-PatchSet: 1 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: Wed, 13 Sep 2023 16:11:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in ...osmo-python-tests[master]: tests/test_py3: fix deprecated loop arg

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34406?usp=email ) Change subject: tests/test_py3: fix deprecated loop arg ...................................................................... tests/test_py3: fix deprecated loop arg The loop arg has been removed in python 3.10. The same event loop will be used without passing the argument, so it can be removed. Fix for: TypeError: gather() got an unexpected keyword argument 'loop' Related: https://stackoverflow.com/a/60315290 Related: https://docs.python.org/3/library/asyncio-task.html#asyncio.gather Change-Id: I776bc463246e7a1a9adbb7c06012353d65694507 --- M tests/test_py3.py 1 file changed, 18 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/tests/test_py3.py b/tests/test_py3.py index 0d526a9..710dcb8 100644 --- a/tests/test_py3.py +++ b/tests/test_py3.py @@ -46,7 +46,7 @@ print('Serving on {}...'.format(server.sockets[0].getsockname())) # Async client running in the subprocess plugged to the same event loop - loop.run_until_complete(asyncio.gather(asyncio.create_subprocess_exec('./scripts/osmo_ctrl.py', '-g', 'mnc', '-d', test_host, '-p', test_port), loop = loop)) + loop.run_until_complete(asyncio.gather(asyncio.create_subprocess_exec('./scripts/osmo_ctrl.py', '-g', 'mnc', '-d', test_host, '-p', test_port))) loop.run_forever() -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I776bc463246e7a1a9adbb7c06012353d65694507 Gerrit-Change-Number: 34406 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins: do install --user

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34405?usp=email ) Change subject: contrib/jenkins: do install --user ...................................................................... contrib/jenkins: do install --user Don't install to /usr/local. Fix for: error: can't create or remove files in install directory Change-Id: Iebed8e3832047e8f19e5a88fcddd1a8242b9f096 --- M .gitignore M contrib/jenkins.sh 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved osmith: Verified diff --git a/.gitignore b/.gitignore index 095d598..26eb1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.pyc build/ dist/ +.local/ diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9b219f9..b129190 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -7,7 +7,7 @@ rm -rf ./build PY3=python3 PY3_LIST="osmopy scripts/osmo_ctrl.py scripts/osmo_rate_ctr2csv.py scripts/osmodumpdoc.py scripts/osmotestvty.py scripts/osmotestconfig.py scripts/osmo_interact_ctrl.py scripts/osmo_interact_vty.py scripts/osmo_verify_transcript_ctrl.py scripts/osmo_verify_transcript_vty.py scripts/soap.py scripts/twisted_ipa.py" -$PY3 ./setup.py install +$PY3 ./setup.py install --user $PY3 tests/test_py3.py for f in $PY3_LIST do -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iebed8e3832047e8f19e5a88fcddd1a8242b9f096 Gerrit-Change-Number: 34405 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> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in ...osmo-python-tests[master]: tests/test_py3: fix deprecated loop arg

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34406?usp=email ) Change subject: tests/test_py3: fix deprecated loop arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: I776bc463246e7a1a9adbb7c06012353d65694507 Gerrit-Change-Number: 34406 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 16:10:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in ...osmo-python-tests[master]: contrib/jenkins: do install --user

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34405?usp=email ) Change subject: contrib/jenkins: do install --user ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/34405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Iebed8e3832047e8f19e5a88fcddd1a8242b9f096 Gerrit-Change-Number: 34405 Gerrit-PatchSet: 1 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 16:10:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: scripts: wireshark: remove laforge/doc-fixes

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34402?usp=email ) Change subject: scripts: wireshark: remove laforge/doc-fixes ...................................................................... scripts: wireshark: remove laforge/doc-fixes The two patches from this branch have been upstreamed: https://gitlab.com/wireshark/wireshark/-/commit/15ed53005b7b924303514e2d361… And with recent changes to docs/README.dissector, git fails to detect that these are already applied. Fix for: CONFLICT (content): Merge conflict in doc/README.dissector Change-Id: I17017ba396996e781250d30406193c4f5ec44f82 --- M scripts/obs/update_obs_wireshark.sh 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/update_obs_wireshark.sh b/scripts/obs/update_obs_wireshark.sh index ae66aaa..e422292 100755 --- a/scripts/obs/update_obs_wireshark.sh +++ b/scripts/obs/update_obs_wireshark.sh @@ -4,7 +4,6 @@ BRANCHES=" osmith/deb-packaging - laforge/doc-fixes osmocom/qcdiag laforge/rspro " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34402?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: I17017ba396996e781250d30406193c4f5ec44f82 Gerrit-Change-Number: 34402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: keep going if version can't be parsed

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34403?usp=email ) Change subject: OBS: keep going if version can't be parsed ...................................................................... OBS: keep going if version can't be parsed Don't crash in Osmocom_OBS_wireshark because the version can't be parsed. Fix for: packaging.version.InvalidVersion: Invalid version: '4.1.1rc0.238' Change-Id: I0cf6c7c2d5939dccc14107f0a8c15593ea8bc4c2 --- M scripts/obs/lib/debian.py 1 file changed, 28 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 2995185..6703f8b 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -98,13 +98,19 @@ version_changelog = get_last_version_from_changelog(project) # Don't use a lower number (OS#6173) - if packaging.version.parse(version_changelog.split("-")[0]) > \ - packaging.version.parse(version.split("-")[0]): - print(f"{project}: WARNING: version from changelog" - f" ({version_changelog}) is higher than version based on git tag" - f" ({version}), using version from changelog (git tag not pushed" - " yet?)") - return + try: + if packaging.version.parse(version_changelog.split("-")[0]) > \ + packaging.version.parse(version.split("-")[0]): + print(f"{project}: WARNING: version from changelog" + f" ({version_changelog}) is higher than version based on git tag" + f" ({version}), using version from changelog (git tag not pushed" + " yet?)") + return + except packaging.version.InvalidVersion: + # packaging.version.parse can parse the version numbers used in Osmocom + # projects (where we need the above check), but not e.g. some versions + # from wireshark. Don't abort here if that is the case. + pass if version_changelog == version: return -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34403?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: I0cf6c7c2d5939dccc14107f0a8c15593ea8bc4c2 Gerrit-Change-Number: 34403 Gerrit-PatchSet: 1 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 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: scripts: wireshark: remove laforge/doc-fixes

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34402?usp=email ) Change subject: scripts: wireshark: remove laforge/doc-fixes ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34402?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: I17017ba396996e781250d30406193c4f5ec44f82 Gerrit-Change-Number: 34402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 16:10:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: keep going if version can't be parsed

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34403?usp=email ) Change subject: OBS: keep going if version can't be parsed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34403?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: I0cf6c7c2d5939dccc14107f0a8c15593ea8bc4c2 Gerrit-Change-Number: 34403 Gerrit-PatchSet: 1 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: Wed, 13 Sep 2023 16:10:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: document/clarify the meaning of BUFMAX=24

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33726?usp=email ) Change subject: osmo-bts-trx: document/clarify the meaning of BUFMAX=24 ...................................................................... Patch Set 3: (1 comment) File include/osmo-bts/scheduler.h: https://gerrit.osmocom.org/c/osmo-bts/+/33726/comment/af8a7be4_36dc172c PS1, Line 135: struct l1sched_meas_set buf[24]; /* up to 24 (BUFMAX) entries */ > agreeing, but not blocking. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I95d4e4ee3938cfabc1695959cc82a1efbbf0d7ed Gerrit-Change-Number: 33726 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-Comment-Date: Wed, 13 Sep 2023 16:09:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023