git: 3d81b7e211f3 - releng/13.0 - Fix Cirrus-CI boot smoke test

The branch releng/13.0 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=3d81b7e211f35daddce83c58b4f950e001552eea

commit 3d81b7e211f35daddce83c58b4f950e001552eea
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-04-19 18:36:21 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-01-10 14:48:00 +0000

    Fix Cirrus-CI boot smoke test
    
    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 a7d593dd1da27833b5384349700bc3c7bcae6aad)
    (cherry picked from commit 982cd962061552fbeb43e3bce2a5d7fd05231dde)
    (cherry picked from commit 407abff2b91847e23711625ad7c69c17e99b3d1d)
    (cherry picked from commit 87c0db9d0174fb1906a58d2f3bd5aff6dad528de)
    (cherry picked from commit cec2682cd2910080951782391d7d7cd30c95c4ea)
    (cherry picked from commit 088dbb4b8d3eb8275c9aba34eb521dbc79f98f51)
    
    Note that this does not have any effect on built artifacts (and thus is
    not an EN candidate) but allows Cirrus-CI to be used on the releng
    branch.
    
    Approved by:    so
---
 .cirrus.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 71bd02a2ca8c..8c8e574f4432 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
-freebsd_instance:
-  # image: freebsd-12-1-stable-amd64
-  # We need a newer image to install llvm11
-  image_family: freebsd-12-1-snap
+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
@@ -14,7 +17,7 @@ task:
   only_if: $CIRRUS_BRANCH != 'svn_head'
   timeout_in: 120m
   install_script:
-  - pkg install -y qemu42 uefi-edk2-qemu-x86_64 llvm11
+  - pkg install -y qemu uefi-edk2-qemu-x86_64 llvm11
   setup_user_script:
   - pw useradd user
   - mkdir -p /usr/obj/$(pwd -P)
@@ -25,3 +28,6 @@ task:
   - 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