manifest: Enable ostree bootloader-naming-2 for f40 #2723

cgwalters · 2023-11-08T22:37:29Z

This removes the autoprune stuff which is already always on in ostree now
Add the new "experiment" of bootloader-naming-2; xref deploy: Add bootloader-naming-2 opt-in ostreedev/ostree#3007

jlebon

LGTM as is.

jlebon · 2023-11-09T18:53:25Z

manifests/fedora-coreos.yaml

-    # so that we don't run into https://github.com/coreos/fedora-coreos-tracker/issues/1464
-    # again. OSTree autopruning is new so we're selectively enabling it before making it the default.
-    include: ostree-autoprune.yaml
+      - releasever >= 40


Minor: this can be squashed to a single line. It only needs to be a list if there are multiple conditions.

dustymabe · 2023-11-09T19:12:05Z

This removes the autoprune stuff which is already always on in ostree now

oh nice. I missed that this merged and made it in 2023.7. I did check and it is in testing-devel and next-devel so we should be good.

dustymabe · 2023-11-09T20:39:22Z

Looks good:

[core@cosa-devsh ~]$ ls /boot/loader/entries/
ostree-1.conf  ostree-2.conf
[core@cosa-devsh ~]$ rpm-ostree status 
State: idle
Deployments:
● fedora-compose:fedora/x86_64/coreos/rawhide
                  Version: 40.20231108.91.0 (2023-11-08T12:47:04Z)
                   Commit: a8f7ddc642f751e71ba514d3b2a94e8944360352fda9349fa5d12a3e72a572cf
             GPGSignature: Valid signature by 115DF9AEF857853EE8445D0A0727707EA15B79CC

  fedora:fedora/x86_64/coreos/rawhide
                  Version: 40.20231109.dev.0 (2023-11-09T19:45:24Z)
                   Commit: 8d5f9ca25e88b8c9062dfd39c4abf076641975b8744de56a3de4ab23bad6629f
             GPGSignature: (unsigned)

Though, I don't know if the desire is for the bls entry filename in the delivered image (qcow2) to have this form. If it is that isn't what happens IIUC.

dustymabe · 2023-11-09T20:39:52Z

if you rebase on top of latest testing-devel I think it will fix the CI failure.

dustymabe

LGTM

- This removes the autoprune stuff which is already always on in ostree now - Add the new "experiment" of bootloader-naming-2; xref ostreedev/ostree#3007

cgwalters · 2023-11-09T21:10:26Z

Yeah, it's different work to make it affect the disk images too, would need an image.yaml knob I guess.

Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

Adapt the test as per the changes from #2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

Colin Walters (1): manifest: Enable ostree bootloader-naming-2 for f40 Michael Armijo (1): tests/quadlet: update fedora-minimal image tag gursewak1997 (1): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Michael Armijo (1): tests/quadlet: update fedora-minimal image tag gursewak1997 (1): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Michael Armijo (1): tests/quadlet: update fedora-minimal image tag gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (1): denylist: skip PXE tests on ppc64le Michael Armijo (1): tests/quadlet: update fedora-minimal image tag gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (2): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update Michael Armijo (1): tests/quadlet: update fedora-minimal image tag gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (2): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update Michael Armijo (1): tests/quadlet: update fedora-minimal image tag Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (3): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Michael Armijo (1): tests/quadlet: update fedora-minimal image tag Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (4): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" Michael Armijo (1): tests/quadlet: update fedora-minimal image tag Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (4): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" Michael Armijo (2): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (4): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" Luke Yang (1): tests: create partition scheme test Michael Armijo (2): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jonathan Lebon (4): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" Luke Yang (1): tests: create partition scheme test Michael Armijo (3): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 denylist: extend expired snoozes Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container Dusty Mabe (1): tests/partition-scheme: support aarch64/ppc64le HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jan Schintag (1): s390x: Fix ext.config.disks.partition-scheme Jonathan Lebon (4): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" Luke Yang (1): tests: create partition scheme test Michael Armijo (3): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 denylist: extend expired snoozes Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container Dusty Mabe (3): tests/partition-scheme: support aarch64/ppc64le overrides: drop zincati pin overrides: fast-track podman-4.8.1-1.fc39 HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jan Schintag (1): s390x: Fix ext.config.disks.partition-scheme Jonathan Lebon (5): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" manifests: move `amd-ucode-firmware` to FCOS-specific manifest Luke Yang (1): tests: create partition scheme test Michael Armijo (3): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 denylist: extend expired snoozes Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Colin Walters (2): manifest: Enable ostree bootloader-naming-2 for f40 tests/kernel-replace: Adapt to already being in a container Dusty Mabe (3): tests/partition-scheme: support aarch64/ppc64le overrides: drop zincati pin overrides: fast-track podman-4.8.1-1.fc39 HuijingHei (1): tests: verify systemd-sysuser.service with `ConditionNeedsUpdate=` will be triggered with new deployment Jan Schintag (1): s390x: Fix ext.config.disks.partition-scheme Jonathan Lebon (6): denylist: skip PXE tests on ppc64le ci: cancel previous build on PR update tests/kola/networking: adapt to new link file names Revert "denylist: skip PXE tests on ppc64le" manifests: move `amd-ucode-firmware` to FCOS-specific manifest tests/kola/files/amd-ucode-firmware: limit to x86_64 Luke Yang (1): tests: create partition scheme test Michael Armijo (3): tests/quadlet: update fedora-minimal image tag denylist: skip `coreos.unique.boot.failure` on aarch64 denylist: extend expired snoozes Timothée Ravier (1): manifests: Explicitly include amd-ucode-firmware gursewak1997 (2): kola/butane/grub-users: Update the test Adapt the test as per the changes from coreos/fedora-coreos-config#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf denylist: extend snooze for failing kola tests Also, kexec-tools 2.0.27 is now in F39 so the kdump.crash is passing on production streams. kdump.crash in rawhide for ppc64le, ext.config.docker.basic and coreos.ignition.ssh.key are still failing

Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

jlebon approved these changes Nov 9, 2023

View reviewed changes

dustymabe approved these changes Nov 9, 2023

View reviewed changes

manifest: Enable ostree bootloader-naming-2 for f40

6feaf8e

- This removes the autoprune stuff which is already always on in ostree now - Add the new "experiment" of bootloader-naming-2; xref ostreedev/ostree#3007

cgwalters force-pushed the sysroot-bls-naming2 branch from f32a8e1 to 6feaf8e Compare November 9, 2023 20:45

dustymabe merged commit d4583a4 into coreos:testing-devel Nov 9, 2023

gursewak1997 added a commit to gursewak1997/fedora-coreos-config that referenced this pull request Nov 13, 2023

kola/butane/grub-users: Update the test

88328ab

Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

gursewak1997 mentioned this pull request Nov 13, 2023

kola/butane/grub-users: Update the test #2731

Merged

gursewak1997 added a commit to gursewak1997/fedora-coreos-config that referenced this pull request Nov 13, 2023

kola/butane/grub-users: Update the test

ccea516

Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

gursewak1997 added a commit that referenced this pull request Nov 13, 2023

kola/butane/grub-users: Update the test

59e39e5

Adapt the test as per the changes from #2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

aaradhak pushed a commit to aaradhak/fedora-coreos-config that referenced this pull request Mar 18, 2024

kola/butane/grub-users: Update the test

0b751bb

Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

manifest: Enable ostree bootloader-naming-2 for f40 #2723

manifest: Enable ostree bootloader-naming-2 for f40 #2723

cgwalters commented Nov 8, 2023

jlebon left a comment

jlebon Nov 9, 2023

dustymabe commented Nov 9, 2023 •

edited

Loading

dustymabe commented Nov 9, 2023

dustymabe commented Nov 9, 2023

dustymabe left a comment

cgwalters commented Nov 9, 2023

manifest: Enable ostree bootloader-naming-2 for f40 #2723

manifest: Enable ostree bootloader-naming-2 for f40 #2723

Conversation

cgwalters commented Nov 8, 2023

jlebon left a comment

Choose a reason for hiding this comment

jlebon Nov 9, 2023

Choose a reason for hiding this comment

dustymabe commented Nov 9, 2023 • edited Loading

dustymabe commented Nov 9, 2023

dustymabe commented Nov 9, 2023

dustymabe left a comment

Choose a reason for hiding this comment

cgwalters commented Nov 9, 2023

dustymabe commented Nov 9, 2023 •

edited

Loading