From 972c6aff650499997661aa18bb4b030f55aaabb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Lehmann?= Date: Wed, 20 May 2026 09:24:18 +0200 Subject: [PATCH] Use vm.detect_package_manager() to check if apk is available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaëtan Lehmann --- lib/vm.py | 7 +++---- tests/storage/storage.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/vm.py b/lib/vm.py index bb3156398..22e39423c 100644 --- a/lib/vm.py +++ b/lib/vm.py @@ -500,12 +500,11 @@ def detect_package_manager(self) -> PackageManagerEnum: """ Heuristic to determine the package manager on a unix distro. """ if self.file_exists('/usr/bin/rpm') or self.file_exists('/bin/rpm'): return PackageManagerEnum.RPM - elif self.file_exists('/usr/bin/apt-get'): + if self.file_exists('/usr/bin/apt-get'): return PackageManagerEnum.APT_GET - elif self.file_exists('/sbin/apk'): + if self.file_exists('/sbin/apk'): return PackageManagerEnum.APK - else: - return PackageManagerEnum.UNKNOWN + return PackageManagerEnum.UNKNOWN def insert_cd(self, vdi_name: str) -> None: logging.info("Insert CD %r in VM %s", vdi_name, self.uuid) diff --git a/tests/storage/storage.py b/tests/storage/storage.py index f819006d0..80cedd8ba 100644 --- a/tests/storage/storage.py +++ b/tests/storage/storage.py @@ -5,7 +5,7 @@ from lib import config from lib.commands import SSHCommandFailed -from lib.common import QCOW2_MAX, VHD_MAX, Defer, GiB, MiB, TiB, strtobool, wait_for +from lib.common import QCOW2_MAX, VHD_MAX, Defer, MiB, PackageManagerEnum, strtobool, wait_for from lib.host import Host from lib.sr import SR from lib.vdi import VDI, ImageFormat @@ -244,8 +244,7 @@ def xva_export_import(source_vm: VM, compression: XVACompression, temp_large_dir vm.wait_for_vm_running_and_ssh_up() install_randstream(vm) - is_alpine = vm.ssh_with_result('apk --version').returncode == 0 - if is_alpine: + if vm.detect_package_manager() == PackageManagerEnum.APK: # growpart is not available in alpine 3.12 # vm.ssh('apk add cloud-utils-growpart e2fsprogs-extra') vm.ssh('apk add gawk util-linux e2fsprogs-extra')