Skip to content

NO-JIRA: Add bootloader-migrate-generator to create bootloader-migrate.service#23

Merged
openshift-merge-bot[bot] merged 1 commit intocoreos:mainfrom
HuijingHei:grub-migrate-generator
Jul 10, 2025
Merged

NO-JIRA: Add bootloader-migrate-generator to create bootloader-migrate.service#23
openshift-merge-bot[bot] merged 1 commit intocoreos:mainfrom
HuijingHei:grub-migrate-generator

Conversation

@HuijingHei
Copy link
Member

@HuijingHei HuijingHei commented Jun 12, 2025 •
edited
Loading

This requires coreos/bootupd#945.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 12, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch 2 times, most recently from d47791c to 6f3802e Compare June 12, 2025 11:25
@HuijingHei HuijingHei mentioned this pull request Jun 12, 2025
Merged
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch from 6f3802e to 5245139 Compare June 12, 2025 12:02
@HuijingHei
Copy link
Member Author

HuijingHei commented Jun 12, 2025

I did testing on after upgrade from 4.1 BIOS, and get bootloader-migrate.service running, the result looks good to me.

[core@localhost ~]$ journalctl -b -u bootloader-migrate.service | cat
Jun 12 12:49:19 localhost.localdomain systemd[1]: Starting Static GRUB config migration...
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: ostree repo 'sysroot.bootloader' config option is: ''
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Creating a backup of the current GRUB config '/boot/grub2/../loader/grub.cfg' in '/boot/grub2/grub.cfg.backup'...
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 01_users.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 05_ignition.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 10_blscfg.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 14_menu_show_once.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 30_uefi-firmware.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Added 41_custom.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Installed: grub.cfg
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Static GRUB configuration has been adopted successfully.
Jun 12 12:49:23 localhost.localdomain bootupctl[870]: Adopted and updated: BIOS: grub2-tools-1:2.06-104.el9_6.x86_64
Jun 12 12:49:23 localhost.localdomain systemd[1]: Finished Static GRUB config migration.

@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch from 5245139 to e0b7335 Compare June 12, 2025 13:39
@HuijingHei HuijingHei marked this pull request as ready for review June 12, 2025 13:39
@HuijingHei
Copy link
Member Author

HuijingHei commented Jun 12, 2025

Hold on, we needs the new bootupd that includes coreos/bootupd#945.

jlebon
jlebon reviewed Jun 12, 2025
View reviewed changes
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch 2 times, most recently from 9fd9270 to 01861f3 Compare June 12, 2025 14:10
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch 3 times, most recently from 646e2ee to 6e72818 Compare June 13, 2025 02:50
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch 2 times, most recently from d6e3ebc to b7a2254 Compare June 14, 2025 07:24
@dustymabe
Copy link
Member

dustymabe commented Jun 14, 2025

All my comments have been resolved I think.

jlebon
jlebon approved these changes Jun 16, 2025
View reviewed changes
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I guess this needs to wait until the bootupd changes land.

@HuijingHei
Copy link
Member Author

HuijingHei commented Jun 17, 2025 •
edited
Loading

/hold

travier
travier reviewed Jun 19, 2025
View reviewed changes
Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
Thanks

travier
travier approved these changes Jun 19, 2025
View reviewed changes
Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
Thanks

@openshift-ci openshift-ci bot added the lgtm label Jun 19, 2025
@openshift-ci openshift-ci bot removed the lgtm label Jun 29, 2025
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch 2 times, most recently from 0d88ccf to cf0623f Compare June 30, 2025 14:12
@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 1, 2025

/retest

@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 2, 2025

Blocked by bootupd for 9.6.z RHEL-100702

@HuijingHei
Add bootloader-migrate-generator to create bootloader-migrate.service
ca8ab3d 
This requires coreos/bootupd#945.

Co-developed-by: Jonathan Lebon <jonathan@jlebon.com>
Co-developed-by: Dusty Mabe <dusty@dustymabe.com>
@HuijingHei HuijingHei force-pushed the grub-migrate-generator branch from cf0623f to ca8ab3d Compare July 10, 2025 03:19
@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 10, 2025

We have now

I think we are good to merge this now, waiting for the CI result.

@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 10, 2025

/retest

@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 10, 2025

From log, get expected bootupd-0.2.27-4.el9_6.x86_64 (rhel-9.6-early-kernel)

@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 10, 2025

The failed CI is already fixed by https://gitlab.com/fedora/bootc/base-images/-/commit/af23daadf155551dfad880dc7f1880162ffc2828, and need fedora-coreos-config update.

[+] Found files with whitespace at the end of line
./fedora-coreos-config/fedora-bootc/tests/rootfs/cases/fedora-only

And safe to ignore.

@HuijingHei
Copy link
Member Author

HuijingHei commented Jul 10, 2025

/override ci/prow/validate

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 10, 2025

@HuijingHei: Overrode contexts on behalf of HuijingHei: ci/prow/validate

Details

In response to this:

/override ci/prow/validate

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@HuijingHei HuijingHei changed the title Add bootloader-migrate-generator to create bootloader-migrate.service NO-JIRA: Add bootloader-migrate-generator to create bootloader-migrate.service Jul 10, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 10, 2025

@HuijingHei: This pull request explicitly references no jira issue.

Details

In response to this:

This requires coreos/bootupd#945.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

jbtrystram
jbtrystram approved these changes Jul 10, 2025
View reviewed changes
Copy link
Member

@jbtrystram jbtrystram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jul 10, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: HuijingHei, jbtrystram, jlebon, travier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [HuijingHei,jbtrystram,jlebon,travier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit bc86984 into coreos:main Jul 10, 2025
11 checks passed
@HuijingHei HuijingHei deleted the grub-migrate-generator branch July 10, 2025 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dustymabe dustymabe dustymabe left review comments

@jlebon jlebon jlebon approved these changes

@jbtrystram jbtrystram jbtrystram approved these changes

@travier travier travier approved these changes

Assignees

@jbtrystram jbtrystram

@travier travier

Labels

approved jira/valid-reference lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@HuijingHei @dustymabe @openshift-ci-robot @jlebon @jbtrystram @travier