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

Install shim and mokutil for JeOS aarch64 and RPi testing #12248

Merged
merged 1 commit into from
Apr 8, 2021

Conversation

mloviska
Copy link
Contributor

@mloviska mloviska commented Apr 8, 2021

Include _shim_ among pre-install packages for JeOS kvm aarch64 and RPi images.

- Related ticket: [[aarch64][rpi] test fails in kdump_and_crash - handle missing package installation dialogue](https://progress.opensuse.org/issues/90770)
- Verification runs:
zypper_call('in mokutil') if is_jeos && get_var('UEFI') && !check_var('ARCH', 'aarch64');

if (is_jeos && get_var('UEFI')) {
push @pkgs, is_aarch64 ? qw(mokutil shim) : qw(mokutil);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I haven't found a specific subroutine that would determine between rpi and aarch64 as shim should be included every except of rpi (https://build.suse.de/request/show/239027)

Copy link
Member

Choose a reason for hiding this comment

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

Installing a pkg that is already installed doesn't break anything so that doesn't really matter anyway.

Copy link
Contributor Author

@mloviska mloviska Apr 8, 2021

Choose a reason for hiding this comment

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

Indeed, but as it should come pre-installed, this way we can possibly catch an unintentional drop of it from the kiwi template.

@mloviska mloviska requested a review from asdil12 April 8, 2021 10:24
Copy link
Member

@asdil12 asdil12 left a comment

Choose a reason for hiding this comment

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

LGTM

zypper_call('in mokutil') if is_jeos && get_var('UEFI') && !check_var('ARCH', 'aarch64');

if (is_jeos && get_var('UEFI')) {
push @pkgs, is_aarch64 ? qw(mokutil shim) : qw(mokutil);
Copy link
Member

Choose a reason for hiding this comment

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

Installing a pkg that is already installed doesn't break anything so that doesn't really matter anyway.

@mloviska mloviska merged commit 3bf1e4e into os-autoinst:master Apr 8, 2021
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