From patchwork Wed Feb 28 22:54:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776498 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp537767wrn; Wed, 28 Feb 2024 14:56:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVT80mGNv1vj1H7UIOq7dxI+AYY6plOMrEwQLy9uXgvN/fdFTXgd17cyOgYB8clD59gsg2OmL/N6bcVKbbfl3AH X-Google-Smtp-Source: AGHT+IG5VUFuURUDcLCmYABBqbYArQnrPLTXkaiJ/HZ4HwngD2Px/b6A2FhH9KpV+xdE/J4uR2/M X-Received: by 2002:ac8:578e:0:b0:42e:71fd:14c2 with SMTP id v14-20020ac8578e000000b0042e71fd14c2mr418907qta.59.1709161015320; Wed, 28 Feb 2024 14:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709161015; cv=none; d=google.com; s=arc-20160816; b=s+FPVWlLGsExfVU7HMFXfCACvq+GPdZL7NfQY6dGPOA5I5bYu3LhcNfAhBe6vzBQEs mGspmKoST5N6Z0AjwyL/YXuzlYg0pSLtDpav4NIcA6+R7R/NM+MO4DHDKKLzzqI0kTkl J6gD4M8xYZB3ipPw8KXDrb/CeaaWyBhg+J1pkQ4JmdP0jC+zDZqt0iXy72+o7vs/Rkf6 vP7ufiaGkbLCjgCnLSUj5+yWbt2QN3l3lvuT3Ry0EKm/SGcJoWtKjRSLc/D2cHm99jYH DjzK8OEICXJ7aNhYZW+YSePjFX0AjlkhhLqlMXN0wae8JdFQLsz+qf/hZ+Os18Eawpsx Wbww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=vAYUF7t5hIsA7mqpQUrSuv5JY3sntkMQAFhbtm8sr/U=; fh=CVsDkflDe2cHmz2lTOTudqWZC+x/ad5a2xcuuse0Zdo=; b=tXSgY5OilEQwVyScxNUsKaBLG/toure0Pk7QqSSd4zicF3wkqgW94QvDBBJ4xRf4YN PPiOeGgMMttfCkqVG4nnkcnBigKIAi7l6lZQJ+0Gd/ido4+YPU3B5SoHZkA3UZskAZLL 4WFIAM6GAy6nIbIcNIZVZ0YYUVVgRSCoVWjq2mWyL6k8y+24FGtX/PyluemjXeTQCQgQ BPYe+RjSG0SQ68y9jGVWziAEm62h3+l5HRec408H5ZGrUqknN7Q3eBn/G+gWDXWjnoyM WJtJmTkJuWVUDDsH68b7S5KynxRJUHr5tdaTazYk904BLwG2xKdfpyyr6sacTZfw/CrR H9EQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x16-20020ac85390000000b0042de593662fsi169804qtp.191.2024.02.28.14.56.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 14:56:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfSpa-0005RR-Kg; Wed, 28 Feb 2024 17:55:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSpT-0005PN-5B; Wed, 28 Feb 2024 17:55:11 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSpQ-0000Vf-60; Wed, 28 Feb 2024 17:55:09 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 8782C51809; Thu, 29 Feb 2024 01:55:32 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E849A8BB3C; Thu, 29 Feb 2024 01:54:55 +0300 (MSK) Received: (nullmailer pid 274125 invoked by uid 1000); Wed, 28 Feb 2024 22:54:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev Subject: [Stable-8.2.2 64/78] .gitlab-ci.d/windows.yml: Drop msys2-32bit job Date: Thu, 29 Feb 2024 01:54:40 +0300 Message-Id: <20240228225455.274062-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell MSYS2 is dropping support for 32-bit Windows. This shows up for us as various packages we were using in our CI job no longer being available to install, which causes the job to fail. In commit 8e31b744fdf we dropped the dependency on libusb and spice, but the dtc package has also now been removed. For us as QEMU upstream, "32 bit x86 hosts for system emulation" have already been deprecated as of QEMU 8.0, so we are ready to drop them anyway. Drop the msys2-32bit CI job, as the first step in doing this. This is cc'd to stable, because this job will also be broken for CI on the stable branches. We can't drop 32-bit support entirely there, but we will still be covering at least compilation for 32-bit Windows via the cross-win32-system job. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Message-id: 20240220165602.135695-1-peter.maydell@linaro.org (cherry picked from commit 5cd3ae4903e33982e7a9bbd04674af517e796d6e) Signed-off-by: Michael Tokarev diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 5c1e385dc8..8fc08218d2 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -131,12 +131,3 @@ msys2-64bit: # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. TEST_ARGS: --no-suite qtest - -msys2-32bit: - extends: .shared_msys2_builder - variables: - MINGW_TARGET: mingw-w64-i686 - MSYSTEM: MINGW32 - EXTRA_PACKAGES: - CONFIGURE_ARGS: --target-list=ppc64-softmmu -Ddebug=false -Doptimization=0 - TEST_ARGS: --no-suite qtest From patchwork Wed Feb 28 22:54:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776499 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp537968wrn; Wed, 28 Feb 2024 14:57:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXVhWpxJU+eCqOC+CXcz8vaVw7FeeD1+YpzRItmMrQspGb6I40KfnzAHtDBay9OfWo7snTVKlgM3exz44zwXM4Y X-Google-Smtp-Source: AGHT+IEDNHWv6osMkQC/h3zcFoTVZksNPLPdQfRKJ1pgityJIFfbONUevy/sb8TaEgp9vJr3D8RL X-Received: by 2002:ac8:7d55:0:b0:42e:b163:ecf1 with SMTP id h21-20020ac87d55000000b0042eb163ecf1mr463873qtb.2.1709161050187; Wed, 28 Feb 2024 14:57:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709161050; cv=none; d=google.com; s=arc-20160816; b=rNGIAYuDb2BTs1eQ4pwk+yMWWAs+nxSeU4ZKbEGo9bL07cljxkuvnYcvelfpkzVMCj 57FdkNlch/r4gz8J+HSfxbqsyt3t79ISkReMftoRl7zkKJVMOerpevIDB3/bq6FDylAy 3YGTQWmKqom+PUOtN8XVktMIMYy9jo4u5ZJa0d2FcnCvXzdKcmFSTEszvoacW78QmNFz sXcVd+INvz/vHiFEL8bf3KAsgGreiqj12yHN+ofoZecMLCikjxF9ynN5kN6fi9GRsa2s /bEW2KcaKO7TcMumzcTFtn4AYbhJu1IG14lO6n14e1xaiLc6AXYLi0NRwAT04CVCRJoP 0sbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=5jU4zUiY3apHaHS5tRnrBnf6hFLJOKrXDk6Ynn0nLGM=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=qVS8U2599Ezsy54OkKWdS3X6uOBg5ru8JLok41xdbMPo2UzQ+HhiPF4NLNVl2y6I9c cP2AIfdBtWP0pD8rd3l/NpuqYSkOSSG+PK0i0ytSdUhtTuHiU6M6azNL1w6SJYyKLl6j mO3eP9y4X2ygzH8WCLxK1bSaFBaO5s5sPEuw1A16p78ewkLysqjb9pEf2C/Vkkuh4zJm z3xmFctuOmfRYlTh1U6MHjFrQIcWb5wEFVlWuOdb1jgEHu6imA781gqvUzgTvXRP9/xw Tu5dPvFcA3tmYH6R9dQm+acTZta2PvNzzc7ODKIlnIwlMo2T1V0tPv3R/dRMTskANhII M1Xg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y17-20020a05622a005100b0042e4fe977casi176486qtw.344.2024.02.28.14.57.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 14:57:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfSqO-00066g-F0; Wed, 28 Feb 2024 17:56:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSqK-0005yP-4G; Wed, 28 Feb 2024 17:56:04 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSqC-0000oO-HA; Wed, 28 Feb 2024 17:56:03 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 71F3351815; Thu, 29 Feb 2024 01:55:33 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D5FC48BB48; Thu, 29 Feb 2024 01:54:56 +0300 (MSK) Received: (nullmailer pid 274162 invoked by uid 1000); Wed, 28 Feb 2024 22:54:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Michael Tokarev Subject: [Stable-8.2.2 76/78] tests/vm: update openbsd image to 7.4 Date: Thu, 29 Feb 2024 01:54:52 +0300 Message-Id: <20240228225455.274062-16-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée The old links are dead so even if we have the ISO cached we can't finish the install. Update to the current stable and tweak the install strings. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2192 Tested-by: Thomas Huth Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20240227144335.1196131-5-alex.bennee@linaro.org> (cherry picked from commit 8467ac75b3b7207a49a1c6c7b87f0f7d2d0cea18) Signed-off-by: Michael Tokarev diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 85c5bb3536..85c9863633 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -22,8 +22,8 @@ class OpenBSDVM(basevm.BaseVM): name = "openbsd" arch = "x86_64" - link = "https://cdn.openbsd.org/pub/OpenBSD/7.2/amd64/install72.iso" - csum = "0369ef40a3329efcb978c578c7fdc7bda71e502aecec930a74b44160928c91d3" + link = "https://cdn.openbsd.org/pub/OpenBSD/7.4/amd64/install74.iso" + csum = "a1001736ed9fe2307965b5fcdb426ae11f9b80d26eb21e404a705144a0a224a0" size = "20G" pkgs = [ # tools @@ -99,10 +99,10 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait_send("(I)nstall", "i\n") self.console_wait_send("Terminal type", "xterm\n") self.console_wait_send("System hostname", "openbsd\n") - self.console_wait_send("Which network interface", "vio0\n") + self.console_wait_send("Network interface to configure", "vio0\n") self.console_wait_send("IPv4 address", "autoconf\n") self.console_wait_send("IPv6 address", "none\n") - self.console_wait_send("Which network interface", "done\n") + self.console_wait_send("Network interface to configure", "done\n") self.console_wait("Password for root account") self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("Password for root account") @@ -124,6 +124,7 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait_send("Allow root ssh login", "yes\n") self.console_wait_send("timezone", "UTC\n") self.console_wait_send("root disk", "\n") + self.console_wait_send("Encrypt the root disk with a passphrase", "no\n") self.console_wait_send("(W)hole disk", "\n") self.console_wait_send("(A)uto layout", "c\n") From patchwork Wed Feb 28 22:54:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776500 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp538029wrn; Wed, 28 Feb 2024 14:57:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUyk8oMeWtJyu9/CWGJU7DDK5MhANQYj2pGnMHEWLVpaXxrDXeG2k7ugZKU9DboqYzJfYBqDv8Dso01Uv+pO7ek X-Google-Smtp-Source: AGHT+IFQ/TWI5lb9pDpKnGldmjfxH5TyF3N4pm0oaLlbE3j3VwKKr9vFeHxjjBJKTGSa+c3vpmGy X-Received: by 2002:a05:620a:6230:b0:787:c8fd:3646 with SMTP id ou48-20020a05620a623000b00787c8fd3646mr470261qkn.31.1709161062077; Wed, 28 Feb 2024 14:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709161062; cv=none; d=google.com; s=arc-20160816; b=epJAeUh1CDhTyEPPRScxLnIac6GOAg1sFFTbkykyLX3VQLfDNhqkz5ZRAWcT/KiX1H 2+7i/W6IoLndldEKRSgNzdyio9EOcZNvtDdfzcgYy6uTbxx807et373jsVvG1AAiqbuj LnkEnN6+aI+/vb5KAY63tSsiN1pp/9Q2cdKylOBZ1EZyZrJJ4qvNipYkFvq6o7hGsUhK dbUwFSMQcJ/Y0/3Qb2GNAOYGiGRy/08t4eR1I3Y1WPyHw57R6OBixp1l8d1LPXhWC2cl DZAgOsmrNde0v2dj235JCAKO8dbUBF4V1FAQ8RGw+kKKzndfHpz8kmgCll3WHb3MhdQ2 vqaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=wGnZM3q+9N0zIOG/ysNWm82VADveP+9KarzpXaZYDE8=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=dybcYH3hzMIyeTwtQNsSardTDCNaTndId6PRr/ODo5FFSMHwFEmyfQi+f1SgobmR28 ygB1w+SN4a/5jP71TfQ8K1F4zjouMjvAUbEkqR9HzF1/MIe7MMLDfyVOir6vQ/+Nxwsd QRI5YzDRQqVOwUx2jxEhGWh8wLrxvsyTxub7l08anEiR9sClevjMgKuT6S4PjqTn7w3p O75QrFpRIx2cNEDyyFcgwYm/KZ/n4U3H5rA6APCVWxAgeu4iUjtfMxx3MtbO5cX2YR2y bqOeXXYlg5bA6gQSnHBvLSmk+SSamtlSd7axA9Py2ZmxNSISmYRnLcaZ9O74hGoyCvuu W3vg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o17-20020a05620a22d100b00787ec0da457si160218qki.269.2024.02.28.14.57.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 14:57:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfSqc-0006IA-TS; Wed, 28 Feb 2024 17:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSqa-0006H6-RT; Wed, 28 Feb 2024 17:56:20 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSqY-0000qR-3c; Wed, 28 Feb 2024 17:56:20 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 8181351816; Thu, 29 Feb 2024 01:55:33 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E57FC8BB49; Thu, 29 Feb 2024 01:54:56 +0300 (MSK) Received: (nullmailer pid 274165 invoked by uid 1000); Wed, 28 Feb 2024 22:54:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Michael Tokarev Subject: [Stable-8.2.2 77/78] tests/vm: avoid re-building the VM images all the time Date: Thu, 29 Feb 2024 01:54:53 +0300 Message-Id: <20240228225455.274062-17-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée The main problem is that "check-venv" is a .PHONY target will always evaluate and trigger a full re-build of the VM images. While its tempting to drop it from the dependencies that does introduce a breakage on freshly configured builds. Fortunately we do have the otherwise redundant --force flag for the script which up until now was always on. If we make the usage of --force conditional on dependencies other than check-venv triggering the update we can avoid the costly rebuild and still run cleanly on a fresh checkout. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2118 Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20240227144335.1196131-4-alex.bennee@linaro.org> (cherry picked from commit 151b7dba391fab64cc008a1fdba6ddcf6f8c39c8) Signed-off-by: Michael Tokarev diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index bf12e0fa3c..ac56824a87 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -102,7 +102,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(if $(LOG_CONSOLE),--log-console) \ --source-path $(SRC_PATH) \ --image "$@" \ - --force \ + $(if $(filter-out check-venv, $?), --force) \ --build-image $@, \ " VM-IMAGE $*") diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 61725b8325..e38159a6fd 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -644,9 +644,9 @@ def main(vmcls, config=None): vm = vmcls(args, config=config) if args.build_image: if os.path.exists(args.image) and not args.force: - sys.stderr.writelines(["Image file exists: %s\n" % args.image, + sys.stderr.writelines(["Image file exists, skipping build: %s\n" % args.image, "Use --force option to overwrite\n"]) - return 1 + return 0 return vm.build_image(args.image) if args.build_qemu: vm.add_source_dir(args.build_qemu)