osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37175?usp=email )
Change subject: OBS: fix using --conflict-pkgname ......................................................................
OBS: fix using --conflict-pkgname
Use --conflict-pkgname as package name, instead of hardcoding osmocom-$FEED.
Fix for: FileNotFoundError: [Errno 2] No such file or directory: '/obs/_cache/osmocom-nightly-asan'
Change-Id: I4ddb2e9adc25e7e8e8c9d17236b76d9f2e9c2a9c --- M scripts/obs/lib/metapkg.py M scripts/obs/update_obs_project.py 2 files changed, 35 insertions(+), 20 deletions(-)
Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/scripts/obs/lib/metapkg.py b/scripts/obs/lib/metapkg.py index 38ed930..8a9922d 100644 --- a/scripts/obs/lib/metapkg.py +++ b/scripts/obs/lib/metapkg.py @@ -7,17 +7,17 @@ import lib.rpm_spec
-def get_conflicts(): +def get_conflicts(pkgname): ret = [] for f in lib.config.feeds: - if f == lib.args.feed: + if "osmocom-{f}" == pkgname: continue ret += [f"osmocom-{f}"] return ret
-def prepare_source_dir(): - path = f"{lib.config.path_cache}/osmocom-{lib.args.feed}" +def prepare_source_dir(pkgname): + path = f"{lib.config.path_cache}/{pkgname}"
if os.path.exists(path): lib.run_cmd(["rm", "-rf", path]) @@ -26,27 +26,27 @@ os.makedirs(f"{path}/contrib")
-def generate_debian_pkg(version): +def generate_debian_pkg(pkgname, version): feed = lib.args.feed - path = f"{lib.config.path_cache}/osmocom-{feed}" - conflicts = get_conflicts() + path = f"{lib.config.path_cache}/{pkgname}" + conflicts = get_conflicts(pkgname)
with open(f"{path}/debian/control", "w") as f: - f.write(f"Source: osmocom-{feed}\n") + f.write(f"Source: {pkgname}\n") f.write("Section: unknown\n") f.write("Priority: optional\n") f.write("Maintainer: Osmocom OBS scripts info@osmocom.org\n") f.write("Build-Depends: debhelper (>= 10)\n") f.write("Standards-Version: 3.9.8\n") f.write("\n") - f.write(f"Package: osmocom-{feed}\n") + f.write(f"Package: {pkgname}\n") f.write("Depends: ${misc:Depends}\n") f.write("Architecture: any\n") f.write(f"Conflicts: {', '.join(conflicts)}\n") f.write(f"Description: Dummy package, conflicts with {conflicts}\n")
with open(f"{path}/debian/changelog", "w") as f: - f.write(f"osmocom-{feed} ({version}) unstable; urgency=medium\n") + f.write(f"{pkgname} ({version}) unstable; urgency=medium\n") f.write("\n") f.write(f" * Dummy package, which conflicts with: {conflicts}\n") f.write("\n") @@ -64,15 +64,14 @@ f.write("10\n")
-def generate_rpm_spec(version): +def generate_rpm_spec(pkgname, 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() + print(f"{pkgname}: generating rpm spec file") + path = f"{lib.config.path_cache}/{pkgname}/contrib/{pkgname}.spec.in" + conflicts = get_conflicts(pkgname)
with open(path, "w") as f: - f.write(f"Name: osmocom-{feed}\n") + f.write(f"Name: {pkgname}\n") f.write(f"Version: {version}\n") f.write(f"Summary: Dummy package, conflicts with: {conflicts}\n") f.write("Release: 0\n") @@ -92,8 +91,8 @@ version = conflict_version if conflict_version else "1.0.0" print(f"{pkgname}: generating meta package {version}")
- prepare_source_dir() - generate_debian_pkg(version) + prepare_source_dir(pkgname) + generate_debian_pkg(pkgname, version)
os.makedirs(lib.get_output_path(pkgname)) lib.remove_cache_extra_files() @@ -101,7 +100,7 @@ lib.debian.build_source_package(pkgname) lib.debian.move_files_to_output(pkgname)
- generate_rpm_spec(version) + generate_rpm_spec(pkgname, version) lib.rpm_spec.copy_to_output(pkgname)
lib.remove_cache_extra_files() diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 6f3bffc..08d789d 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -142,7 +142,8 @@
if lib.args.meta: feed = lib.args.feed - build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True) + metapkg = lib.args.conflict_pkgname or f"osmocom-{feed}" + build_srcpkg_if_needed(pkgs_remote, metapkg, True)
for package in packages: build_srcpkg_if_needed(pkgs_remote, package, False)
-
osmith