#12037 Fix F40 flatpak build tags
Closed: Fixed a month ago by yselkowitz. Opened a month ago by yselkowitz.

  • Describe the issue
    Several modifications to the flatpak build tags made during F39 bringup were not updated in whatever automation was used to create the F40 flatpak tags, compare:
$ koji taginfo f39-flatpak-app-build
Tag: f39-flatpak-app-build [70620]
Arches: x86_64 aarch64 ppc64le
Groups: appliance-build, build, livecd-build, livemedia-build, srpm-build
Tag options:
  mock.new_chroot : 1          [f39]
  mock.package_manager : 'dnf' [f39]
  rpm.macro._without_mingw : 1
  rpm.macro.dist : ('%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do '
 'print("%{?distprefix" .. i .."}") '
 'end}}%{distcore}%{?with_bootstrap:%{__bootstrap}}')
  rpm.macro.distcore : '.fc%{fedora}app4'
  sidetag_rpm_macros_allowed : '_with_bootstrap' [f39-build]
  tag2distrepo.enabled : True  [f39-flatpak-app]
  tag2distrepo.inherit : False [f39-flatpak-app]
This tag is a buildroot for one or more targets
Current repo: repo#5950867: 2024-03-25 11:55:59.646752+00:00
Targets that build from this tag:
  f39-flatpak-app
Inheritance:
  0    .... f39-flatpak-app [70617]
  10   .... f39-flatpak-runtime [70616]
  20   .... f39-build [62885]

$ koji taginfo f40-flatpak-app-build
Tag: f40-flatpak-app-build [84723]
Arches: x86_64 aarch64 ppc64le
Groups: appliance-build, build, kiwi-build, livecd-build, livemedia-build, srpm-build
Tag options:
  mock.new_chroot : 1          [f40]
  mock.package_manager : 'dnf5' [f40]
  rpm.macro.distcore : '.fc%{fedora}app'
  sidetag_rpm_macros_allowed : '_with_bootstrap' [f40-build]
  tag2distrepo.enabled : 'true' [f40-flatpak-app]
  tag2distrepo.inherit : 'false' [f40-flatpak-app]
This tag is a buildroot for one or more targets
Current repo: repo#5952021: 2024-03-25 16:51:47.823369+00:00
Targets that build from this tag:
  f40-flatpak-app
Inheritance:
  0    .... f40-flatpak-app [84720]
  10   .... f40-flatpak-runtime [84719]
  20   .... f40-build [71278]

$ koji taginfo f39-flatpak-runtime-build
Tag: f39-flatpak-runtime-build [70619]
Arches: x86_64 aarch64 ppc64le
Groups: appliance-build, build, livecd-build, livemedia-build, srpm-build
Tag options:
  mock.new_chroot : 1          [f39]
  mock.package_manager : 'dnf' [f39]
  rpm.macro.dist : ('%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do '
 'print("%{?distprefix" .. i .."}") '
 'end}}%{distcore}%{?with_bootstrap:%{__bootstrap}}')
  rpm.macro.distcore : '.fc%{fedora}runtime'
  rpm.macro.flatpak_runtime : 1
  sidetag_rpm_macros_allowed : '_with_bootstrap' [f39-build]
This tag is a buildroot for one or more targets
Current repo: repo#5952119: 2024-03-25 17:03:48.812666+00:00
Targets that build from this tag:
  f39-flatpak-runtime
Inheritance:
  0    .... f39-flatpak-runtime [70616]
  10   .... f39-build [62885]

$ koji taginfo f40-flatpak-runtime-build
Tag: f40-flatpak-runtime-build [84722]
Arches: x86_64 aarch64 ppc64le
Groups: appliance-build, build, kiwi-build, livecd-build, livemedia-build, srpm-build
Tag options:
  mock.new_chroot : 1          [f40]
  mock.package_manager : 'dnf5' [f40]
  rpm.macro.distcore : '.fc%{fedora}runtime'
  sidetag_rpm_macros_allowed : '_with_bootstrap' [f40-build]
This tag is a buildroot for one or more targets
Current repo: repo#5952181: 2024-03-25 17:09:51.949267+00:00
Targets that build from this tag:
  f40-flatpak-runtime
Inheritance:
  0    .... f40-flatpak-runtime [84719]
  10   .... f40-build [71278]

The following changes are needed:

  • Define rpm.macro.dist in both f40-flatpak-app-build and f40-flatpak-runtime-build to ('%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do ' 'print("%{?distprefix" .. i .."}") ' 'end}}%{distcore}%{?with_bootstrap:%{__bootstrap}}');
  • Define rpm.macro.distcore to .fc%{fedora}app1in f40-flatpak-app-build;
  • Define rpm.macro.distcore to .fc%{fedora}runtime1 in f40-flatpak-runtime-build;
  • Define rpm.macro._without_mingw as 1 in f40-flatpak-app-build;
  • Define rpm.macro.flatpak_runtime as 1 in f40-flatpak-runtime-build;
  • If the change of format in tag2distrepo.enabled and tag2distrepo.inherit from boolean to text is in error, fix those in f40-flatpak-app;
  • Finally, make all these changes in the branching automation so that they are correctly handled for f41-flatpak-* tags when the time comes.

/cc @otaylor @kalev

  • When do you need this? (YYYY/MM/DD)
    ASAP so that we can start building F40 flatpak content.

  • When is this no longer needed or useful? (YYYY/MM/DD)

  • If we cannot complete your request, what is the impact?


Metadata Update from @phsmoura:
- Issue tagged with: medium-gain, medium-trouble, ops

a month ago

Filed https://pagure.io/releng/pull-request/12038

I guess rpm.macro.dist doesn't need to be explicitly defined any more? If so, disregard that request.

Are the tag2distrepo changes significant?

Metadata Update from @jnsamyak:
- Issue assigned to kevin

a month ago

We really need this ASAP so that we can start building F40 flatpaks before the final freeze.

Filed https://pagure.io/releng/pull-request/12038

Thanks.

I guess rpm.macro.dist doesn't need to be explicitly defined any more? If so, disregard that request.

It shouldn't need to be. Can we drop that for now, and if you see problems revisit?

Are the tag2distrepo changes significant?

I don't think they are, but we should at least be consistent.

So, I have:

koji edit-tag -x rpm.macro.distcore=.fc%{fedora}app1 f40-flatpak-app-build
koji edit-tag -x rpm.macro.distcore=.fc%{fedora}runtime1 f40-flatpak-runtime-build
koji edit-tag -x rpm.macro._without_mingw=1 f40-flatpak-app-build
koji edit-tag -x rpm.macro.flatpak_runtime=1 f40-flatpak-runtime-build
koji edit-tag -x tag2distrepo.enabled=True f40-flatpak-app
koji edit-tag -x tag2distrepo.inherit=False f40-flatpak-app

Look right?

The first four lines look right and are definitely needed. FWIW other parts of make-koji-release-tags uses true, so maybe those last two don't matter?

I was just looking at f39-flatpak-app for reference:

Tag: f39-flatpak-app [70617]
Arches: x86_64 aarch64 ppc64le
Groups: appliance-build, build, livecd-build, livemedia-build, srpm-build
Tag options:
  mock.new_chroot : 1          [f39]
  mock.package_manager : 'dnf' [f39]
  tag2distrepo.enabled : True
  tag2distrepo.inherit : False
Targets that build into this tag:
  f39-flatpak-app (f39-flatpak-app-build, repo#5961283: 2024-03-28 00:18:45.496204+00:00)
  f39-flatpak-runtime-kojira (f39-flatpak-runtime-packages, repo#5961304: 2024-03-28 00:20:55.657639+00:00)
Inheritance:
  0    ..I. f39 [62875]

I ran the first 4 commands.

Looks like we're set, thanks.

Metadata Update from @yselkowitz:
- Issue close_status updated to: Fixed
- Issue status updated to: Closed (was: Open)

a month ago

Login to comment on this ticket.

Metadata
Boards 1
Ops Status: Backlog