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

[S] Change in osmo-ci[master]: obs: don't pass fetch through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31931 ) Change subject: obs: don't pass fetch through functions ...................................................................... obs: don't pass fetch through functions Change-Id: I0689868db6fadaaaca470cdefbf60ceedc2eb225 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/git.py M scripts/obs/lib/srcpkg.py M scripts/obs/update_obs_project.py 4 files changed, 22 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 9163061..0ec1958 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -44,8 +44,7 @@ lib.metapkg.build() if args.package: - lib.srcpkg.build(args.package, - args.git_fetch, args.gerrit_id) + lib.srcpkg.build(args.package, args.gerrit_id) if __name__ == "__main__": diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index 13c2216..f1ee98d 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -22,7 +22,8 @@ return lib.config.git_latest_tag_pattern_default -def clone(project, fetch=False): +def clone(project): + fetch = lib.args.git_fetch repo_path = get_repo_path(project) url = get_repo_url(project) diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index f1d610d..b230353 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -133,9 +133,9 @@ pathlib.Path(f"{output_path}/commit_{commit}.txt").touch() -def build(project, fetch, gerrit_id=0): +def build(project, gerrit_id=0): feed = lib.args.feed - lib.git.clone(project, fetch) + lib.git.clone(project) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 155caee..93f2f7c 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -32,7 +32,7 @@ return ret -def build_srcpkg(package, fetch, is_meta_pkg): +def build_srcpkg(package, is_meta_pkg): global srcpkgs_built global srcpkgs_failed_build @@ -42,7 +42,7 @@ if is_meta_pkg: version = lib.metapkg.build() else: - version = lib.srcpkg.build(package, fetch) + version = lib.srcpkg.build(package) srcpkgs_built[package] = version except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -62,8 +62,7 @@ return False -def build_srcpkg_if_needed(pkgs_remote, package, - fetch, is_meta_pkg, skip_up_to_date): +def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg, skip_up_to_date): global srcpkgs_skipped feed = lib.args.feed branch = lib.args.git_branch @@ -104,7 +103,7 @@ else: print(f"{package}: building source package (feed is {feed})") - build_srcpkg(package, fetch, is_meta_pkg) + build_srcpkg(package, is_meta_pkg) def upload_srcpkg(pkgs_remote, package, version): @@ -113,8 +112,7 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, fetch, - meta, skip_up_to_date): +def build_srcpkgs(pkgs_remote, packages, meta, skip_up_to_date): print() print("### Building source packages ###") print() @@ -122,11 +120,11 @@ if meta: feed = lib.args.feed build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", - fetch, True, skip_up_to_date) + True, skip_up_to_date) for package in packages: build_srcpkg_if_needed(pkgs_remote, package, - fetch, False, skip_up_to_date) + False, skip_up_to_date) def upload_srcpkgs(pkgs_remote): @@ -216,8 +214,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, - args.git_fetch, args.meta, args.skip_up_to_date) + build_srcpkgs(pkgs_remote, packages, args.meta, args.skip_up_to_date) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0689868db6fadaaaca470cdefbf60ceedc2eb225 Gerrit-Change-Number: 31931 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[S] Change in osmo-ci[master]: obs: don't pass meta through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31932 ) Change subject: obs: don't pass meta through functions ...................................................................... obs: don't pass meta through functions Change-Id: Ieb49e5f8630e3e918b11a7a225febbbcee2e82b3 --- M scripts/obs/update_obs_project.py 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 93f2f7c..867198d 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -112,12 +112,12 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, meta, skip_up_to_date): +def build_srcpkgs(pkgs_remote, packages, skip_up_to_date): print() print("### Building source packages ###") print() - if meta: + if lib.args.meta: feed = lib.args.feed build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True, skip_up_to_date) @@ -214,7 +214,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, args.meta, args.skip_up_to_date) + build_srcpkgs(pkgs_remote, packages, args.skip_up_to_date) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ieb49e5f8630e3e918b11a7a225febbbcee2e82b3 Gerrit-Change-Number: 31932 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-ci[master]: obs: don't pass skip_up_to_date through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31933 ) Change subject: obs: don't pass skip_up_to_date through functions ...................................................................... obs: don't pass skip_up_to_date through functions Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140 --- M scripts/obs/update_obs_project.py 1 file changed, 15 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 867198d..24dba8f 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -62,7 +62,7 @@ return False -def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg, skip_up_to_date): +def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg): global srcpkgs_skipped feed = lib.args.feed branch = lib.args.git_branch @@ -89,7 +89,7 @@ else: obs_version = lib.osc.get_package_version(package) if is_up_to_date(obs_version, latest_version): - if skip_up_to_date: + if lib.args.skip_up_to_date: print(f"{package}: skipping ({obs_version} is up-to-date)") srcpkgs_skipped += [package] return @@ -112,19 +112,17 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, skip_up_to_date): +def build_srcpkgs(pkgs_remote, packages): print() print("### Building source packages ###") print() if lib.args.meta: feed = lib.args.feed - build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", - True, skip_up_to_date) + build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True) for package in packages: - build_srcpkg_if_needed(pkgs_remote, package, - False, skip_up_to_date) + build_srcpkg_if_needed(pkgs_remote, package, False) def upload_srcpkgs(pkgs_remote): @@ -214,7 +212,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, args.skip_up_to_date) + build_srcpkgs(pkgs_remote, packages) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140 Gerrit-Change-Number: 31933 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-ci[master]: obs: lib.args: store argparse result here

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31926 ) Change subject: obs: lib.args: store argparse result here ...................................................................... obs: lib.args: store argparse result here Prepare to add more arguments to the OBS scripts, so they can be used for building the wireshark package in its own OBS project. It was not so clear to me when writing this initially, but with more and more arguments getting added: it's not very maintainable to pass each variable from the argparse result several functions down to where it gets used... so unfortunately this means the code needs to be refactored to just use libs.args in the few lines of code where the arguments actually get used. This patch adds lib.args, and the next patches refactor existing code to use it instead of passing parameters, where it makes sense. After that follow the patches related to adding the wireshark package. Related: OS#2537 Change-Id: I48853444f1386dfb842c174ebc45f9decc8bec0f --- M scripts/obs/build_binpkg.py M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 4 files changed, 37 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index a34a699..dcd6cdc 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -38,7 +38,7 @@ help="package name, e.g. libosmocore") args = parser.parse_args() - lib.set_cmds_verbose(args.verbose) + lib.set_args(args) srcdir = f"{lib.config.path_temp}/srcpkgs/{args.package}" if not os.path.exists(srcdir): diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index ad21927..869b8ef 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -28,7 +28,7 @@ print("ERROR: specify -m and/or a package. See -h for help.") exit(1) - lib.set_cmds_verbose(args.verbose) + lib.set_args(args) if args.docker: lib.docker.run_in_docker_and_exit("build_srcpkg.py") diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 479c1c1..edf19f4 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -10,6 +10,10 @@ import inspect import lib.config +# Argparse result +args = None + +# Print output of commands as they run, not only on error cmds_verbose = False @@ -60,6 +64,12 @@ cmds_verbose = new_val +def set_args(new_val): + global args + args = new_val + set_cmds_verbose(args.verbose) + + def check_required_programs(): ok = True diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 86cf40a..0ae949b 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -199,7 +199,7 @@ branch = args.git_branch packages = parse_packages(args.package) - lib.set_cmds_verbose(args.verbose) + lib.set_args(args) 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/+/31926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I48853444f1386dfb842c174ebc45f9decc8bec0f Gerrit-Change-Number: 31926 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[M] Change in osmo-ci[master]: obs: don't pass feed through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31928 ) Change subject: obs: don't pass feed through functions ...................................................................... obs: don't pass feed through functions Change-Id: I9124d33c45ef3fef48666b485fd169eec0eb393a --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/debian.py M scripts/obs/lib/metapkg.py M scripts/obs/lib/osc.py M scripts/obs/lib/srcpkg.py M scripts/obs/update_obs_project.py 6 files changed, 57 insertions(+), 40 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 869b8ef..597092c 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -41,10 +41,10 @@ lib.remove_temp() if args.meta: - lib.metapkg.build(args.feed, args.conflict_version) + lib.metapkg.build(args.conflict_version) if args.package: - lib.srcpkg.build(args.package, args.feed, args.git_branch, args.conflict_version, + lib.srcpkg.build(args.package, args.git_branch, args.conflict_version, args.git_fetch, args.gerrit_id) diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 3bba3ec..8a82e16 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -22,8 +22,9 @@ lib.run_cmd(cmd, cwd=repo_path) -def changelog_add_entry(project, feed, version): +def changelog_add_entry(project, version): """ :param version: for the new changelog entry """ + feed = lib.args.feed repo_path = lib.git.get_repo_path(project) changelog_path = f"{repo_path}/debian/changelog" @@ -84,7 +85,7 @@ return ret -def changelog_add_entry_if_needed(project, feed, version): +def changelog_add_entry_if_needed(project, version): """ Adjust the changelog if the version in the changelog is different from the given version. """ version_changelog = get_last_version_from_changelog(project) @@ -93,7 +94,7 @@ print(f"{project}: adding debian/changelog entry ({version_changelog} =>" f" {version})") - changelog_add_entry(project, feed, version) + changelog_add_entry(project, version) def build_source_package(project): diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index dd261de..531dab6 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -7,17 +7,17 @@ import lib.rpm_spec -def get_conflicts(feed): +def get_conflicts(): ret = [] for f in lib.config.feeds: - if f == feed: + if f == lib.args.feed: continue ret += [f"osmocom-{f}"] return ret -def prepare_source_dir(feed): - path = f"{lib.config.path_cache}/osmocom-{feed}" +def prepare_source_dir(): + path = f"{lib.config.path_cache}/osmocom-{lib.args.feed}" if os.path.exists(path): lib.run_cmd(["rm", "-rf", path]) @@ -26,9 +26,10 @@ os.makedirs(f"{path}/contrib") -def generate_debian_pkg(feed, version): +def generate_debian_pkg(version): + feed = lib.args.feed path = f"{lib.config.path_cache}/osmocom-{feed}" - conflicts = get_conflicts(feed) + conflicts = get_conflicts() with open(f"{path}/debian/control", "w") as f: f.write(f"Source: osmocom-{feed}\n") @@ -63,11 +64,12 @@ f.write("10\n") -def generate_rpm_spec(feed, version): +def generate_rpm_spec(version): + feed = lib.args.feed print(f"osmocom-{feed}: generating rpm spec file") path = (f"{lib.config.path_cache}/osmocom-{feed}/contrib/osmocom-{feed}" ".spec.in") - conflicts = get_conflicts(feed) + conflicts = get_conflicts() with open(path, "w") as f: f.write(f"Name: osmocom-{feed}\n") @@ -83,13 +85,14 @@ f.write("%files\n") -def build(feed, conflict_version): +def build(conflict_version): + feed = lib.args.feed pkgname = f"osmocom-{feed}" version = conflict_version if conflict_version else "1.0.0" print(f"{pkgname}: generating meta package {version}") - prepare_source_dir(feed) - generate_debian_pkg(feed, version) + prepare_source_dir() + generate_debian_pkg(version) os.makedirs(lib.get_output_path(pkgname)) lib.remove_cache_extra_files() @@ -97,7 +100,7 @@ lib.debian.build_source_package(pkgname) lib.debian.move_files_to_output(pkgname) - generate_rpm_spec(feed, version) + generate_rpm_spec(version) lib.rpm_spec.copy_to_output(pkgname) lib.remove_cache_extra_files() diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py index 6a1d42b..c2f6ad4 100644 --- a/scripts/obs/lib/osc.py +++ b/scripts/obs/lib/osc.py @@ -64,7 +64,8 @@ return ret.output.rstrip().split("\n") -def get_package_version(package, feed): +def get_package_version(package): + feed = lib.args.feed proj = lib.args.obs_project print(f"{package}: getting OBS version") ret = run_osc(["list", proj, os.path.basename(package)]) diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index e888ffa..4816363 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -9,8 +9,9 @@ import lib.rpm_spec -def checkout_for_feed(project, feed, branch=None): +def checkout_for_feed(project, branch=None): """ checkout a commit, either latest tag or master or 20YY branch """ + feed = lib.args.feed if branch: lib.git.checkout(project, f"origin/{branch}") elif feed == "latest": @@ -55,8 +56,8 @@ return ret.output -def get_version_for_feed(project, feed, conflict_version): - if feed == "latest": +def get_version_for_feed(project, conflict_version): + if lib.args.feed == "latest": # There's always a tag if we are here. If there was none, the build # would have been skipped for latest. ret = lib.git.get_latest_tag(project) @@ -130,14 +131,15 @@ pathlib.Path(f"{output_path}/commit_{commit}.txt").touch() -def build(project, feed, branch, conflict_version, fetch, gerrit_id=0): +def build(project, branch, conflict_version, fetch, gerrit_id=0): + feed = lib.args.feed lib.git.clone(project, fetch) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) else: - checkout_for_feed(project, feed, branch) - version = get_version_for_feed(project, feed, conflict_version) + checkout_for_feed(project, branch) + version = get_version_for_feed(project, conflict_version) 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 @@ -151,7 +153,7 @@ if has_rpm_spec: lib.rpm_spec.add_depend(project, metapkg, conflict_version) - lib.debian.changelog_add_entry_if_needed(project, feed, version_epoch) + lib.debian.changelog_add_entry_if_needed(project, version_epoch) os.makedirs(lib.get_output_path(project)) lib.remove_cache_extra_files() diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 5718a45..a6f8643 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -32,7 +32,7 @@ return ret -def build_srcpkg(feed, branch, package, conflict_version, fetch, is_meta_pkg): +def build_srcpkg(branch, package, conflict_version, fetch, is_meta_pkg): global srcpkgs_built global srcpkgs_failed_build @@ -40,9 +40,9 @@ try: if is_meta_pkg: - version = lib.metapkg.build(feed, conflict_version) + version = lib.metapkg.build(conflict_version) else: - version = lib.srcpkg.build(package, feed, branch, conflict_version, fetch) + version = lib.srcpkg.build(package, branch, conflict_version, fetch) srcpkgs_built[package] = version except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -62,9 +62,10 @@ return False -def build_srcpkg_if_needed(feed, branch, pkgs_remote, package, conflict_version, +def build_srcpkg_if_needed(branch, pkgs_remote, package, conflict_version, fetch, is_meta_pkg, skip_up_to_date): global srcpkgs_skipped + feed = lib.args.feed if feed in ["master", "latest"]: """ Check if we can skip this package by comparing the OBS version with @@ -85,7 +86,7 @@ if os.path.basename(package) not in pkgs_remote: print(f"{package}: building source package (not in OBS)") else: - obs_version = lib.osc.get_package_version(package, feed) + obs_version = lib.osc.get_package_version(package) if is_up_to_date(obs_version, latest_version): if skip_up_to_date: print(f"{package}: skipping ({obs_version} is up-to-date)") @@ -101,31 +102,32 @@ else: print(f"{package}: building source package (feed is {feed})") - build_srcpkg(feed, branch, package, conflict_version, fetch, is_meta_pkg) + build_srcpkg(branch, package, conflict_version, fetch, is_meta_pkg) -def upload_srcpkg(feed, pkgs_remote, package, version): +def upload_srcpkg(pkgs_remote, package, version): if os.path.basename(package) not in pkgs_remote: lib.osc.create_package(package) lib.osc.update_package(package, version) -def build_srcpkgs(feed, branch, pkgs_remote, packages, conflict_version, fetch, +def build_srcpkgs(branch, pkgs_remote, packages, conflict_version, fetch, meta, skip_up_to_date): print() print("### Building source packages ###") print() if meta: - build_srcpkg_if_needed(feed, branch, pkgs_remote, f"osmocom-{feed}", + feed = lib.args.feed + build_srcpkg_if_needed(branch, pkgs_remote, f"osmocom-{feed}", conflict_version, fetch, True, skip_up_to_date) for package in packages: - build_srcpkg_if_needed(feed, branch, pkgs_remote, package, + build_srcpkg_if_needed(branch, pkgs_remote, package, conflict_version, fetch, False, skip_up_to_date) -def upload_srcpkgs(feed, pkgs_remote): +def upload_srcpkgs(pkgs_remote): global srcpkgs_built global srcpkgs_failed_upload global srcpkgs_updated @@ -142,7 +144,7 @@ for package, version in srcpkgs_built.items(): try: - upload_srcpkg(feed, pkgs_remote, package, version) + upload_srcpkg(pkgs_remote, package, version) srcpkgs_updated += [package] except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -194,7 +196,6 @@ help="package name, e.g. libosmocore or open5gs," " default is all packages") args = parser.parse_args() - feed = args.feed branch = args.git_branch packages = parse_packages(args.package) @@ -214,9 +215,9 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(feed, branch, pkgs_remote, packages, args.conflict_version, + build_srcpkgs(branch, pkgs_remote, packages, args.conflict_version, args.git_fetch, args.meta, args.skip_up_to_date) - upload_srcpkgs(feed, pkgs_remote) + upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9124d33c45ef3fef48666b485fd169eec0eb393a Gerrit-Change-Number: 31928 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[M] Change in osmo-ci[master]: obs: don't pass proj through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31927 ) Change subject: obs: don't pass proj through functions ...................................................................... obs: don't pass proj through functions Change-Id: Id213ae155f34c74529845ff86468b68ffa6ffb1d --- M scripts/obs/lib/osc.py M scripts/obs/update_obs_project.py 2 files changed, 35 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py index df5c34c..6a1d42b 100644 --- a/scripts/obs/lib/osc.py +++ b/scripts/obs/lib/osc.py @@ -12,11 +12,12 @@ apiurl = None -def check_proj(obs_project): - if ":" in obs_project: +def check_proj(): + proj = lib.args.obs_project + if ":" in proj: return - print(f"ERROR: this doesn't look like a valid OBS project: {obs_project}") + print(f"ERROR: this doesn't look like a valid OBS project: {proj}") exit(1) @@ -56,13 +57,15 @@ return lib.run_cmd(cmd, *args, **kwargs) -def get_remote_pkgs(proj): +def get_remote_pkgs(): + proj = lib.args.obs_project print(f"OBS: getting packages in {proj}") ret = run_osc(["list", proj]) return ret.output.rstrip().split("\n") -def get_package_version(proj, package, feed): +def get_package_version(package, feed): + proj = lib.args.obs_project print(f"{package}: getting OBS version") ret = run_osc(["list", proj, os.path.basename(package)]) @@ -87,7 +90,8 @@ " extracting the version from the file list") -def create_package(proj, package): +def create_package(package): + proj = lib.args.obs_project print(f"{package}: creating new OBS package") # cut off repository prefix like in "python/osmo-python-tests" @@ -111,7 +115,8 @@ lib.run_cmd(["rm", "-rf", f"{lib.config.path_temp}/osc"]) -def update_package(proj, package, version): +def update_package(package, version): + proj = lib.args.obs_project print(f"{package}: updating OBS package") # cut off repository prefix like in "python/osmo-python-tests" diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 0ae949b..5718a45 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -62,7 +62,7 @@ return False -def build_srcpkg_if_needed(proj, feed, branch, pkgs_remote, package, conflict_version, +def build_srcpkg_if_needed(feed, branch, pkgs_remote, package, conflict_version, fetch, is_meta_pkg, skip_up_to_date): global srcpkgs_skipped @@ -85,7 +85,7 @@ if os.path.basename(package) not in pkgs_remote: print(f"{package}: building source package (not in OBS)") else: - obs_version = lib.osc.get_package_version(proj, package, feed) + obs_version = lib.osc.get_package_version(package, feed) if is_up_to_date(obs_version, latest_version): if skip_up_to_date: print(f"{package}: skipping ({obs_version} is up-to-date)") @@ -104,28 +104,28 @@ build_srcpkg(feed, branch, package, conflict_version, fetch, is_meta_pkg) -def upload_srcpkg(proj, feed, pkgs_remote, package, version): +def upload_srcpkg(feed, pkgs_remote, package, version): if os.path.basename(package) not in pkgs_remote: - lib.osc.create_package(proj, package) - lib.osc.update_package(proj, package, version) + lib.osc.create_package(package) + lib.osc.update_package(package, version) -def build_srcpkgs(proj, feed, branch, pkgs_remote, packages, conflict_version, fetch, +def build_srcpkgs(feed, branch, pkgs_remote, packages, conflict_version, fetch, meta, skip_up_to_date): print() print("### Building source packages ###") print() if meta: - build_srcpkg_if_needed(proj, feed, branch, pkgs_remote, f"osmocom-{feed}", + build_srcpkg_if_needed(feed, branch, pkgs_remote, f"osmocom-{feed}", conflict_version, fetch, True, skip_up_to_date) for package in packages: - build_srcpkg_if_needed(proj, feed, branch, pkgs_remote, package, + build_srcpkg_if_needed(feed, branch, pkgs_remote, package, conflict_version, fetch, False, skip_up_to_date) -def upload_srcpkgs(proj, feed, pkgs_remote): +def upload_srcpkgs(feed, pkgs_remote): global srcpkgs_built global srcpkgs_failed_upload global srcpkgs_updated @@ -142,7 +142,7 @@ for package, version in srcpkgs_built.items(): try: - upload_srcpkg(proj, feed, pkgs_remote, package, version) + upload_srcpkg(feed, pkgs_remote, package, version) srcpkgs_updated += [package] except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -194,7 +194,6 @@ help="package name, e.g. libosmocore or open5gs," " default is all packages") args = parser.parse_args() - proj = args.obs_project feed = args.feed branch = args.git_branch packages = parse_packages(args.package) @@ -204,7 +203,7 @@ if args.docker: lib.docker.run_in_docker_and_exit("update_obs_project.py", True) - lib.osc.check_proj(proj) + lib.osc.check_proj() lib.osc.check_oscrc() lib.osc.set_apiurl(args.apiurl) @@ -213,11 +212,11 @@ lib.remove_temp() - pkgs_remote = lib.osc.get_remote_pkgs(proj) + pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(proj, feed, branch, pkgs_remote, packages, args.conflict_version, + build_srcpkgs(feed, branch, pkgs_remote, packages, args.conflict_version, args.git_fetch, args.meta, args.skip_up_to_date) - upload_srcpkgs(proj, feed, pkgs_remote) + upload_srcpkgs(feed, pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id213ae155f34c74529845ff86468b68ffa6ffb1d Gerrit-Change-Number: 31927 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[S] Change in osmo-ci[master]: obs: don't pass branch through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31929 ) Change subject: obs: don't pass branch through functions ...................................................................... obs: don't pass branch through functions Change-Id: I9ec6d04c51bc795dd9cd4738313e60a556791eb2 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/srcpkg.py M scripts/obs/update_obs_project.py 3 files changed, 23 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 597092c..6502206 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -44,7 +44,7 @@ lib.metapkg.build(args.conflict_version) if args.package: - lib.srcpkg.build(args.package, args.git_branch, args.conflict_version, + lib.srcpkg.build(args.package, args.conflict_version, args.git_fetch, args.gerrit_id) diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 4816363..59a6c45 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -9,9 +9,10 @@ import lib.rpm_spec -def checkout_for_feed(project, branch=None): +def checkout_for_feed(project): """ checkout a commit, either latest tag or master or 20YY branch """ feed = lib.args.feed + branch = lib.args.git_branch if branch: lib.git.checkout(project, f"origin/{branch}") elif feed == "latest": @@ -131,14 +132,14 @@ pathlib.Path(f"{output_path}/commit_{commit}.txt").touch() -def build(project, branch, conflict_version, fetch, gerrit_id=0): +def build(project, conflict_version, fetch, gerrit_id=0): feed = lib.args.feed lib.git.clone(project, fetch) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) else: - checkout_for_feed(project, branch) + checkout_for_feed(project) version = get_version_for_feed(project, conflict_version) epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index a6f8643..716f52b 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -32,7 +32,7 @@ return ret -def build_srcpkg(branch, package, conflict_version, fetch, is_meta_pkg): +def build_srcpkg(package, conflict_version, fetch, is_meta_pkg): global srcpkgs_built global srcpkgs_failed_build @@ -42,7 +42,7 @@ if is_meta_pkg: version = lib.metapkg.build(conflict_version) else: - version = lib.srcpkg.build(package, branch, conflict_version, fetch) + version = lib.srcpkg.build(package, conflict_version, fetch) srcpkgs_built[package] = version except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -62,10 +62,11 @@ return False -def build_srcpkg_if_needed(branch, pkgs_remote, package, conflict_version, +def build_srcpkg_if_needed(pkgs_remote, package, conflict_version, fetch, is_meta_pkg, skip_up_to_date): global srcpkgs_skipped feed = lib.args.feed + branch = lib.args.git_branch if feed in ["master", "latest"]: """ Check if we can skip this package by comparing the OBS version with @@ -102,7 +103,7 @@ else: print(f"{package}: building source package (feed is {feed})") - build_srcpkg(branch, package, conflict_version, fetch, is_meta_pkg) + build_srcpkg(package, conflict_version, fetch, is_meta_pkg) def upload_srcpkg(pkgs_remote, package, version): @@ -111,7 +112,7 @@ lib.osc.update_package(package, version) -def build_srcpkgs(branch, pkgs_remote, packages, conflict_version, fetch, +def build_srcpkgs(pkgs_remote, packages, conflict_version, fetch, meta, skip_up_to_date): print() print("### Building source packages ###") @@ -119,11 +120,11 @@ if meta: feed = lib.args.feed - build_srcpkg_if_needed(branch, pkgs_remote, f"osmocom-{feed}", + build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", conflict_version, fetch, True, skip_up_to_date) for package in packages: - build_srcpkg_if_needed(branch, pkgs_remote, package, + build_srcpkg_if_needed(pkgs_remote, package, conflict_version, fetch, False, skip_up_to_date) @@ -196,7 +197,6 @@ help="package name, e.g. libosmocore or open5gs," " default is all packages") args = parser.parse_args() - branch = args.git_branch packages = parse_packages(args.package) lib.set_args(args) @@ -215,7 +215,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(branch, pkgs_remote, packages, args.conflict_version, + build_srcpkgs(pkgs_remote, packages, args.conflict_version, args.git_fetch, args.meta, args.skip_up_to_date) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9ec6d04c51bc795dd9cd4738313e60a556791eb2 Gerrit-Change-Number: 31929 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[S] Change in osmo-ci[master]: obs: don't pass conflict_version through functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31930 ) Change subject: obs: don't pass conflict_version through functions ...................................................................... obs: don't pass conflict_version through functions Change-Id: I3d712e94d56269c49ee5baecfee1fa9f35101488 --- M scripts/obs/build_srcpkg.py M scripts/obs/lib/metapkg.py M scripts/obs/lib/srcpkg.py M scripts/obs/update_obs_project.py 4 files changed, 29 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 6502206..9163061 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -41,10 +41,10 @@ lib.remove_temp() if args.meta: - lib.metapkg.build(args.conflict_version) + lib.metapkg.build() if args.package: - lib.srcpkg.build(args.package, args.conflict_version, + lib.srcpkg.build(args.package, args.git_fetch, args.gerrit_id) diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 531dab6..847a56b 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -85,9 +85,10 @@ f.write("%files\n") -def build(conflict_version): +def build(): feed = lib.args.feed pkgname = f"osmocom-{feed}" + conflict_version = lib.args.conflict_version version = conflict_version if conflict_version else "1.0.0" print(f"{pkgname}: generating meta package {version}") diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 59a6c45..f1d610d 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -57,7 +57,7 @@ return ret.output -def get_version_for_feed(project, conflict_version): +def get_version_for_feed(project): if lib.args.feed == "latest": # There's always a tag if we are here. If there was none, the build # would have been skipped for latest. @@ -76,6 +76,7 @@ # Append the conflict_version to increase the version even if the commit # did not change (OS#5135) + conflict_version = lib.args.conflict_version if conflict_version: ret = f"{ret}.{conflict_version}" @@ -132,7 +133,7 @@ pathlib.Path(f"{output_path}/commit_{commit}.txt").touch() -def build(project, conflict_version, fetch, gerrit_id=0): +def build(project, fetch, gerrit_id=0): feed = lib.args.feed lib.git.clone(project, fetch) lib.git.clean(project) @@ -140,7 +141,7 @@ lib.git.checkout_from_review(project, gerrit_id) else: checkout_for_feed(project) - version = get_version_for_feed(project, conflict_version) + version = get_version_for_feed(project) 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 @@ -150,9 +151,9 @@ if project in lib.config.projects_osmocom: metapkg = f"osmocom-{feed}" - lib.debian.control_add_depend(project, metapkg, conflict_version) + lib.debian.control_add_depend(project, metapkg, version) if has_rpm_spec: - lib.rpm_spec.add_depend(project, metapkg, conflict_version) + lib.rpm_spec.add_depend(project, metapkg, version) lib.debian.changelog_add_entry_if_needed(project, version_epoch) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 716f52b..155caee 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -32,7 +32,7 @@ return ret -def build_srcpkg(package, conflict_version, fetch, is_meta_pkg): +def build_srcpkg(package, fetch, is_meta_pkg): global srcpkgs_built global srcpkgs_failed_build @@ -40,9 +40,9 @@ try: if is_meta_pkg: - version = lib.metapkg.build(conflict_version) + version = lib.metapkg.build() else: - version = lib.srcpkg.build(package, conflict_version, fetch) + version = lib.srcpkg.build(package, fetch) srcpkgs_built[package] = version except Exception as ex: traceback.print_exception(type(ex), ex, ex.__traceback__) @@ -62,7 +62,7 @@ return False -def build_srcpkg_if_needed(pkgs_remote, package, conflict_version, +def build_srcpkg_if_needed(pkgs_remote, package, fetch, is_meta_pkg, skip_up_to_date): global srcpkgs_skipped feed = lib.args.feed @@ -72,6 +72,7 @@ """ Check if we can skip this package by comparing the OBS version with the git remote. """ if is_meta_pkg: + conflict_version = lib.args.conflict_version latest_version = conflict_version if conflict_version else "1.0.0" else: if feed == "master": @@ -103,7 +104,7 @@ else: print(f"{package}: building source package (feed is {feed})") - build_srcpkg(package, conflict_version, fetch, is_meta_pkg) + build_srcpkg(package, fetch, is_meta_pkg) def upload_srcpkg(pkgs_remote, package, version): @@ -112,7 +113,7 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, conflict_version, fetch, +def build_srcpkgs(pkgs_remote, packages, fetch, meta, skip_up_to_date): print() print("### Building source packages ###") @@ -121,11 +122,11 @@ if meta: feed = lib.args.feed build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", - conflict_version, fetch, True, skip_up_to_date) + fetch, True, skip_up_to_date) for package in packages: build_srcpkg_if_needed(pkgs_remote, package, - conflict_version, fetch, False, skip_up_to_date) + fetch, False, skip_up_to_date) def upload_srcpkgs(pkgs_remote): @@ -215,7 +216,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, args.conflict_version, + build_srcpkgs(pkgs_remote, packages, args.git_fetch, args.meta, args.skip_up_to_date) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3d712e94d56269c49ee5baecfee1fa9f35101488 Gerrit-Change-Number: 31930 Gerrit-PatchSet: 1 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

2 years, 3 months

1
0
0 0

[S] Change in osmo-bts[master]: PCU IF: Update NSE timer field

by dexter

Attention is currently required from: arehbein, pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31885 ) Change subject: PCU IF: Update NSE timer field ...................................................................... Patch Set 1: (1 comment) File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/31885/comment/76c78d05_cc599e2f PS1, Line 156: PCU_IF_NUM_NSE_TIMERS > Ah of course, didn't think of that @fixeria. […] You could move nse_timer[] to the end of the struct. This wouldn't break the ABI, but in case a new timer has to be added you cannot easily enlarge the array. I see there are already some txxx and nxxx variables in this struct. Why not adding the 8 timers as separate variables at the end of the struct? (Are we limited in space here? What if the info_ind grows larger than struct gsm_pcu_if_data, which seems to be the biggest struct at the moment.) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7385574ef4bd4529d2e7e3d2000b7a1551ef1fcb Gerrit-Change-Number: 31885 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Mar 2023 09:10:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-bsc[master]: fix bs11_read_swl_file(): properly clean up stale file list

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31939 ) Change subject: fix bs11_read_swl_file(): properly clean up stale file list ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5eaa328aaf6881ae9621ca14859e4e255af2b00 Gerrit-Change-Number: 31939 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, 16 Mar 2023 08:09:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2023