For now only use the minimal decadency set until all the OpenBSD
mappings can be divined.
Currently depends on: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/567
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 5 +++--
tests/vm/generated/openbsd.json | 27 +++++++++++++++++++++++
tests/vm/openbsd | 39 ++-------------------------------
4 files changed, 33 insertions(+), 40 deletions(-)
create mode 100644 tests/vm/generated/openbsd.json
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 750455ce119..dedaa8ebb5d 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 750455ce1199db7e304a6b4feae5f290283dd52a
+Subproject commit dedaa8ebb5d743ba8906a87e623d90f33100aecd
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 8f0aa3fa343..95344277c9a 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)
@@ -312,6 +312,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 52565208965..4f8eeb28e24 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -24,42 +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",
- ]
BUILD_SCRIPT = """
set -e;
@@ -195,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