For now only use the minimal decadency set until all the OpenBSD mappings can be divined.
Reviewed-by: Pierrick Bouvier <[email protected]> Message-ID: <[email protected]> Signed-off-by: Alex Bennée <[email protected]> diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 514b0cd7f63..5176e136ab1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 514b0cd7f6375d0089f96e749079093906c532a8 +Subproject commit 5176e136ab11e275eb9f57c3d5c80e77af6507cb diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c74345e03d0..3e4b026035b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -87,9 +87,9 @@ def generate_cirrus(target, trailer=None): generate(filename, cmd, trailer) -def generate_pkglist(vm, target): +def generate_pkglist(vm, target, project="qemu"): filename = Path(src_dir, "tests", "vm", "generated", vm + ".json") - cmd = lcitool_cmd + ["variables", "--format", "json", target, "qemu"] + cmd = lcitool_cmd + ["variables", "--format", "json", target, project] generate(filename, cmd, None) @@ -316,6 +316,7 @@ try: # VM packages lists # generate_pkglist("freebsd", "freebsd-14") + generate_pkglist("openbsd", "openbsd-78", project="qemu-minimal") # # Ansible package lists diff --git a/tests/vm/generated/openbsd.json b/tests/vm/generated/openbsd.json new file mode 100644 index 00000000000..0886afd0d3d --- /dev/null +++ b/tests/vm/generated/openbsd.json @@ -0,0 +1,27 @@ +{ + "ccache": "/usr/local/bin/ccache", + "cpan_pkgs": [], + "cross_pkgs": [], + "make": "/usr/local/bin/gmake", + "ninja": "/usr/local/bin/ninja", + "packaging_command": "pkg_add", + "pip3": "/usr/local/bin/pip3", + "pkgs": [ + "bash", + "bison", + "bzip2", + "ccache", + "dtc", + "git", + "glib2", + "gmake", + "gsed", + "libffi", + "meson", + "ninja", + "pkgconf", + "python3" + ], + "pypi_pkgs": [], + "python": "/usr/local/bin/python3" +} diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 9aabfeec963..4f8eeb28e24 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -24,45 +24,6 @@ class OpenBSDVM(basevm.BaseVM): link = "https://cdn.openbsd.org/pub/OpenBSD/7.8/amd64/install78.iso"; csum = "a228d0a1ef558b4d9ec84c698f0d3ffd13cd38c64149487cba0f1ad873be07b2" size = "20G" - pkgs = [ - # tools - "dtc", - "git", - "pkgconf", - "bzip2", "xz", - "ninja", - - # gnu tools - "bash", - "gmake", - "gsed", - "gettext-tools", - - # libs: usb - "libusb1--", - - # libs: crypto - "gnutls", - - # libs: images - "jpeg", - "png", - - # libs: ui - "capstone", - "sdl2", - "gtk+3", - "libxkbcommon", - - # libs: migration - "zstd", - - # libs: networking - "libslirp", - - # Python stuff - "py3-setuptools", - ] BUILD_SCRIPT = """ set -e; @@ -198,8 +159,9 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait("login:") self.wait_ssh() + pkgs = self.get_qemu_packages_from_lcitool_json() self.print_step("Installing packages") - self.ssh_root_check("pkg_add %s\n" % " ".join(self.pkgs)) + self.ssh_root_check("pkg_add %s\n" % " ".join(pkgs)) # shutdown self.ssh_root(self.poweroff) -- 2.47.3
