From 11529ae8e61f519359750a0c9decfb3a96050622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 10 Jun 2024 13:28:34 +0200 Subject: [PATCH] ci: don't try to install kernel-devel on qubes It's already available there. (cherry picked from commit fb11985a940033a58840bb06a38f217d7bceaeed) --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a898601e7..1e7aae2d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,8 +24,9 @@ checks:tests: # We are now going to force the installation of the specific kernel-devel version # that matches the current kernel. If unavailable, the test should fail now. # Ideally the VM image ships with a kernel-devel package that matches the - # booted kernel. - sudo dnf install -y zfs kernel-core-$kver kernel-devel-$kver + # booted kernel. This is already the case for Qubes DispVM. + uname -r | grep -q qubes || sudo dnf install -y kernel-core-$kver kernel-devel-$kver + sudo dnf install -y zfs # Proactively load the kernel module with the right size ARC to prevent memory # starvation during integration tests. Otherwise the ARC will not reduce # itself unless there's memory pressure, and the system will fail to request