PR#1115: Use unified core mode for Silverblue & Kinoite - pungi-fedora

pungi-fedora

#1115 Use unified core mode for Silverblue & Kinoite

Merged a year ago by cverna. Opened 2 years ago by siosm.

siosm/pungi-fedora rpm-ostree-unified-core into main

Use unified core mode for Silverblue & Kinoite

Timothée Ravier • a year ago

c6e3cb1

fedora.conf

file modified

		`@@ -822,6 +822,7 @@`
		`"^Silverblue$": {`
		`"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`"force_new_commit": True,`
		`+ "unified_core": True,`
		`"treefile": "fedora-silverblue.yaml",`
		`"config_url": "https://pagure.io/workstation-ostree-config.git",`
		`"config_branch": "main",`
		`@@ -835,6 +836,7 @@`
		`"^Kinoite$": {`
		`"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`"force_new_commit": True,`
		`+ "unified_core": True,`
		`"treefile": "fedora-kinoite.yaml",`
		`"config_url": "https://pagure.io/workstation-ostree-config.git",`
		`"config_branch": "main",`

siosm commented 2 years ago

Use unified core mode for Silverblue & Kinoite

rpm-ostree is moving to unified core composes and this is now working for Silverblue & Kinoite.

Requires: https://pagure.io/pungi/pull-request/1626
See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

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

siosm commented 2 years ago

Needs https://pagure.io/pungi/pull-request/1626 and might need a Fedora Change for F38 too.

dustymabe commented 2 years ago

LGTM

jlebon commented 2 years ago

The last time Colin tried this there were still some issues to iron out, possibly in rpm-ostree itself. See conversation in https://github.com/coreos/rpm-ostree/pull/1793, esp. around testing.

siosm commented 2 years ago

Thanks for the link. I've tried building Silverblue Rawhide with it and rebased to it successfully. I have however not fully compared the difference in the commits between the two mode so I'll do that soon.

walters commented a year ago

OK I'm running a system installed from unified core, I think the dbus broker bits are fixed. We could try this now in rawhide.

xref https://pagure.io/workstation-ostree-config/pull-request/313#

siosm commented a year ago

I need to write the change request, and then we can give it a try.

siosm commented a year ago

Also pasted the differences that I had with the last try in https://github.com/fedora-silverblue/issue-tracker/issues/333

siosm commented a year ago

Fesco discussion in https://pagure.io/fesco/issue/2901

rebased onto 0d6880a628ed392583a60d067442fdaf1529d51b

a year ago

cverna commented a year ago

This was approved 3 days ago by FESCO, is it good to merge @siosm

Edited a year ago by cverna

siosm commented a year ago

Yes, this is good to merge (accepted in https://pagure.io/fesco/issue/2901 but not yet announced).

rebased onto c6e3cb1

a year ago

Pull-Request has been merged by cverna

a year ago

adamwill commented a year ago

openQA testing suggests this results in a borked Silverblue installer image:

https://openqa.stg.fedoraproject.org/tests/2419915#step/_do_install_and_reboot/56

I recently added a test to openQA that builds an ostree, then builds an ostree installer image with that ostree embedded and tries to boot and install it. I just changed that test to pass --unified-core to rpm-ostree compose, like this PR does, and it results in the above failure.

adamwill commented a year ago

Looks like the code that's failing there is this: https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py#L283-L318

siosm commented a year ago

Thanks @adamwill . Can you post a link to you openQA test?

siosm commented a year ago

We might need https://pagure.io/workstation-ostree-config/pull-request/330 or anaconda changes.

siosm commented a year ago

Let's revert this one and we'll do it again next weekl

siosm commented a year ago

https://pagure.io/pungi-fedora/pull-request/1136

walters commented a year ago

Ugh yeah, it's all circular because what we really want is to use bootupd, and replace that anaconda code with an invocation of bootupd...

But, for now indeed I think we'll have to teach that anaconda code how to handle the new location, then try to re-land this.

adamwill commented a year ago

@siosm https://pagure.io/fedora-qa/os-autoinst-distri-fedora/blob/main/f/tests/_ostree_build.pm is the test that builds the ostree and the installer image. It's written to shadow how that works in pungi as closely as possible.

siosm commented a year ago

I'm trying to understand why this is failing but I can not see a difference in the content of /usr/lib/ostree-boot between a commit with and one without unified-core:

# Without unified core, current Fedora Kinoite
$ sudo tree /usr/lib/ostree-boot/
[sudo] password for tim: 
/usr/lib/ostree-boot/
├── efi
│   └── EFI
│       ├── BOOT
│       │   ├── BOOTIA32.EFI
│       │   ├── BOOTX64.EFI
│       │   ├── fbia32.efi
│       │   └── fbx64.efi
│       └── fedora
│           ├── BOOTIA32.CSV
│           ├── BOOTX64.CSV
│           ├── grubia32.efi
│           ├── grubx64.efi
│           ├── mmia32.efi
│           ├── mmx64.efi
│           ├── shim.efi
│           ├── shimia32.efi
│           └── shimx64.efi
├── grub2
│   ├── fonts
│   │   └── unicode.pf2
│   └── grubenv
└── symvers-6.1.7-200.fc37.x86_64.gz -> /lib/modules/6.1.7-200.fc37.x86_64/symvers.gz

# With unified core, latest Kinoite nightly
$ sudo tree /usr/lib/ostree-boot/
[sudo] password for kinoite: 
/usr/lib/ostree-boot/
├── efi
│   └── EFI
│       ├── BOOT
│       │   ├── BOOTIA32.EFI
│       │   ├── BOOTX64.EFI
│       │   ├── fbia32.efi
│       │   └── fbx64.efi
│       └── fedora
│           ├── BOOTIA32.CSV
│           ├── BOOTX64.CSV
│           ├── grubia32.efi
│           ├── grubx64.efi
│           ├── mmia32.efi
│           ├── mmx64.efi
│           ├── shim.efi
│           ├── shimia32.efi
│           └── shimx64.efi
├── grub2
│   ├── fonts
│   │   └── unicode.pf2
│   └── grubenv
└── loader
    └── entries

siosm commented a year ago

Workaround in https://pagure.io/workstation-ostree-config/pull-request/344