#1381 Add FEX-RootFS to the compose
Merged 5 months ago by sgallagh. Opened 5 months ago by dcavalca.
dcavalca/pungi-fedora fex  into  main

file modified
+12 -1
@@ -175,7 +175,18 @@ 

  		'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'

  	    ],

  	    'subvariant': 'Container_Toolbox',

-         }

+         },

+         {

+             'kiwi_profile': 'FEX-RootFS',

+             'arches': ['x86_64'],

+             'repos': [

+                 'https://kojipkgs.fedoraproject.org/compose/updates/f42-updates/compose/Everything/$arch/os/',

+                 'https://kojipkgs.fedoraproject.org/compose/42/latest-Fedora-42/compose/Everything/$arch/os/'

+             ],

+             'subvariant': 'FEX_RootFS',

+             'bundle_name_format': '%N-%v-%I.%A',

+             'failable': ['*'],

+         },

          ],

  }

  koji_profile = 'compose_koji'

file modified
+9 -1
@@ -447,7 +447,15 @@ 

              'target': global_target,

              'bundle_name_format': '%N-%v-%I.%A.%T',

              'failable': [''],

-         }

+         },

+         {

+             'kiwi_profile': 'FEX-RootFS',

+             'arches': ['x86_64'],

+             'repos': ['Everything'],

+             'subvariant': 'FEX_RootFS',

+             'target': global_target,

+             'failable': ['*'],

+         },

          ],

      '^Spins$': [

          {

probably should have 'failable': ['*']. I'm not sure this needs to be a new variant - I think adding variants requires us to update the sync and 'compose split' scripts? Maybe it can just be part of Everything?

Yeah we definitely don't need this to be a variant, I wasn't sure if it was ok to just add to an existing one. Lemme see if I can have it added to Everything.

rebased onto 6d12710

5 months ago

Dropped variant and made it failable.

This won't do anything; you need to make it a section under the Everything variant. Right now, it's not going to match anything.

rebased onto 6d12710

5 months ago

Moved under Everything.

Would it make sense under the container subvariant?

I see that the container images set

            'target': global_target,
            'bundle_name_format': '%N-%v-%I.%A.%T',

Not sure if we need these here too.

Would it make sense under the container subvariant?

I have no strong preference. These images are conceptually similar to container images in content, but they're produced as filesystem images, not as tarballs.

I see that the container images set

'target': global_target, 'bundle_name_format': '%N-%v-%I.%A.%T',

Not sure if we need these here too.

You probably need the global_target part, but not the bundle_name_format part. The only reason for the format override is because productmd didn't know how to match tarballs that didn't have the extension .oci.tar.gzproperly.

Would it make sense under the container subvariant?

I have no strong preference. These images are conceptually similar to container images in content, but they're produced as filesystem images, not as tarballs.

It's fine to put under the Container subvariant then, it may even make sense to configure the FEX image to use the fedora container branding packages too.

Also now that I think of it, I think we need both the image and the manifest (i.e. Fedora.x86_64-Rawhide.packages), as we use the manifest in the RPM to generate the license tag.

rebased onto 6d12710

5 months ago

You need to do the bundle format override here and set 'bundle_name_format': '%N-%v-%I.%A', since the default is different in fedora-container.conf than in fedora.conf.

rebased onto 6d12710

5 months ago

You need to do the bundle format override here and set 'bundle_name_format': '%N-%v-%I.%A', since the default is different in fedora-container.conf than in fedora.conf.

Fixed, thanks

Looks good to me. :thumbsup:

Should the fedora-container version also be failable?

rebased onto 6d12710

5 months ago

Should the fedora-container version also be failable?

Yeah, good call. Fixed.

OK, that looks good to me now. I'll merge this.

Pull-Request has been merged by sgallagh

5 months ago
Metadata