diff options
Diffstat (limited to 'tests/vm')
| -rw-r--r-- | tests/vm/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/vm/generated/openbsd.json | 27 | ||||
| -rwxr-xr-x | tests/vm/openbsd | 47 |
3 files changed, 32 insertions, 44 deletions
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 8a5aaed..0a53dc9 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -154,6 +154,6 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(VM_VENV) $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ $(if $(LOG_CONSOLE),--log-console) \ --image "$<" \ - $(if $(ROOT_USER),--interactive-root,-interactive) \ + $(if $(ROOT_USER),--interactive-root,--interactive) \ false, \ " VM-BOOT-SSH $*") || true diff --git a/tests/vm/generated/openbsd.json b/tests/vm/generated/openbsd.json new file mode 100644 index 0000000..0886afd --- /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 5222041..4f8eeb2 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -14,7 +14,6 @@ import os import sys -import socket import subprocess import basevm @@ -22,48 +21,9 @@ class OpenBSDVM(basevm.BaseVM): name = "openbsd" arch = "x86_64" - link = "https://cdn.openbsd.org/pub/OpenBSD/7.7/amd64/install77.iso" - csum = "da0106e39463f015524dca806f407c37a9bdd17e6dfffe533b06a2dd2edd8a27" + 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; @@ -199,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) |