Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend container-uefi with fix for vconsole keymap #1323

Conversation

jkonecny12
Copy link
Member

It is fix for
https://bugzilla.redhat.com/show_bug.cgi?id=1890085 https://issues.redhat.com/browse/INSTALLER-2537

Currently, virtual console is not correctly set from localed on an ostree installations. To resolve this issue let's put the vconsole.keymap to the installed system kernel arguments.

Depends on rhinstaller/anaconda#5952

@jkonecny12 jkonecny12 added the blocked This can't be merged before dependencies! label Oct 21, 2024
@jkonecny12
Copy link
Member Author

/test-tmt

@jkonecny12
Copy link
Member Author

Expected to fail without the PR but I want to verify that behavior.

@rvykydal
Copy link
Contributor

I am wondering why the test called from the Anaconda PR (rhinstaller/anaconda#5952 (comment)) failed.

2024-10-21 13:53:25,527 DEBUG: Running command: ['/opt/kstest/kickstart-tests/scripts/launcher/lib/launcher_interface.sh', '-i', '/opt/kstest/data/images/boot.iso', '-k', '1', '-w', '/var/tmp/kstest-rpm-ostree-container-uefi.2024_10_21-13_50_02.24lg01k4', '-t', '/opt/kstest/kickstart-tests/rpm-ostree-container-uefi.sh', 'validate']
2024-10-21 13:53:42,621 DEBUG: Failed to run subprocess: '['/opt/kstest/kickstart-tests/scripts/launcher/lib/launcher_interface.sh', '-i', '/opt/kstest/data/images/boot.iso', '-k', '1', '-w', '/var/tmp/kstest-rpm-ostree-container-uefi.2024_10_21-13_50_02.24lg01k4', '-t', '/opt/kstest/kickstart-tests/rpm-ostree-container-uefi.sh', 'validate']'
stdout:
*** System has started with errors:
Oct 21 09:53:12 fedora kernel: Command line: BOOT_IMAGE=(hd0,gpt2)/ostree/test-stateroot-9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/vmlinuz-6.12.0-0.rc3.20241015giteca631b8fe80.32.fc42.x86_64 rd.lvm.lv=fedora_ibm-p8-kvm-03-guest-02/root root=UUID=4d4c56e7-b054-4bb2-9104-f6f40cc7bf2e vconsole.keymap=us rw ostree=/ostree/boot.0/test-stateroot/9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/0
Oct 21 09:53:12 fedora kernel: Kernel command line: BOOT_IMAGE=(hd0,gpt2)/ostree/test-stateroot-9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/vmlinuz-6.12.0-0.rc3.20241015giteca631b8fe80.32.fc42.x86_64 rd.lvm.lv=fedora_ibm-p8-kvm-03-guest-02/root root=UUID=4d4c56e7-b054-4bb2-9104-f6f40cc7bf2e vconsole.keymap=us rw ostree=/ostree/boot.0/test-stateroot/9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/0
Oct 21 09:53:12 fedora dracut-cmdline[341]: Using kernel command line parameters:  rd.driver.pre=btrfs   BOOT_IMAGE=(hd0,gpt2)/ostree/test-stateroot-9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/vmlinuz-6.12.0-0.rc3.20241015giteca631b8fe80.32.fc42.x86_64 rd.lvm.lv=fedora_ibm-p8-kvm-03-guest-02/root root=UUID=4d4c56e7-b054-4bb2-9104-f6f40cc7bf2e vconsole.keymap=us rw ostree=/ostree/boot.0/test-stateroot/9973686baa6bc2238914566415b91a60f83ae946d9891b8fcdd4788a0ee974b2/0

2024-10-21 13:53:42,622 INFO: RESULT:rpm-ostree-container-uefi:d713234fd2c0:FAILED:Validation failed with return code 1

It is fix for
https://bugzilla.redhat.com/show_bug.cgi?id=1890085
https://issues.redhat.com/browse/INSTALLER-2537

Currently, virtual console is not correctly set from localed on
an ostree installations. To resolve this issue let's put the
vconsole.keymap to the installed system kernel arguments.
@jkonecny12 jkonecny12 force-pushed the master-extend-test-to-cover-ostree-vconsole-fix branch from 445f650 to ffac0f4 Compare October 22, 2024 12:35
@jkonecny12
Copy link
Member Author

Honestly not sure but it looks that the issue was in my changes. With the newest changes it looks fixed locally.

Maybe that grep without -q is propagating somehow into the RESULTS file?

@jkonecny12
Copy link
Member Author

/test-tmt

1 similar comment
@jkonecny12
Copy link
Member Author

/test-tmt

@rvykydal
Copy link
Contributor

/test-os-variants

@jkonecny12
Copy link
Member Author

The test-os-variants won't work because my patch was just merged so it is not yet part of the Rawhide. Do we want to wait for the release?

@rvykydal
Copy link
Contributor

The test-os-variants won't work because my patch was just merged so it is not yet part of the Rawhide. Do we want to wait for the release?

Maybe let's wait for daily-iso and merge?

@jkonecny12
Copy link
Member Author

I see even the TMT is using Rawhide ISO. In that case we should probably wait for release. That is a pain honestly.

@rvykydal
Copy link
Contributor

rvykydal commented Oct 23, 2024

I see even the TMT is using Rawhide ISO. In that case we should probably wait for release. That is a pain honestly.

In general I'd be OK for merging just with

  • the test passing on the Anaconda PR (/kickstart-test --kstest-pr 1323 rpm-ostree-container-uefi) to see it is actually working, and
  • the PR passing /test/os/variants to the extent it does not break daily tests (that means passing every variant we run in dailies - so rawhide not required). Waiting for daily-iso should be usually 1 day after merge so it seems fine to me.

@rvykydal
Copy link
Contributor

/test-os-variants

1 similar comment
@rvykydal
Copy link
Contributor

/test-os-variants

@jkonecny12
Copy link
Member Author

/test-tmt

@jkonecny12 jkonecny12 requested a review from rvykydal October 29, 2024 14:52
@jkonecny12 jkonecny12 removed the blocked This can't be merged before dependencies! label Oct 29, 2024
@jkonecny12
Copy link
Member Author

Not blocked anymore. Changes are part of Rawhide now. @rvykydal could you please do a review of this PR?

Copy link
Contributor

@rvykydal rvykydal left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@jkonecny12 jkonecny12 merged commit a93ede6 into rhinstaller:master Nov 4, 2024
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants