tree: import changes from testing-devel at 459b2a406d

ci/overrides.py

@@ -115,42 +115,6 @@ def do_fast_track(args):
     for lockfile_path in get_lockfiles():
         merge_overrides(lockfile_path, overrides)
 
-    konflux_rpm_lock(overrides)
-
-
-def konflux_rpm_lock(overrides: dict):
-    # Modify the rpms.lock.yaml for override
-    lockfile_path = get_rpm_lockfile()
-    with open(lockfile_path) as f:
-        lockfile = yaml.safe_load(f)
-    for pkg_name, v in overrides.items():
-        is_noarch = v.get("evra") is not None
-        ver = v.get("evr") or v.get("evra")
-        nvr = f'{pkg_name}-{ver}'
-        update_rpm_lock_for_nvr(nvr, pkg_name, lockfile, is_noarch)
-    with open(lockfile_path, 'w') as f:
-        yaml.dump(lockfile, f)
-
-
-def update_rpm_lock_for_nvr(nvr, pkg_name, manifest, is_noarch):
-    nevra_form = libdnf5.rpm.VectorNevraForm(1, libdnf5.rpm.Nevra.Form_NEVRA)
-    updated = False
-    # Iterate over all the arches
-    for arch_block in manifest["arches"]:
-        arch = arch_block.get("arch")
-        packages = arch_block.get("packages")
-        # Check if the nvr already exists in the konflux rpm lock or not
-        for package_entry in packages:
-            package_nvr = package_entry["url"].split("/")[-1]
-            parsed_vector = libdnf5.rpm.Nevra.parse(package_nvr, nevra_form)
-            parsed = parsed_vector.pop()
-            # Update the nvr with the new url if a match is found
-            if parsed.get_name() == pkg_name:
-                package_entry["url"] = build_coreos_pool_url(nvr, arch, is_noarch)
-                updated = True
-    if not updated:
-        raise Exception(f"Cannot find specified package {nvr} in the konflux rpm lock")
-
 
 def do_pin(args):
     overrides = {}
@@ -170,8 +134,6 @@ def do_pin(args):
     for lockfile_path in get_lockfiles():
         merge_overrides(lockfile_path, overrides)
 
-    konflux_rpm_lock(overrides)
-
 
 def do_srpms(args):
     printed = False
@@ -346,22 +308,6 @@ def get_lockfiles():
     return [os.path.join(basedir, f) for f in lockfiles]
 
 
-def get_rpm_lockfile():
-    lockfile = 'rpms.lock.yaml'
-    return os.path.join(basedir, lockfile)
-
-
-def build_coreos_pool_url(nvr, arch, is_noarch):
-    """
-    nvr: e.g. 'audit-4.1.2-2.fc43'
-    """
-    first_letter = nvr[0].lower()
-    base = "https://kojipkgs.fedoraproject.org/repos-dist/coreos-pool/latest"
-    if is_noarch:
-        return f"{base}/{arch}/Packages/{first_letter}/{nvr}.rpm"
-    else:
-        return f"{base}/{arch}/Packages/{first_letter}/{nvr}.{arch}.rpm"
-
 def graduate_lockfile(base, fn):
     if not os.path.exists(fn):
         return