Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tests/vm/freebsd: Get up-to-date package list from lcitool vars file
Get an up-to-date package list from lcitool, that way we
don't need to manually keep this array in sync.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Inspired-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230711144922.67491-5-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
philmd authored and huth committed Jul 18, 2023
1 parent 4cd5767 commit ca2a07f
Showing 1 changed file with 2 additions and 40 deletions.
42 changes: 2 additions & 40 deletions tests/vm/freebsd
Expand Up @@ -31,45 +31,6 @@ 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",
]

BUILD_SCRIPT = """
set -e;
Expand Down Expand Up @@ -151,8 +112,9 @@ class FreeBSDVM(basevm.BaseVM):
self.console_wait(prompt)
self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n")

pkgs = self.get_qemu_packages_from_lcitool_json()
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)
Expand Down

0 comments on commit ca2a07f

Please sign in to comment.