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

kola: Fix path for qemu-bios argument #528

Merged
merged 2 commits into from
Apr 19, 2024
Merged

kola: Fix path for qemu-bios argument #528

merged 2 commits into from
Apr 19, 2024

Conversation

pothos
Copy link
Member

@pothos pothos commented Apr 19, 2024

  • kola: Align qemu-unpriv with qemu after new additions

    The qemu-unpriv platform doesn't support as many test scenarious as the
    priv. qemu platform but it is still useful for testing. When doing
    changes in the qemu platform we should also do them for qemu-unpriv.
    Port the last changes over to get swtpm support.

  • kola: Fix path for qemu-bios argument

    After changing the qemu working directory, relative qemu-bios path
    arguments stopped working.
    Handle relative paths by prepending kola's current working directory.
    The changes from
    git diff --no-index platform/machine/qemu/ platform/machine/unprivqemu/
    show that only platform-specific options differ. As a test
    cl.tpm.root-cryptenroll passed for --platform=qemu and
    --platform=qemu-unpriv when run with
    --qemu-bios=flatcar_production_qemu_uefi_efi_code.fd as relative path
    argument.

How to use

This should fix the qemu_uefi nightly failure

Testing done

Local testing as mentioned above:

./kola run -d --platform=qemu-unpriv --qemu-bios=/var/tmp/flatcar_production_qemu_uefi_efi_code.fd --qemu-image /var/tmp/flatcar_production_image.bin cl.basic
./kola run -d --platform=qemu-unpriv --qemu-bios=flatcar_production_qemu_uefi_efi_code.fd --qemu-image /var/tmp/flatcar_production_image.bin cl.tpm.root-cryptenroll
sudo ./kola run -d --platform=qemu --qemu-bios=flatcar_production_qemu_uefi_efi_code.fd --qemu-image /var/tmp/flatcar_production_image.bin cl.tpm.root-cryptenroll

@pothos pothos requested a review from a team April 19, 2024 06:41
pothos added 2 commits April 19, 2024 20:04
The qemu-unpriv platform doesn't support as many test scenarious as the
priv. qemu platform but it is still useful for testing. When doing
changes in the qemu platform we should also do them for qemu-unpriv.
Port the last changes over to get swtpm support.
After changing the qemu working directory, relative qemu-bios path
arguments stopped working.
Handle relative paths by prepending kola's current working directory.
The changes from
git diff --no-index platform/machine/qemu/ platform/machine/unprivqemu/
show that only platform-specific options differ. As a test
cl.tpm.root-cryptenroll passed for --platform=qemu and
--platform=qemu-unpriv when run with
--qemu-bios=flatcar_production_qemu_uefi_efi_code.fd as relative path
argument.
@pothos pothos requested a review from a team April 19, 2024 11:06
@pothos pothos merged commit ac11439 into flatcar-master Apr 19, 2024
2 checks passed
@pothos pothos deleted the kai/tpm-fixes branch April 19, 2024 11:36
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