From nobody Mon Jun 5 16:01:42 2023 X-Original-To: dev-commits-src-all@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 4QZddf4PS5z4Z6fs; Mon, 5 Jun 2023 16:01:42 +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 4QZddf3xqqz4KCY; Mon, 5 Jun 2023 16:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685980902; 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=hGEjVmhDjVZCCVXR0QnEhuRNnt4Ro/P6/gXWwoo9h0g=; b=B5//xeAO6Zs4bMwOTlVQ2G1Xuq1qb0uQ03uptjE944edx5jq6ruVwXXTGVM0H3kVLzsW6o +sKFI3ZZ/eYMtUtyP+YZLEeKYXj28zqrAAyilk2Eg4VqnzVYWYjeIu8kFVtRTsEyQLSb0A jGb+ZHeP1aFNXtNhoDg87fqNHD/vOLhkrWEy7Fwji11J8axesSNBrEN3Fsv94b7iNWWl0B aUwh9Fer/e4EsAwGUZxOGTfq+TvyZv0JGfzHvdyfVWridQMOXJ52CvDDAOlGCcicKx4osW ohfaWBOEkW0JXaMpIOIoRk6pPrOG8os+X48V+8bAjYCzXibsF61BcWw9HqVucw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685980902; 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=hGEjVmhDjVZCCVXR0QnEhuRNnt4Ro/P6/gXWwoo9h0g=; b=xyhqNqxd+hoflAOojrIkkhfZ2YRBQMk7OSyG7/zTtodWtzGWNU71OYj9RrLJZb+Zrh8Ax4 h6tgsRzXCrMmNlF8AOUbJR+CWso0rzjUoUIwOIa54nX8wPhwrwFzFBVOlpcwWfpebPmDj6 LerNsJTFnPvV0d5AyYC/tJml0Qqq7L89r1zXF1jspwNXBw0rfCEJkLHp6K+1kAP8RKkMd8 zxKAlQ+jbfWt6+Afb+tSHO6qc+Yl7XJJm/6lIdw1BA7/24V07o2k7YT3GmxF9sHVvwdZuj CRZIwE1UZP6DjvPZk9bl1U+ZThSqc+O+ToYxYmwgW+zcJHLB/6TG3jOyQ4QAdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685980902; a=rsa-sha256; cv=none; b=HRbt9TPhHB/uKftSPliv5ArqnKgF422UV2UnGk6Uxdwp3L4iFElw9MQLzVhkoEydkyJLHH MABBNXMYie3eFv6B+3kmCEg4m2OLjogFhYcDJ0XOJ5QUAAxxjaky8WZqF0gVTqrLzmg/RF Je9lpwV2w5FUrluc32vJyXfzP3Nv7tdMsv9xTlG4c35vFQ8jt6giwbuFrcWKClMX3gSo4B kBkdbt5HJ2PhqmDq/PMlRhSo7hPJaP4rG5hZlDDJgQi15/IL/rOGzpl1Fyjw9o6xFQlBGm nfTU7djDzVfM89DGi1A02yN3sZqTBMXs4qP5gSVN/7HenHVKZy5qv1vMSgXeNQ== 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 4QZddf30DtztkR; Mon, 5 Jun 2023 16:01:42 +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 355G1gLF065648; Mon, 5 Jun 2023 16:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355G1g4A065647; Mon, 5 Jun 2023 16:01:42 GMT (envelope-from git) Date: Mon, 5 Jun 2023 16:01:42 GMT Message-Id: <202306051601.355G1g4A065647@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: 089d1ed94c07 - stable/13 - Cirrus-CI: move QEMU pkg installation to test script List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 089d1ed94c0708c4ef9ba13c121294904750d5f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=089d1ed94c0708c4ef9ba13c121294904750d5f1 commit 089d1ed94c0708c4ef9ba13c121294904750d5f1 Author: Ed Maste AuthorDate: 2022-09-07 14:12:37 +0000 Commit: Ed Maste CommitDate: 2023-06-05 14:35:06 +0000 Cirrus-CI: move QEMU pkg installation to test script Occasionally the QEMU package fails to build and isn't available on -CURRENT using the Latest package set. Move the package installation to the test script, so that if the package isn't available we at least still perform a build test. Sponsored by: The FreeBSD Foundation (cherry picked from commit 612f254c82468d037fccb6c26dc0a7e37a73a53e) --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3270040aba40..eeb4bf83fb07 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -41,7 +41,7 @@ task: TOOLCHAIN_PKG: amd64-gcc12 timeout_in: 120m install_script: - - sh .cirrus-ci/pkg-install.sh qemu-nox11 ${TOOLCHAIN_PKG} + - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} setup_script: - uname -a - gpart show @@ -57,6 +57,7 @@ task: package_check_script: - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" test_script: + - sh .cirrus-ci/pkg-install.sh qemu-nox11 - sh tools/boot/ci-qemu-test.sh post_script: - df -m