From nobody Mon Jan 10 14:50:51 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40A8319499F3; Mon, 10 Jan 2022 14:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JXcFl5jnJz3PLB; Mon, 10 Jan 2022 14:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4D2C26EE9; Mon, 10 Jan 2022 14:50:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20AEopwq001899; Mon, 10 Jan 2022 14:50:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AEop3r001898; Mon, 10 Jan 2022 14:50:51 GMT (envelope-from git) Date: Mon, 10 Jan 2022 14:50:51 GMT Message-Id: <202201101450.20AEop3r001898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3d81b7e211f3 - releng/13.0 - Fix Cirrus-CI boot smoke test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 3d81b7e211f35daddce83c58b4f950e001552eea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641826251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+FRvzfN/v1+u48967LTrWseW8g0pdH8mINCPwcll3UA=; b=OyUHYY6UyYxEy+bCRJ/CWJcG4vn1UHLmHX2JJGK1bpuxtS+GnuC4w7zIwGJZ8ci6P7+xC8 CfYW2cG3B2RXjVIRnhuMhyllCmr7fOMbYVNNDK9+MnqasRuFYBmf1jKwwRJefxxJXbE/ca m5mQjrCgGLdmFE65j1w1mwP7FXuCJtiTrnIY4GhXthMZ7GK3OiMjucGVfAPFScfQMHrMVg eTe62dK6s5GJCR9efZtmi5/sZWKSSBUyrgLvEYJdAQX1GWM1ATxPRg/Kq9Kq5Q7KBPk9nq NuTwYaEa2XU4L/rELckgTc2yGOw2hpOQpIJixyxNMlUWmBwTBm+Jzw4rvQqMeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641826251; a=rsa-sha256; cv=none; b=o/hrffpPvkSs7Ea0wpYlgGYSifYol3gPE/qj+ByTePp8pJO4fwZxNcYZ7VM/2t8rDLlEpK 8MOVkfHw9diRLLxlt4uYq3mxwtZ10JedXKEuuaJPR7l0iD9gIVkobzVHnjf4qlTUVx1Zco dvzVV+h+dIAicNBkkX90rtjDYzxX6lnWeOoqpvuiF1aqFdS58aAjNo1TnF5wIWP6u5zwEj GNPwJkfOPSStLHWmYHy8diZqLWU4n5ZVKIChusPZbGScu2/SgpOhpDoR3CpMWvPex8CJvU ll/YbhpzLrsaW6oJqovktuZQpuiEwbAjYp7pJnUT2HM8Z7hZxaqGBZc1hvft2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d81b7e211f35daddce83c58b4f950e001552eea commit 3d81b7e211f35daddce83c58b4f950e001552eea Author: Ed Maste AuthorDate: 2021-04-19 18:36:21 +0000 Commit: Ed Maste 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