Page MenuHomeSoftware Heritage

fedora: Update versions in packages dict provided as loader argument
ClosedPublic

Authored by anlambert on Tue, Nov 15, 5:11 PM.

Details

Summary

In a similar way to the debian lister, use the following versions in the
packages dictionary provided to the generic rpm loader:

  • dict keys are package versions prefixed by the fedora release and edition they have been found (fedora{release}/{edition}/{version}), they will be used as branch names targeting releases in the snapshot created by the rpm loader
  • version fields in dict values are the package intrinsic versions parsed from package repository metadata excluding any ".fcXY" suffixes to avoid the loader to create multiple releases targeting the same directory, they will be used as release names in the snapshot created by the rpm loader

Related to T4448

This is what we obtain in the webapp in docker after D8847 got landed, rpm
loader slightly adapted (will add comments in D8753 for the changes) and
some fedora packages loaded:




Diff Detail

Repository
rDLS Listers
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D8848 (id=31891)

Rebasing onto 6ad61aec23...

Current branch diff-target is up to date.
Changes applied before test
commit bf81cfb2ed1965454b9a00f1ac86f308ab14a0ee
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Tue Nov 15 16:54:30 2022 +0100

    fedora: Update versions in packages dict provided as loader argument
    
    In a similar way to the debian lister, use the following versions in the
    packages dictionary provided to the generic rpm loader:
    
    - dict keys are package versions prefixed by the fedora release and
      edition they have been found (fedora{release}/{edition}/{version}),
      they will be used as branch names targeting releases in the snapshot
      created by the rpm loader
    
    - version fields in dict values are the package intrinsic versions parsed
      from package repository metadata excluding any ".fcXY" suffixes to avoid
      the loader to create multiple releases targeting the same directory,
      they will be used as release names in the snapshot created by the rpm
      loader
    
    Related to T4448

See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/863/ for more details.

ardumont added a subscriber: ardumont.

lgtm, one question inline.

swh/lister/fedora/tests/test_lister.py
44–45

yes, ok, the fedora version is here anyway.
It is sent along to the loader which keeps it in some metadata right?

This revision is now accepted and ready to land.Thu, Nov 17, 9:57 AM
swh/lister/fedora/tests/test_lister.py
44–45

The release and edition fields are not exploited by the loader so we can remove them I guess.

Rebase and remove unused fields in dicts sent to rpm loader.

Build is green

Patch application report for D8848 (id=31941)

Rebasing onto 065b3f81a1...

Current branch diff-target is up to date.
Changes applied before test
commit f4aafe026b29584e5bee1443b1def7d4dd8d8289
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Tue Nov 15 16:54:30 2022 +0100

    fedora: Update versions in packages dict provided as loader argument
    
    In a similar way to the debian lister, use the following versions in the
    packages dictionary provided to the generic rpm loader:
    
    - dict keys are package versions prefixed by the fedora release and
      edition they have been found (fedora{release}/{edition}/{version}),
      they will be used as branch names targeting releases in the snapshot
      created by the rpm loader
    
    - version fields in dict values are the package intrinsic versions parsed
      from package repository metadata excluding any ".fcXY" suffixes to avoid
      the loader to create multiple releases targeting the same directory,
      they will be used as release names in the snapshot created by the rpm
      loader
    
    Related to T4448

See https://jenkins.softwareheritage.org/job/DLS/job/tests-on-diff/866/ for more details.