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

[XS] Change in osmo-ci[master]: *.py: ignore: E722 Do not use bare `except`
by pespin 03 Apr '25

03 Apr '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39909?usp=email ) Change subject: *.py: ignore: E722 Do not use bare `except` ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Maybe simply fixing those 3 cases would be enough? -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39909?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: Iaef20d47cd171aab23e516e7f7516caf98264249 Gerrit-Change-Number: 39909 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 12:14:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: *.py: fix variable assigned to but never used
by pespin 03 Apr '25

03 Apr '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39908?usp=email ) Change subject: *.py: fix variable assigned to but never used ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39908?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: I6aca8f9aab10e7ee395980b53316a720ab2e2469 Gerrit-Change-Number: 39908 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 12:13:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: *.py: fix imported but unused
by pespin 03 Apr '25

03 Apr '25

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39907?usp=email ) Change subject: *.py: fix imported but unused ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39907?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: I89fa4a50a28f6ceab48cce939ca0c076967d43fd Gerrit-Change-Number: 39907 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 12:13:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID
by pespin 03 Apr '25

03 Apr '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?usp=email ) Change subject: s1gw: fix passing swapped {MME,ENB}_UE_S1AP_ID ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39906?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: I9b19a82234f547a9e44c9c034492ee4b21892818 Gerrit-Change-Number: 39906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Apr 2025 12:12:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ci[master]: jobs/osmocom-build-tags…: set seccomp profile
by osmith 03 Apr '25

03 Apr '25

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/14/39914/1 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: newchange 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>

1 0

[S] Change in osmo-hlr[master]: Bump version: 1.9.0.2-1a71e → 1.9.1
by osmith 03 Apr '25

03 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/39899?usp=email ) Change subject: Bump version: 1.9.0.2-1a71e → 1.9.1 ...................................................................... Bump version: 1.9.0.2-1a71e → 1.9.1 Change-Id: Ib8bdcee7a6fa4ae9821d9748a8a7ea4aecbea62e --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index dbf1ec1..3337600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-hlr (1.9.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Drop use of deprecated vty is_config_node() cb + + [ Oliver Smith ] + * db: flush after changing schema version + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 02 Apr 2025 15:12:35 +0200 + osmo-hlr (1.9.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/39899?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ib8bdcee7a6fa4ae9821d9748a8a7ea4aecbea62e Gerrit-Change-Number: 39899 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>

1 0

[S] Change in libosmocore[master]: osmo-release: improve check for REL argument
by osmith 03 Apr '25

03 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email ) Change subject: osmo-release: improve check for REL argument ...................................................................... osmo-release: improve check for REL argument Verify that REL is actually "patch", "minor" or "major". If it is something else (e.g. because of a typo), the script would contiune otherwise and create an invalid release commit without bumping the version. Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 --- M osmo-release.sh 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-release.sh b/osmo-release.sh index 61adf57..14790da 100755 --- a/osmo-release.sh +++ b/osmo-release.sh @@ -2,7 +2,7 @@ VERSION=$1 REL=$2 -if [ "z$REL" = "z" ]; then +help() { echo "usage: make REL=patch|minor|major release" echo echo "optional environment variables:" @@ -14,7 +14,15 @@ echo "See also:" echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release" exit 1 -fi +} + +case "$REL" in + patch|minor|major) + ;; + *) + help + ;; +esac ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}" ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibac10dbc983b6d65cce6de10371fb731505a7ce8 Gerrit-Change-Number: 39896 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>

1 0

[XS] Change in docker-playground[master]: debian-bookworm-build: fix lcov-to-cobertura-xml
by osmith 03 Apr '25

03 Apr '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/39897?usp=email ) Change subject: debian-bookworm-build: fix lcov-to-cobertura-xml ...................................................................... debian-bookworm-build: fix lcov-to-cobertura-xml Use a specific commit with lcov-to-cobertura-xml, as the latest master currently can't be installed with pip. Change-Id: I2e248bf988be055a3a88cc414946e0377e266e1e --- M debian-bookworm-build/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index 6755dcf..b7744f6 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -173,11 +173,13 @@ # Install pip dependencies (alphabetic order) # break-system-packages: inside docker it's fine to install pkgs system-wide +# lcov-to-cobertura-xml: use this commit as the latest version fails: +# https://github.com/eriwen/lcov-to-cobertura-xml/issues/63 ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt RUN set -x && \ cat /tmp/pysim_requirements.txt && \ pip3 install --break-system-packages \ - 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \ + 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git@028da3798355d0260c6…' \ 'git+https://github.com/osmocom/sphinx-argparse@inside-classes#egg=sphinx-ar…' \ 'git+https://github.com/podshumok/python-smpplib.git' \ 'pydbus' \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2e248bf988be055a3a88cc414946e0377e266e1e Gerrit-Change-Number: 39897 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>

1 0

[M] Change in osmo-ci[master]: OBS: cleanup: new script
by osmith 03 Apr '25

03 Apr '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39913?usp=email ) Change subject: OBS: cleanup: new script ...................................................................... OBS: cleanup: new script Add a script for cleaning old sources uploaded to OBS. This was needed as we were running out of space on the OBS server, due to source tarballs being generated in nightly jobs (e.g. Osmocom_OBS_nightly and never getting deleted). This script is now running automatically every day. The script does the following: * Iterate over all OBS projects and packages inside the projects. * Delete all source files matching *.dsc, *.tar.xz in old revisions from disk, which are not in the most recent revision anymore. * Write a marker file with the revisions already iterated through (per project+package) and skip those on the next run. Related: SYS#7407 Change-Id: I4649dedf0bb52f0bbdc7577ac0bc9e93cb3be192 --- A .ruff.toml M lint/lint_diff.sh A scripts/obs/cleanup.py M scripts/obs/lib/osc.py 4 files changed, 198 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/13/39913/1 diff --git a/.ruff.toml b/.ruff.toml new file mode 100644 index 0000000..4194a9f --- /dev/null +++ b/.ruff.toml @@ -0,0 +1,2 @@ +line-length = 120 +include = ["scripts/obs/cleanup.py"] diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 408d79f..28bb922 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -88,6 +88,7 @@ " local format_projects=" osmo-ttcn3-hacks + osmo-ci " if ! command -v ruff >/dev/null; then diff --git a/scripts/obs/cleanup.py b/scripts/obs/cleanup.py new file mode 100755 index 0000000..3365e34 --- /dev/null +++ b/scripts/obs/cleanup.py @@ -0,0 +1,151 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright 2025 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> +import argparse +import fnmatch +import hashlib +import lib +import lib.osc +import os +import sys +import time + +# Only delete files that were created by the Osmocom_OBS_* jenkins jobs +safe_to_delete_patterns = [ + "*.dsc", + "*.tar.xz", +] + +cache_dir = os.path.expanduser("~/.cache/osmo_ci_obs_cleanup") + + +def parse_args(): + parser = argparse.ArgumentParser(description="Clean up old sources to free up space.") + + parser.add_argument("-P", "--project", help="optional path to a specific project (e.g. osmocom:master)") + + parser.add_argument("-p", "--package", help="optional path to a specific package (e.g. osmo-mgw)") + + parser.add_argument("-k", "--keep-revisions", type=int, default=5, help="how many revisions to keep (default: 5)") + + parser.add_argument( + "-s", "--sleep", type=int, default=0, help="how many seconds to sleep between queries (default: 0)" + ) + + 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( + "-A", + "--apiurl", + help="OBS API URL or .oscrc alias (default: https://obs.osmocom.org)", + default="https://obs.osmocom.org", + ) + + args = parser.parse_args() + lib.set_args(args) + lib.osc.set_apiurl(args.apiurl) + + +def sleep(): + if lib.args.sleep != 0: + time.sleep(lib.args.sleep) + + +def get_projects(): + if lib.args.project: + return [lib.args.project] + return lib.osc.get_projects() + + +def get_packages(project): + if lib.args.package: + return [lib.args.package] + sleep() + return lib.osc.get_remote_pkgs() + + +def check_safe_to_delete(source): + for pattern in safe_to_delete_patterns: + if fnmatch.fnmatch(source, pattern): + return True + return False + + +def get_start_rev_file(project, package): + h = hashlib.new("sha512") + h.update(f"{project}/{package}".encode()) + return f"{cache_dir}/{h.hexdigest()}" + + +def get_start_rev(project, package): + f = get_start_rev_file(project, package) + if not os.path.exists(f): + return 1 + + with open(f, "r") as h: + return int(h.read().rstrip()) + + +def set_start_rev(project, package, rev): + f = get_start_rev_file(project, package) + with open(f, "w") as h: + h.write(f"{rev}\n") + + +def clean_package(project, package): + sleep() + last_rev = lib.osc.get_last_rev(package) + if last_rev <= lib.args.keep_revisions: + return + + sleep() + sources_current = lib.osc.get_package_sources(package, last_rev) + + start = get_start_rev(project, package) + end = last_rev - lib.args.keep_revisions + 1 + for rev in range(start, end): + print(f" checking rev {rev}/{last_rev}") + sleep() + sources_rev = lib.osc.get_package_sources(package, rev) + for source in sources_rev: + if source not in sources_current: + assert "/" not in package + assert "/" not in source + path = f"/srv/obs/sources/{package}/{source}" + if check_safe_to_delete(source) and os.path.exists(path): + print(f" rm {source}") + lib.run_cmd(["rm", path]) + set_start_rev(project, package, rev) + + +def main(): + if not os.path.exists("/srv/obs/sources"): + print("ERROR: this script needs to run on an OBS server!") + sys.exit(1) + + lib.run_cmd(["mkdir", "-p", cache_dir]) + + parse_args() + lib.osc.check_oscrc() + + for project in get_projects(): + if ":" not in project: + continue + + lib.osc.set_apiurl(lib.args.apiurl, project) + + packages = get_packages(project) + if len(packages) == 1 and packages[0] == "": + continue + + for package in packages: + clean_package(project, package) + + +if __name__ == "__main__": + main() + print("Success") diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py index 8838b1a..3627bd2 100644 --- a/scripts/obs/lib/osc.py +++ b/scripts/obs/lib/osc.py @@ -8,6 +8,7 @@ import sys import lib import lib.config +import xml.etree.ElementTree apiurl = None proj = None @@ -90,6 +91,37 @@ return "0" +def get_package_sources(package, rev=None): + # Use the API directly, because "osc list" throws an exception when trying + # to list a directory with deleted files. + url = f"/source/{proj}/{os.path.basename(package)}" + if rev: + url = f"{url}?rev={rev}" + + osc_ret = run_osc(["api", url]) + root = xml.etree.ElementTree.fromstring(osc_ret.output) + + # === Output === + # <directory name="open5gs" rev="1012" vrev="1" srcmd5="d98c9f8faeada3e291aa2197ca7fda03"> + # <entry name="open5gs_2.7.5.4648.7dfd.202503302026.dsc" md5="7101346f69282beda8c1e2c191fadd4e" size="2040" mtime="1743367015"/> + # <entry name="open5gs_2.7.5.4648.7dfd.202503302026.tar.xz" md5="71fc5f9a885204d38f712236684822ac" size="14531220" mtime="1743367016"/> + # </directory + + # === Output with already deleted files === + # <directory name="open5gs" rev="1" vrev="1" srcmd5="bcd19a5960921d5e30e99d988fffbd15"> + # <entry name="open5gs_2.4.8.202206260026.dsc" md5="bf154599a1493d23f2f7f8669c5adb7c" error="No such file or directory"/> + # <entry name="open5gs_2.4.8.202206260026.tar.xz" md5="3f26b59b342a35d80d5ac790ff0a8ff2" error="No such file or directory"/> + # </directory> + + ret = [] + for entry in root.findall("entry"): + if entry.get("error"): + # already deleted + continue + ret += [f"{entry.get('md5')}-{entry.get('name')}"] + return ret + + def create_package(package): print(f"{package}: creating new OBS package") @@ -180,3 +212,15 @@ def get_projects(): print(f"OBS: getting list of projects ({apiurl})") return lib.osc.run_osc(["ls"]).output.rstrip().split("\n") + + +def get_last_rev(package): + print(f"OBS: getting latest revision of {proj}:{package}") + + url = f"/source/{proj}/{os.path.basename(package)}" + osc_ret = run_osc(["api", url]) + root = xml.etree.ElementTree.fromstring(osc_ret.output) + rev = root.get("rev") + if rev: + return int(rev) + return 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4649dedf0bb52f0bbdc7577ac0bc9e93cb3be192 Gerrit-Change-Number: 39913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: *.py: fix variable assigned to but never used
by osmith 03 Apr '25

03 Apr '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/39908?usp=email ) Change subject: *.py: fix variable assigned to but never used ...................................................................... *.py: fix variable assigned to but never used Change-Id: I6aca8f9aab10e7ee395980b53316a720ab2e2469 --- M scripts/obs/lib/debian.py M scripts/obs/lib/metapkg.py M scripts/verify_log_statements.py 3 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/08/39908/1 diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 85fcc5f..8e0fd5e 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -141,7 +141,6 @@ print(f"{project}: adding configure parameters: {parameters}") rules = f"{lib.git.get_repo_path(project)}/debian/rules" override_found = False - replaced = False with open(rules, "r") as f: lines = f.readlines() for i in range(len(lines)): @@ -157,7 +156,6 @@ else: lines[i] = line.replace("dh_auto_configure", f"dh_auto_configure -- {parameters}", 1) - replaced = True break if not override_found: lines += ["\n", diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 8a9922d..1b78777 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -27,7 +27,6 @@ def generate_debian_pkg(pkgname, version): - feed = lib.args.feed path = f"{lib.config.path_cache}/{pkgname}" conflicts = get_conflicts(pkgname) @@ -65,7 +64,6 @@ def generate_rpm_spec(pkgname, version): - feed = lib.args.feed print(f"{pkgname}: generating rpm spec file") path = f"{lib.config.path_cache}/{pkgname}/contrib/{pkgname}.spec.in" conflicts = get_conflicts(pkgname) diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py index 064df73..e0bcce6 100755 --- a/scripts/verify_log_statements.py +++ b/scripts/verify_log_statements.py @@ -52,7 +52,6 @@ def char_pos_2_line(line_idx, sorted_char_positions): r = [] line_i = 0 - next_line_i = 1 for char_pos in sorted_char_positions: while (line_i+1) < len(line_idx) and char_pos > line_idx[line_i+1][0]: line_i += 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39908?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6aca8f9aab10e7ee395980b53316a720ab2e2469 Gerrit-Change-Number: 39908 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log April 2025