epel7-infra and epel7 conflicts wrt pagure updates (or, can we have an epel7-infra DistTag?)
Hey all,
So as you all know, Pagure 5.0 was released[1]. With 5.0, I've taken over primary maintenance of the package outside of epel7-infra, which means that Fedora and EPEL7 packages are generally maintained by me (with packaging changes generally synced from upstream), since Pierre-Yves doesn't have time to maintain it. We've already received the approval to re-sync pagure's EPEL7 package with Fedora to update to 5.0[2].
However, this presents a bit of a problem. Pierre-Yves updates the pagure package for epel7-infra before making the general release that I can consume and push to Fedora and EPEL7. This wouldn't be an issue, except that the DistTag for epel7-infra is the same as epel7 (.el7). This means I'm locked out of that NEVR for EPEL7 updates, due to the nature of Koji considering NEVR of builds globally unique. This is frustrating because it means that I can't maintain the common spec file for both Fedora and EPEL7 (which is in turn primarily maintained upstream in the pagure git repo).
Of course, I can just bump the Release to be above the epel7-infra build, but that means I'm playing NEVR games, and I don't want to do that. And if there needs to be distinct changes for epel7-infra, this is going to be an unpleasant fight.
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
For this current update round, I'm going to be putting a higher Release value because I need to anyway, as there's a bug in the way pagure is done that breaks packaging in Fedora and openSUSE[3]. But in the future, I'd like to have the freedom to use the correct NEVR everywhere.
What do you all think?
[1]: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro... [2]: https://meetbot.fedoraproject.org/teams/epel/epel.2018-09-26-17.01.html [3]: https://pagure.io/pagure/issue/3706
On 09/27/2018 10:39 PM, Neal Gompa wrote:
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
+1 to use custom dist tags for infra builds. But I would like to see this implemented for all infra repos, not only epel7-infra.
On 09/27/2018 01:50 PM, Mikolaj Izdebski wrote:
On 09/27/2018 10:39 PM, Neal Gompa wrote:
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
+1 to use custom dist tags for infra builds. But I would like to see this implemented for all infra repos, not only epel7-infra.
Is there an easy way to do this?
I'm ok with it, but perhaps we could do 'fedora-infra' or 'fi' since we aren't the only infrastructure out there. :)
kevin
On Fri, Sep 28, 2018 at 7:17 PM Kevin Fenzi kevin@scrye.com wrote:
On 09/27/2018 01:50 PM, Mikolaj Izdebski wrote:
On 09/27/2018 10:39 PM, Neal Gompa wrote:
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
+1 to use custom dist tags for infra builds. But I would like to see this implemented for all infra repos, not only epel7-infra.
Is there an easy way to do this?
I'm ok with it, but perhaps we could do 'fedora-infra' or 'fi' since we aren't the only infrastructure out there. :)
Can't use dashes, but sure, ".el7.fedinfra" or something like that is workable. Ordinarily, I'd say we could set this as a macro for a particular Koji tag, but unfortunately that functionality is not merged in yet[1]. So we might need a package or something to load it in such a way that rpm will always redefine %dist that way.
[1]: https://pagure.io/koji/pull-request/898
On 09/29/2018 01:16 AM, Kevin Fenzi wrote:
On 09/27/2018 01:50 PM, Mikolaj Izdebski wrote:
On 09/27/2018 10:39 PM, Neal Gompa wrote:
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
+1 to use custom dist tags for infra builds. But I would like to see this implemented for all infra repos, not only epel7-infra.
Is there an easy way to do this?
I think that currently the easiest way would be creating a package (like fedora-infra-srpm-macros) that would override %dist macro in a generic way, eg:
%dist .%{?fedora:fc%{fedora}}%{?rhel:el%{rhel}}.infra
Then add this package to all infra tags, and to build and srpm-build groups for these tags.
I can implement a PoC in staging.
I'm ok with it, but perhaps we could do 'fedora-infra' or 'fi' since we aren't the only infrastructure out there. :)
kevin
infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
El vie, 28-09-2018 a las 16:16 -0700, Kevin Fenzi escribió:
On 09/27/2018 01:50 PM, Mikolaj Izdebski wrote:
On 09/27/2018 10:39 PM, Neal Gompa wrote:
I'd like to propose that we change epel7-infra so that the DistTag defined in %dist is ".el7.infra" instead of ".el7". This will prevent the conflict and have the advantage that the infra tag is higher by default.
+1 to use custom dist tags for infra builds. But I would like to see this implemented for all infra repos, not only epel7-infra.
Is there an easy way to do this?
I'm ok with it, but perhaps we could do 'fedora-infra' or 'fi' since we aren't the only infrastructure out there. :)
need to build redhat-release-server in the infra tag and define the new value for the dist macro I would suggest .el7.infra or .el7.fi
Dennis
infrastructure@lists.fedoraproject.org
-
Dennis Gilmore -
Kevin Fenzi -
Mikolaj Izdebski -
Neal Gompa