See previous commit for rationale on using lcitool vars file to get an up-to-date package list. Since there is a such file generated for FreeBSD 13 available in the repository, use it. That way we don't need to manually keep this array in sync.
Inspired-by: Thomas Huth <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- tests/vm/freebsd | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 6a0d7a4569..4f12878645 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -31,45 +31,7 @@ class FreeBSDVM(basevm.BaseVM): link = "https://download.freebsd.org/releases/CI-IMAGES/13.2-RELEASE/amd64/Latest/FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw.xz"; csum = "a4fb3b6c7b75dd4d58fb0d75e4caf72844bffe0ca00e66459c028b198ffb3c0e" size = "20G" - pkgs = [ - # build tools - "git", - "pkgconf", - "bzip2", - "python39", - "ninja", - - # gnu tools - "bash", - "gmake", - "gsed", - "gettext", - - # libs: crypto - "gnutls", - - # libs: images - "jpeg-turbo", - "png", - - # libs: ui - "sdl2", - "gtk3", - "libxkbcommon", - - # libs: opengl - "libepoxy", - "mesa-libs", - - # libs: migration - "zstd", - - # libs: networking - "libslirp", - - # libs: sndio - "sndio", - ] + lcitool_vars = ".gitlab-ci.d/cirrus/freebsd-13.vars" BUILD_SCRIPT = """ set -e; @@ -151,8 +113,10 @@ class FreeBSDVM(basevm.BaseVM): self.console_wait(prompt) self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n") + vars_path = os.path.join(src_path, self.lcitool_vars) + pkgs = basevm.get_qemu_packages_from_lcitool_vars(vars_path) self.print_step("Installing packages") - self.ssh_root_check("pkg install -y %s\n" % " ".join(self.pkgs)) + self.ssh_root_check("pkg install -y %s\n" % " ".join(pkgs)) # shutdown self.ssh_root(self.poweroff) -- 2.38.1
