#562 Get EPEL10 minor version from koji when it's not available from the branch name
Merged by onosek. Opened by dherrera.
dherrera/fedpkg epel_minor  into  master

Download 562.patch

When using the plain epel10 branch, we still need to set the minor version for both the dist_tag and override values.
As sugested by @carlwgeorge in #559 we can get this value from koji like how eln gets it's distval.
This PR does this by using the distcore macro value available from koji for the epel10 build target, which provides that information.

These changes should fix #559

1 new commit added

  • Fix EPEL10 branch expression to cover 2 or more digits.

1 new commit added

  • Get macros from epel-candidate build target.

branch.split('el')[1] could be simplified to branch[4:].

We could accomplish the same thing without resorting to regex.

major, minor = macros['distcore'][3:].split('_')

Similar to above, macros['distcore'].split('.')[1] could be simplified to macros['distcore'][1:].

Similar to above, a regex is probably overkill for this. How about this instead?

major, minor = branch[4:].split('.')

rebased onto 19feb5895e6a18e2d38ae62b465a2d70e1dc47a2

Hi, I rebased this on the top of #560 as it was suggested at #559.

1 new commit added

  • Improvements on string parsing

pretty please pagure-ci rebuild

This looks good to me. :thumbsup:

5 new commits added

  • Improvements on string parsing
  • Get macros from epel-candidate build target.
  • Fix EPEL10 branch expression to cover 2 or more digits.
  • Use minor value from koji when no minor in branch name
  • Fix minor requirements for EPEL10+ in test

2 new commits added

  • Handle rhel runtimes when minor version exists in disttag
  • Add tests cases for runtime_disttag removal when working with epel10

After checking the changes from #560 , I noticed that some changes were also required to make sure that disttags don't get removed on rhel-like runtimes when dealing with minor versions.

rebased onto bc1d18e659bf04bc33c8a627fedb323036f1f438

Pull-Request has been merged by onosek

Thanks for the change.
I put your patches among others and built fedpkg-1.45-5

Metadata