#1227 fedora.conf: Add ostree native container images for Atomic Desktops
Merged a year ago by cverna. Opened a year ago by siosm.
siosm/pungi-fedora atomic-desktops-ostree-oci  into  main

file modified
+35 -12
@@ -725,7 +725,6 @@ 

          "treefile": "fedora-silverblue.yaml",

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

-         "repo": "Everything",

          "tag_ref": False,

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

          "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
@@ -740,7 +739,6 @@ 

          "treefile": "fedora-kinoite.yaml",

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

-         "repo": "Everything",

          "tag_ref": False,

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

          "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
@@ -755,7 +753,6 @@ 

          "treefile": "fedora-sericea.yaml",

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

-         "repo": "Everything",

          "tag_ref": False,

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

          "ostree_ref": "fedora/rawhide/${basearch}/sericea",
@@ -770,7 +767,6 @@ 

          "treefile": "fedora-onyx.yaml",

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

-         "repo": "Everything",

          "tag_ref": False,

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

          "ostree_ref": "fedora/rawhide/${basearch}/onyx",
@@ -780,10 +776,44 @@ 

      }

  }

  

+ ostree_container = {

+     "^Silverblue$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "config_url": "https://pagure.io/workstation-ostree-config.git",

+         "config_branch": "main",

+         "treefile": "fedora-silverblue.yaml",

+         "arches": ["x86_64", "ppc64le", "aarch64"],

+         "failable": ['*'],

+     },

+     "^Kinoite$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "config_url": "https://pagure.io/workstation-ostree-config.git",

+         "config_branch": "main",

+         "treefile": "fedora-kinoite.yaml",

+         "arches": ["x86_64", "ppc64le", "aarch64"],

+         "failable": ['*'],

+     },

+     "^Sericea$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "config_url": "https://pagure.io/workstation-ostree-config.git",

+         "config_branch": "main",

+         "treefile": "fedora-sericea.yaml",

+         "arches": ["x86_64", "aarch64"],

+         "failable": ['*'],

+     },

+     "^Onyx$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "config_url": "https://pagure.io/workstation-ostree-config.git",

+         "config_branch": "main",

+         "treefile": "fedora-onyx.yaml",

+         "arches": ["x86_64"],

+         "failable": ['*'],

+     }

+ }

+ 

  ostree_installer = [

      ("^Silverblue$", {

          "x86_64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "9",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -811,7 +841,6 @@ 

              'failable': ['*'],

          },

          "ppc64le": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "9",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -839,7 +868,6 @@ 

              'failable': ['*'],

          },

          "aarch64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "9",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -869,7 +897,6 @@ 

      }),

      ("^Kinoite$", {

          "x86_64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "10",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -897,7 +924,6 @@ 

              'failable': ['*'],

          },

          "ppc64le": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "10",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -925,7 +951,6 @@ 

              'failable': ['*'],

          },

          "aarch64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "10",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -955,7 +980,6 @@ 

      }),

      ("^Sericea$", {

          "x86_64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "9",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
@@ -983,7 +1007,6 @@ 

      }),

      ("^Onyx$", {

          "x86_64": {

-             "repo": "Everything",

              "release": None,

              "rootfs_size": "9",

              "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",

fedora.conf: Remove deprecated option in ostree(_installer) phases

This option is deprecated and not needed anymore:

[WARNING ] Variant-type source repository is deprecated and will be ignored during 'OSTree' phase: Everything
[OSTREE_INSTALLER] [WARNING ] Variant-type source repository is deprecated and will be ignored during 'OSTreeInstaller' phase: None

See: https://pagure.io/pungi-fedora/pull-request/1227#comment-196106

Signed-off-by: Timothée Ravier tim@siosm.fr


fedora.conf: Add ostree native container images for Atomic Desktops

See: https://pagure.io/pungi/pull-request/1699
See: https://fedoraproject.org/wiki/Changes/OstreeNativeContainerStable

Signed-off-by: Timothée Ravier tim@siosm.fr

Do not merge yet (see linked PR for support in pungi).

I would suggest putting WIP in the PR title and commit summary, then, it's much clearer than an easily-missed comment.

This line doesn't match the current version of the Pungi patch. The Koji task will run before the Everything repo is created. The default provided repository will contain all packages from the configured tag (same as when running e.g. lorax to create boot.iso). The repo option is useful for providing additional package from outside of the compose.

Sorry, I don't understand what I should do. This is using the same config for the "repo" option as the other builds above. Are those also wrong and should I remove the "repo" options for all of them? Or should I use another value for the "repo" option?

No action is necessary about the repo option, it's just that it isn't required. Basically only a URL makes sense there, and for most use-cases no explicit repo should be needed (that's the case for all ostree things currently).
Warnings like this are printed in the log due to it:

2023-12-13 05:56:38 [WARNING ] Variant-type source repository is deprecated and will be ignored during 'OSTree' phase: Everything

The required change in Pungi is merged and released in version 4.6.0. Builds are finished and updates created in Bodhi.

rebased onto f7b7d1bbdc7dea18028902703637c99269192a24

a year ago

rebased onto 94b9deba88fc865609806bab550421806174c7c1

a year ago

Thanks, I've updated the PR.

rebased onto 7ee326b2da923fdd5f6380150c8a547bdf4d48c8

a year ago

@adamwill @lsedlar Do you think we should be able to test this now? Anything pending on the infra side?

are these alternatives to the existing ostrees? will they be available for rebasing to with straightforward rpm-ostree commands?

if you can rpm-ostree rebase to it, we should be able to test it, at least in theory.

I don't think the required pungi version is installed on the rawhide compose host. 4.6.0 is needed. I can't update the package though.

2024-01-08 05:19:30 [INFO    ] Host: compose-rawhide01.iad2.fedoraproject.org
2024-01-08 05:19:31 [INFO    ] Pungi version: pungi-4.5.0-2.fc39.noarch

Yes, they are essentially ostree commits packaged into a container image. Ideally, we will migrate all Atomic desktop users to those images in an upcoming Fedora release.

Fedora IoT & Fedora CoreOS could do it as well on their own timeline.

Once pushed to a registry, you can rebase to them using rpm-ostree rebase <URL> (see https://coreos.github.io/rpm-ostree/container/#url-format-for-ostree-native-containers for the URL format).

I filed a ticket to get pungi updated on the compose hosts: https://pagure.io/fedora-infrastructure/issue/11711

Yes, no, I understand that in theory they are, I meant in practice. But I may have misunderstood your initial question - you were asking if we can try out this change in pungi-fedora, not if QA is able to test the images once we do.

Yes, I know you've tried pungi-fedora changes in the past for me. If you could try a compose built with this change that would be nice but if it's too complex/hard to do we can just merge this PR and try "live". It's a net new artifact so this should not break existing things.

Actual testing of those artifacts will come later, when we're ready to switch the default.

Rawhide compose hosts have been updated (https://pagure.io/fedora-infrastructure/issue/11711) so we should be able to merge this now.

rebased onto b7eaa14

a year ago

:thumbsup: let's merge and see how this goes for rawhide :smile:

Pull-Request has been merged by cverna

a year ago

not sure if @kevin let you know somewhere, but dropping the 'repo' entries actually broke Rawhide compose, because pungi still considers them to be required, so we had to revert that change. It can only be put back in after the Pungi schema is updated and the updated Pungi is deployed in Fedora infra.

Metadata