diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-05-02 19:28:36 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-06-06 14:12:44 +0000 |
| commit | 088dbb4b8d3eb8275c9aba34eb521dbc79f98f51 (patch) | |
| tree | 95532d5f69b6bbaf0c10f8eb9ab22c80c5f77500 | |
| parent | 70e13c4cffd5ff7a70296bc5c4c3b7525c278b1d (diff) | |
| download | src-088dbb4b8d3eb8275c9aba34eb521dbc79f98f51.tar.gz src-088dbb4b8d3eb8275c9aba34eb521dbc79f98f51.zip | |
Restore Cirrus-CI boot smoke test
This reverts commit a7d593dd1da27833b5384349700bc3c7bcae6aad.
We now use compute_engine_instance which allows us to specify a custom
disk size. Also go back to using the default qemu version (rather than
qemu42 or qemu-devel) as any issues were fixed some time ago.
Reviewed by: lwhsu, markj
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D30082
(cherry picked from commit cec2682cd2910080951782391d7d7cd30c95c4ea)
| -rw-r--r-- | .cirrus.yml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ff144699675e..963355013df0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,11 +1,14 @@ # $FreeBSD$ -freebsd_instance: +compute_engine_instance: # Image list available via # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images + platform: freebsd + image_project: freebsd-org-cloud-dev image: freebsd-13-0-release-amd64 cpu: 8 memory: 24G + disk: 40 env: CIRRUS_CLONE_DEPTH: 1 @@ -13,7 +16,7 @@ env: task: timeout_in: 120m install_script: - - pkg install -y llvm11 + - pkg install -y qemu uefi-edk2-qemu-x86_64 llvm11 setup_script: - uname -a - df -m @@ -22,6 +25,10 @@ task: - chown user:user /usr/obj/$(pwd -P) script: - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=llvm11 WITHOUT_TOOLCHAIN=yes buildworld buildkernel" + package_script: + - su user -c "make CROSS_TOOLCHAIN=llvm11 WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages" + test_script: + - sh tools/boot/ci-qemu-test.sh post_script: - df -m - - du -m -s /usr/obj
\ No newline at end of file + - du -m -s /usr/obj |