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.

Sign up for GitHub

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

Jump to bottom

Add kernel-default-devel for sle-micro #20436

Closed
wants to merge 1 commit into from
+19 −1
Closed

Add kernel-default-devel for sle-micro #20436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/utils.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,12 @@ sub zypper_install_available {
my $packlist = join(' ', @_);
my $result = zypper_search("-t package --match-exact $packlist");

return zypper_call('-t in ' . join(' ', map { $_->{name} } @$result));
if (is_transactional) {
return transactional::trup_call("-c pkg install " . join(' ', map { $_->{name} } @$result));
}
else {
return zypper_call('-t in ' . join(' ', map { $_->{name} } @$result));
}
Copy link
Contributor

Choose a reason for hiding this comment

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

are you aware about install_package from package utils?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No idea when i create PR, but now i got it, thanks :)

}

=head2 set_zypper_lock_timeout
Expand Down
13 changes: 13 additions & 0 deletions tests/kernel/install_ltp.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,17 @@ sub setup_network {
}
}

sub install_ltp_extra_dep_package {
if (is_transactional) {
if ((get_var('FLAVOR', '') =~ /Base-RT-Updates|Base-RT|Base-RT-encrypted/)) {
zypper_install_available("kernel-rt-devel");
}
else {
zypper_install_available("kernel-default-devel");
Copy link
Contributor

Choose a reason for hiding this comment

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

devel package should be installed by default as dependency, so not need to install it in this way for normal kernel-default and kernel-rt has some other poo to fix ltp build for rt flavor. i think we dont need this PR at all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For kernel-default-devel:
Currently kernel-default-devel can not be installed by default dependency, so we have poo#162827.
Base https://gitlab.suse.de/kernel-qa/ltp-pkg/-/merge_requests/40#note_667811 i thought should add above code.
So where /how to let kernel-default-devel package installed automaticlly by dependency for sle-micro?

For kernel-rt:
Which progress ticket will tracking this?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is not specifically about kernel-rt but about adding multibuild support to ltp package in ibs/obs to have specific ltp version build against particular kernel. Test should work fine on kernel-default and just skip it on rt flavor for now.

}
}
}

sub run {
my $self = shift;
my $inst_ltp = get_var 'INSTALL_LTP';
Expand Down Expand Up @@ -363,6 +374,8 @@ sub run {
}
}

install_ltp_extra_dep_package();

log_versions 1;

zypper_call('in efivar') if is_sle('12+') || is_opensuse;
Expand Down
Loading