workstation-ostree-config

#523 Manifests name & inclusion order update
Merged by siosm. Opened by siosm.
Unknown source main

Download 523.patch

initramfs.yaml: Misc empty line fixup

Move common manifest includes to variants manifests

  • Rename common manifests to remove fedora prefix & ostree mention
  • Directly include the common manifest in each variant manifest to
    reduces the number of level of indirection for the manifests

Update manifests names for variants and their package lists

  • Strip the 'fedora' prefix from variant names
  • Name the packages list manifest for each variant accordingly

Use new Atomic names

Split Bootable Containers manifest from classic ostree ones

To be able to build images in the Fedora infrastructure with distinct
changes in the container vs classic ostree case, we need to split those
into a common manifest and a top level one that includes only the repos
and other distinct includes.

Add compatibility symlinks for classic ostree manifests

Keep stable names for the variants that are currently built in the
Fedora infrastructure.

We can remove those once we have landed the rename in this repo and the
rename in the pungi-fedora config.

Update justfile to compose -ostree for legacy

ci/validate: Test by building a Bootable Container

Switch to building a bootable container by default.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/128babbaad4d414baa5b88fa4d97314e

rebased onto 3b190aff6cac954f024dbd59aa52c13daa6b52d2

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

5 new commits added

  • Add compatibility symlinks for manifests
  • Use new Atomic names
  • Update manifests names for variants and their package lists
  • Move common manifest includes to variants manifests
  • initramfs.yaml: Misc empty line fixup

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/922ee5322c734d2c82e7921bf9a511b2

rebased onto 8b18da4c148bd6e37b78af0b8e01c07ed9c22e42

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/55bf07c63c4042bfa8b2f149f13e30e0

8 new commits added

  • ci/validate: Test by building a Bootable Container
  • Update justfile to compose -ostree for legacy
  • Add compatibility symlinks for classic ostree manifests
  • Split Bootable Containers manifest from classic ostree ones
  • Use new Atomic names
  • Update manifests names for variants and their package lists
  • Move common manifest includes to variants manifests
  • initramfs.yaml: Misc empty line fixup

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/e966c5072b3645de989e1d92e03b7a8f

recheck

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/890dbe89317d4b06a4eb17d4a1509c6e

rebased onto 457e89b5606c11f8158f22200973c818378e06d0

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/ae47c9edfabe45889a20e3483153833d

This looks good to me overall.

reading through this i am a bit confused : this code is run by gitlab CI in https://gitlab.com/fedora/ostree/ci-test right ?

reading through this i am a bit confused : this code is run by gitlab CI in https://gitlab.com/fedora/ostree/ci-test right ?

Yes

 
$ for v in fedora-{silverblue,kinoite,sericea,onyx}.yaml; do
      ~/projects/coreos/coreos-assembler/src/manifest_graph $v
      echo ""
  done
fedora-silverblue.yaml
└── (L) silverblue-ostree.yaml
    └── silverblue-common.yaml
        ├── common.yaml
        │   ├── common-packages.yaml
        │   ├── initramfs.yaml
        │   └── sysroot-ro.yaml
        └── silverblue-packages.yaml
fedora-kinoite.yaml
└── (L) kinoite-ostree.yaml
    └── kinoite-common.yaml
        ├── common.yaml
        │   ├── common-packages.yaml
        │   ├── initramfs.yaml
        │   └── sysroot-ro.yaml
        └── kinoite-packages.yaml
fedora-sericea.yaml
└── (L) sway-atomic-ostree.yaml
    └── sway-atomic-common.yaml
        ├── common.yaml
        │   ├── common-packages.yaml
        │   ├── initramfs.yaml
        │   └── sysroot-ro.yaml
        └── sway-atomic-packages.yaml
fedora-onyx.yaml
└── (L) budgie-atomic-ostree.yaml
    └── budgie-atomic-common.yaml
        ├── common.yaml
        │   ├── common-packages.yaml
        │   ├── initramfs.yaml
        │   └── sysroot-ro.yaml
        └── budgie-atomic-packages.yaml
Edited by siosm 
$ for v in {silverblue,kinoite,sway-atomic,budgie-atomic}.yaml; do
      ~/projects/coreos/coreos-assembler/src/manifest_graph $v
      echo ""
  done 
silverblue.yaml
└── silverblue-common.yaml
    ├── common.yaml
    │   ├── common-packages.yaml
    │   ├── initramfs.yaml
    │   └── sysroot-ro.yaml
    └── silverblue-packages.yaml
kinoite.yaml
└── kinoite-common.yaml
    ├── common.yaml
    │   ├── common-packages.yaml
    │   ├── initramfs.yaml
    │   └── sysroot-ro.yaml
    └── kinoite-packages.yaml
sway-atomic.yaml
└── sway-atomic-common.yaml
    ├── common.yaml
    │   ├── common-packages.yaml
    │   ├── initramfs.yaml
    │   └── sysroot-ro.yaml
    └── sway-atomic-packages.yaml
budgie-atomic.yaml
└── budgie-atomic-common.yaml
    ├── common.yaml
    │   ├── common-packages.yaml
    │   ├── initramfs.yaml
    │   └── sysroot-ro.yaml
    └── budgie-atomic-packages.yaml
Edited by siosm

8 new commits added

  • ci/validate: Test by building a Bootable Container
  • Update justfile to compose -ostree for legacy
  • Add compatibility symlinks for classic ostree manifests
  • Split Bootable Containers manifest from classic ostree ones
  • Use new Atomic names
  • Update manifests names for variants and their package lists
  • Move common manifest includes to variants manifests
  • initramfs.yaml: Misc empty line fixup

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/fa150c7212114446822e28c186be211d

Nicely split commits, thanks for that!

LGTM

I've also manually verified that this did not change the content of the resulting manifests.

Pull-Request has been merged by siosm
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.