Details

Reviewers

lwhsu
imp
markj

Commits

rG3d81b7e211f3: Fix Cirrus-CI boot smoke test
rG088dbb4b8d3e: Restore Cirrus-CI boot smoke test
rGcec2682cd291: Restore Cirrus-CI boot smoke test

Summary

This reverts commit a7d593dd1da27833b5384349700bc3c7bcae6aad.
We now use compute_engine_instance which allows us to specify a custom
disk size.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste requested review of this revision.May 2 2021, 8:28 PM

emaste created this revision.

Cirrus run with this change: https://cirrus-ci.com/task/6135652849811456

Compared to previous runs (w/o smoke test) this takes a little more than 10 minutes longer. It's about 7 minutes longer for pkg install, about 3 min to build packages. The qemu test boot itself adds less than a minute.

Perhaps we should have a qemu-nox11 package?

In D30082#675039, @emaste wrote:

Perhaps we should have a qemu-nox11 package?

To speed this up a bit with fewer packages to install?

To speed this up a bit with fewer packages to install?

Right. Here's what's getting installed now:

	adwaita-icon-theme: 3.38.0
	argyllcms: 1.9.2_5
	at-spi2-atk: 2.34.2
	at-spi2-core: 2.36.0
	atk: 2.36.0
	avahi-app: 0.8
	cairo: 1.16.0_1,3
	colord: 1.3.5_1
	cups: 2.3.3op2
	cyrus-sasl: 2.1.27_1
	dbus: 1.12.20_3
	dbus-glib: 0.110
	dejavu: 2.37_1
	dtc: 1.6.0
	encodings: 1.0.5,1
	font-bh-ttf: 1.0.3_4
	font-misc-ethiopic: 1.0.4
	font-misc-meltho: 1.0.3_4
	fontconfig: 2.13.93,1
	freetype2: 2.10.4
	fribidi: 1.0.10
	gdbm: 1.19
	gdk-pixbuf2: 2.40.0
	glib: 2.66.7_1,1
	gnome_subr: 1.0
	gnutls: 3.6.15
	graphite2: 1.3.14
	gsettings-desktop-schemas: 3.38.0
	gtk-update-icon-cache: 3.24.26
	gtk3: 3.24.27
	harfbuzz: 2.8.0
	hicolor-icon-theme: 0.17
	jbigkit: 2.1_1
	jpeg-turbo: 2.0.6
	lcms2: 2.12
	libICE: 1.0.10,1
	libSM: 1.2.3,1
	libX11: 1.6.12,1
	libXScrnSaver: 1.2.3_2
	libXau: 1.0.9
	libXcomposite: 0.4.5,1
	libXcursor: 1.2.0
	libXdamage: 1.1.5
	libXdmcp: 1.1.3
	libXext: 1.3.4,1
	libXfixes: 5.0.3_2
	libXft: 2.3.3
	libXi: 1.7.10,1
	libXinerama: 1.1.4_2,1
	libXrandr: 1.5.2
	libXrender: 0.9.10_2
	libXtst: 1.2.3_2
	libXxf86vm: 1.1.4_3
	libdaemon: 0.14_1
	libdrm: 2.4.104,1
	libepoll-shim: 0.0.20210322
	libepoxy: 1.5.4
	libevent: 2.1.12
	libfontenc: 1.1.4
	libgsf: 1.14.47_1
	libidn2: 2.3.0_1
	liblz4: 1.9.3,1
	libpaper: 1.1.24.4
	libpcap: 1.10.0
	libpciaccess: 0.16
	libpthread-stubs: 0.4
	librsvg2-rust: 2.50.3_2
	libtasn1: 4.16.0_1
	libunistring: 0.9.10_1
	libunwind: 20201110
	libxcb: 1.14_1
	libxkbcommon: 1.1.0
	libxml2: 2.9.10_3
	libxshmfence: 1.3
	libyaml: 0.2.5
	llvm11: 11.0.1
	lua52: 5.2.4
	mesa-libs: 20.2.3
	mkfontscale: 1.2.1
	nettle: 3.7.2_1
	nspr: 4.30
	p11-kit: 0.23.22_1
	pango: 1.42.4_5
	pciids: 20210223
	pcre: 8.44
	pcre2: 10.36
	perl5: 5.32.1_1
	pixman: 0.40.0_1
	png: 1.6.37_1
	polkit: 0.118
	qemu42: 4.2.1
	sdl2: 2.0.12_4
	shared-mime-info: 2.0
	spidermonkey78: 78.7.0_2
	tiff: 4.2.0
	tpm-emulator: 0.7.4_2
	trousers: 0.3.14_3
	uefi-edk2-qemu-x86_64: g20191122
	vde2: 2.3.2_5
	vte3: 0.62.1_1
	wayland: 1.19.0
	wayland-protocols: 1.20
	xkeyboard-config: 2.31
	xorg-fonts-truetype: 7.7_1
	xorgproto: 2020.1
	zstd: 1.4.8

Can we use qemu50 or qemu-devel for 5.1?

CC @bofh for qemu-nox11 flavor

Run with qemu50 instead: https://cirrus-ci.com/build/5973788148891648. Probably should just be qemu instead, will start that in a moment. It started out as qemu-devel but changed to qemu42 in 9abc7621384fcbf0bb8954f9c5e2a491304a82bd.

And with regular qemu: https://cirrus-ci.com/task/6362117726011392

17:15 to install(!), we'll need to understand why this is so slow and see what we can do about it - perhaps creating gcloud images with desired packages already installed.

Use plain qemu

Rebase

emaste added a reviewer: markj.May 4 2021, 9:22 PM

markj added inline comments.May 4 2021, 9:28 PM

.cirrus.yml
11	Ah, I hadn't thought to add this. I had tried having a "make packages" target but it would always run out of disk space and I didn't realize I could bump it.
29	This needs to be llvm12 now too?

llvm11->llvm12 after rebase issue

emaste added inline comments.May 4 2021, 9:37 PM

.cirrus.yml
11	It was a bit tricky to figure out the exact invocation required; it seems `freebsd_instance` is some syntactic sugar that doesn't allow `disk` to be set, but using `compute_engine_instance` does (except that `platform` and `image_project` need to be provided explicitly, rather than being provided implicitly via `freebsd_instance`).