From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 4444B15AA3; Sun, 26 Oct 2025 13:10:52 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A706E15A96; Sun, 26 Oct 2025 13:10:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) by atuin.qyliss.net (Postfix) with ESMTPS id 62B9615A94 for ; Sun, 26 Oct 2025 13:10:48 +0000 (UTC) Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id E5AAFEC030F; Sun, 26 Oct 2025 09:10:46 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 26 Oct 2025 09:10:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm1; t=1761484246; x=1761570646; bh=QFb0W2BrlV9OSPpd+S9F0 lyyKtaGzljBzE7wa8ksJ7g=; b=W3R05gio1Bnnspbb17kCHiAmVRc8QR/WVqXhC QW74uSFL+wDI+tR+JSIjp6wRoE8MF9uadZF1Z1Psaqgszbv5dbsKOzMyRAB2DA0E yTMdZTOnNgbepQR6QtwtHv8SNCCGiPEq7CkgkmpdgkVhhdWCrOPQYzbEEEgfwNbf HXt9HEIR1AvBNrD+x0dhYM3WaU18+CjO4+rKUx9TxpJ/cisXg8PHDm7aePreDCwi mrawbdD+41oryeXzEDnQhOJhr+6hh1VOKzqjDd/9zYFZjknwIvNzeMAvHqQPy4Ga BPiBAEPLBSHU+whV3QjmCmk1PLZZ5LAW/LqJ7hSnPP2xIhavw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1761484246; x=1761570646; bh=QFb0W2BrlV9OSPpd+S9F0lyyKtaGzljBzE7 wa8ksJ7g=; b=VrsJt14YzhxMW5jQV+NFY4I9nBU0d7NhLgMWEgp3aEWN/0rnEAw MPDwQKRNta+dAtGMWBi5OZxDu+d4vRmvmH2kWAyIeM1Q3l6rRzP6JTQK+OiKScSq JxZpMWB7nWQNvZXSqZezHZhMezM4/64+TNDvSxfFwjCSZ8BEdBvnXViTtWeKlr5z J6Z8fgBnMNpyUvRdglITzJJTokUSyBRB98b3j4MzrmiZWYRzxBfEBnVSyr66sZsz JCun0fp63qqVfKsJwsoHOwicU8DHqBDSXOQ/eXXmol8D/Nb1qksv2Z19YDIF0mRm Lmn2J3ivZFBYkeVXPen1vlnqUQ/FbwZ6LvA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdduheehudejucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptehlhihsshgrucft ohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepheekgfdtve ettdekuddugeeugfdujeehuefgleegtedthfffudfhheduhfduuefhnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhhisegrlhihshhsrgdrih hspdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopegu vghmihhosggvnhhouhhrsehgmhgrihhlrdgtohhmpdhrtghpthhtohepuggvvhgvlhessh hpvggtthhruhhmqdhoshdrohhrgh X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 26 Oct 2025 09:10:45 -0400 (EDT) Received: by mbp.qyliss.net (Postfix, from userid 1000) id A73B561B3C8D; Sun, 26 Oct 2025 14:10:44 +0100 (CET) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] release/checks/integration: adjust timeout when no KVM Date: Sun, 26 Oct 2025 14:09:57 +0100 Message-ID: <20251026130956.106608-2-hi@alyssa.is> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: JT375OX7NJJ2KM233HGIK7SU43UW2AOQ X-Message-ID-Hash: JT375OX7NJJ2KM233HGIK7SU43UW2AOQ X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: We never use KVM for these on aarch64, but KVM may also not be used on x86_64 if it's unavailable. Checking for write access to /dev/kvm should be a decent proxy for that. Signed-off-by: Alyssa Ross --- Demi, hopefully this can make development on Qubes OS a bit less annoying (albiet still slow). release/checks/integration/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/release/checks/integration/default.nix b/release/checks/integration/default.nix index 5709186..eb3be07 100644 --- a/release/checks/integration/default.nix +++ b/release/checks/integration/default.nix @@ -65,10 +65,11 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; dontAddTimeoutMultiplier = true; - mesonCheckFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ - # Tests are run with TCG on aarch64. - "--timeout-multiplier=15" - ]; + preCheck = '' + if [ -n "$FORCE_LONG_TIMEOUTS" ] || ! [ -w /dev/kvm ]; then + mesonCheckFlagsArray+=(--timeout-multiplier=15) + fi + ''; installPhase = '' runHook preInstall @@ -83,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { env = { QEMU_SYSTEM = "qemu-system-${stdenv.hostPlatform.qemuArch} -nographic"; EFI_PATH = "${qemu_kvm}/share/qemu/edk2-${stdenv.hostPlatform.qemuArch}-code.fd"; + FORCE_LONG_TIMEOUTS = toString stdenv.buildPlatform.isAarch64; IMG_PATH = live; USER_DATA_PATH = userData; }; -- 2.51.0