Skip to content

Use vm.detect_package_manager() to check if apk is available #540

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

Merged
glehmann merged 1 commit into from
Jun 10, 2026
+5 −7
Merged

Use vm.detect_package_manager() to check if apk is available #540

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: 3 additions & 4 deletions lib/vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
glehmann marked this conversation as resolved.

def insert_cd(self, vdi_name: str) -> None:
logging.info("Insert CD %r in VM %s", vdi_name, self.uuid)
Expand Down
5 changes: 2 additions & 3 deletions tests/storage/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down
Loading