Skip to content

Commit 4be7581

Browse files
committed
tests: pull all firefox dependencies with dnf download --resolve
Increase the test VM size to 4GB, as the increased updates.img size causes the boot to hang with the previous 2GB setup.
1 parent 082c360 commit 4be7581

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

test/build-rpms

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import sys
1111
BOTS_DIR = os.path.realpath(f'{__file__}/../../bots')
1212
sys.path.append(BOTS_DIR)
1313

14-
# libvpx is a firefox dependency, but it is not available in the boot.iso
15-
# https://bugzilla.redhat.com/show_bug.cgi?id=2242446
14+
missing_packages = "cockpit-ws cockpit-bridge cockpit-storaged fedora-logos"
15+
# Install missing firefox dependencies.
1616
# Resolving all dependencies with dnf download is possible,
1717
# but it packs to many packages to updates.img
18-
missing_packages = "cockpit-ws cockpit-bridge cockpit-storaged firefox dbus-glib libvpx fedora-logos"
18+
missing_packages_incl_deps = "firefox"
1919

2020
from machine.machine_core import machine_virtual # NOQA: imported through parent.py
2121

@@ -52,6 +52,7 @@ def build_rpms(srpm, image, verbose, quick):
5252
# This will change once we include this changes upstream and start building boot.iso with the new dependencies
5353
# Then we can move this to the /cockpit-pr scenario above
5454
machine.execute(f"dnf download --destdir /var/tmp/build/ {packages_to_download}", stdout=sys.stdout, timeout=300)
55+
machine.execute(f"dnf download --resolve --destdir /var/tmp/build/ {missing_packages_incl_deps}", stdout=sys.stdout, timeout=300)
5556

5657
# download rpms
5758
vm_rpms = machine.execute("find /var/tmp/build -name '*.rpm' -not -name '*.src.rpm'").strip().split()

test/machine_install.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def start(self):
144144
f"{boot_arg} "
145145
f"--name {self.label} "
146146
f"--os-variant=detect=on "
147-
"--memory 2048 "
147+
"--memory 4096 "
148148
"--noautoconsole "
149149
f"--graphics vnc,listen={self.ssh_address} "
150150
"--extra-args "

0 commit comments

Comments
 (0)