From patchwork Wed Feb 28 20:35:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776495 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp485683wrn; Wed, 28 Feb 2024 12:38:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUjSNe0Z9KfuKqQD2hi1g+gU5BhI62Hdfld2o6eO/wGZnQ+wjbu8KHyT8ee9IySa08jL47NeiNCd6cevBf4DNwQ X-Google-Smtp-Source: AGHT+IEZilypqTpYeYwlWG675C6YB3uRmPslcdiJp1YDmiav055s+A/HXmgGmGyXbeMPmEZvz7NW X-Received: by 2002:a05:6830:1e77:b0:6e4:8e99:5895 with SMTP id m23-20020a0568301e7700b006e48e995895mr16373otr.25.1709152682093; Wed, 28 Feb 2024 12:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709152682; cv=none; d=google.com; s=arc-20160816; b=nJrZrbU6cbIeHmGu+IJf81UAW5l67TvqPHUZh4g6GuLVBWT9BSP7p4oiIXDLB/cyAd c6h16HHEXCA7JdKMopxUEwF/lI2hBI3UqRN2M97UeM71drA2sE3k79qTv9hHzq06aLk9 zfO6SlFswsJWo7tEoFOVg14Tp+TkAj3PvG/rp7jMSQPAtEObiy1hCGFF79LtdfZSj2vb FevIShr4Fy6EbryUbQU2jxVv+ODLUO2ws3e4IbT94xPtd+6WF5aPkYHK4z0zK4xnQFHW TX4IpSuT5/nuwujx1AvTNQwnQmW96lPGs/UbBzINO+aJtETcTVDmnBr2lBoH9Uau/Dux ybHQ== 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=6UnWtPOjPrQk5kpopLKqFWYtS51y6K/GXOOtcyBlYrs=; fh=CVsDkflDe2cHmz2lTOTudqWZC+x/ad5a2xcuuse0Zdo=; b=YI4zIIllh8Wck0B3ikH9E+IYFOSCQgzsvsa/IGG3EtA6W5vVdj6OxV/3NbT+7irGoW u2TNtQyADtOK4I3reQH2Q47v/wSmO7Zyo8fjZG7D0ZGS9dqFaCQBhXBihfG688ba1FTD v/aj4X/q7E8Lh3uD609rZ2fnMuTYY3nNMrkDPOaKaEWou+mTOs3Qn5QM9CTaEXHNezJ9 JMCAyYVYB79wDm9AfYA5fsWYPYkAPonIUsEilNiVqWPJFeigJpBXF5eczhW9HLkmiO66 0Xts8JY8jSi+ggaUu3+3zsWpxgc/yfIiHYpKcnuro7Zu3LIaHFCKXOM82aEq9BD30j3j vhAQ==; 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 bq31-20020a05620a469f00b00787df54066esi365472qkb.112.2024.02.28.12.38.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 12:38:02 -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 1rfQes-00057t-1T; Wed, 28 Feb 2024 15:36: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 1rfQeS-00053o-LA; Wed, 28 Feb 2024 15:35:40 -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 1rfQeR-0001Ht-1N; Wed, 28 Feb 2024 15:35:40 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 468405176F; Wed, 28 Feb 2024 23:35:58 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D7FB18BA77; Wed, 28 Feb 2024 23:35:21 +0300 (MSK) Received: (nullmailer pid 267620 invoked by uid 1000); Wed, 28 Feb 2024 20:35:21 -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-7.2.10 37/47] .gitlab-ci.d/windows.yml: Drop msys2-32bit job Date: Wed, 28 Feb 2024 23:35:05 +0300 Message-Id: <20240228203521.267565-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 (Mjt: in 7.2 the piece being removed is different but the job has to go anyway) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a3e7a37022..0180261b7f 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -63,37 +63,3 @@ msys2-64bit: --enable-capstone --without-default-devices' - .\msys64\usr\bin\bash -lc 'make' - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' - -msys2-32bit: - extends: .shared_msys2_builder - script: - - .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed - bison diffutils flex - git grep make sed - mingw-w64-i686-capstone - mingw-w64-i686-curl - mingw-w64-i686-cyrus-sasl - mingw-w64-i686-gcc - mingw-w64-i686-glib2 - mingw-w64-i686-gnutls - mingw-w64-i686-gtk3 - mingw-w64-i686-libgcrypt - mingw-w64-i686-libjpeg-turbo - mingw-w64-i686-libssh - mingw-w64-i686-libtasn1 - mingw-w64-i686-libusb - mingw-w64-i686-lzo2 - mingw-w64-i686-ninja - mingw-w64-i686-pixman - mingw-w64-i686-pkgconf - mingw-w64-i686-python - mingw-w64-i686-snappy - mingw-w64-i686-usbredir " - - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment - - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - - mkdir output - - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" - - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' From patchwork Wed Feb 28 20:35:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776497 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp485875wrn; Wed, 28 Feb 2024 12:38:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUb4y34xSf23E6jkLpv1M9KsW3sHmYrS1TmdYMuDQCLR7lU0ElPHPM/NZzCtpPGViTQbSaUgEohwcy7ASaU1EZK X-Google-Smtp-Source: AGHT+IG/XEDLuJZrB9xUNJkk5olno7QOegsfY02CagveQ5lJ1Bsb8Pyj1K62nGcxIWZXC097Q24a X-Received: by 2002:a05:6358:5797:b0:17b:57f3:3b9 with SMTP id m23-20020a056358579700b0017b57f303b9mr425762rwf.14.1709152710008; Wed, 28 Feb 2024 12:38:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709152709; cv=none; d=google.com; s=arc-20160816; b=1A4Xcl9+oYci8PgDZz0WFl+SEyoYWMpS2xONGYJ7sPD6jA0v1CrsrK+XqXUHHDNuc/ 9zJ/kzJpe/+8Nmu91G1mtqlRN/IkcoH8Ty6Nd4r5CyL0eMMykrpzKlneiQxazUSAut8E 6qQEU5KSanUvwXj9+TWdYDzxZnaltgNg73AXdt2/TLt+Tn7xDe/lG1ZBWHCZhwSwF/hy OoxehZO+GoWpHind1O0k0TEH5YwGioG1SwsoBwatsBYKAc6MdEDWjIDbQhqnr9YDYMfy jeZJX1aOZ4FRJvGI/Csu/bnbJ8HaKUyhqO3M/d+Ltr2DjcLd5rDQ0MSjbO0YZ2a5D5Yk 3HPA== 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=8uFEjDtHse1gHzFMdKSvFyTy80C8ER6TZQ0hieOJmsM=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=VD2W/79J3N+xdNDaMnSnzl7NUdwdQI1ws0wAc7hHFaIEH/bQCckw/tMNzvvZWD/Cwp TKKtpNO5jlpB40XnyS+lWIl2noT+E4J6C/y+69q3ea4WLNs8qEeQnLj7cpxoXWCehM4v /eVYtDnhJsqdiSKPy8pTqCZe5qaR2o8stoL9Ukxe5HTY1G265NvBw0/VprOWuUXdA88B JcWRhjC9pY/GOti7F9Xf4/mrz5dLgO1jxMwNqMd5Q2XWQnZPfd0EpXhzzQePIoCwtff3 LfperBlLP6I9bYxbwnMPozmt0BwYdnQXRJ9wYco6yAAJmwoPSyOM632lalGRjvgr28bh kLhg==; 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 i10-20020ad45c6a000000b0068cbcf48e43si323071qvh.49.2024.02.28.12.38.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 12:38:29 -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 1rfQf4-0005Uw-Rl; Wed, 28 Feb 2024 15:36:19 -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 1rfQew-0005J6-KL; Wed, 28 Feb 2024 15:36:15 -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 1rfQes-0001OA-El; Wed, 28 Feb 2024 15:36:10 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E60AE51778; Wed, 28 Feb 2024 23:35:58 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 863308BA80; Wed, 28 Feb 2024 23:35:22 +0300 (MSK) Received: (nullmailer pid 267647 invoked by uid 1000); Wed, 28 Feb 2024 20:35:21 -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-7.2.10 46/47] tests/vm: update openbsd image to 7.4 Date: Wed, 28 Feb 2024 23:35:14 +0300 Message-Id: <20240228203521.267565-13-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 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 eaeb201e91..f185aa96ab 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 @@ -97,10 +97,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") @@ -123,6 +123,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", "\n") self.console_wait_send("Location of sets", "cd0\n") From patchwork Wed Feb 28 20:35:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776496 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp485690wrn; Wed, 28 Feb 2024 12:38:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVxPTjfjqoeqMbMJ7wVX5Y7JMLA76xc3F6iVWYH3qM2So9pcNt2yYXLxbPf37m4AoQpUWBxBoaeyuwic8SfjWvt X-Google-Smtp-Source: AGHT+IF8qIJAzUhZrM0CcjXtBuSEmtvBXL1W13cKoYUoRGIUvujkIg/BSj20vZ7yVfzyJJ58XJCC X-Received: by 2002:a05:622a:c3:b0:42e:74bb:5fd4 with SMTP id p3-20020a05622a00c300b0042e74bb5fd4mr704909qtw.20.1709152683377; Wed, 28 Feb 2024 12:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709152683; cv=none; d=google.com; s=arc-20160816; b=aBndamJPfsZbwkpPWqC0rFO4QY9mVFTdvY5e+glNDRxunWH6NIKOZzAw50Kz4XXPWr bCBLw5v1U1r1Y1+IHWcxbk++8kcf+WvutWUwnRPOf7xt5osySb+D1dLOwKtdoqI8wMEB Y8g8x7nsRlRpIOhrQ0mMRwF0L+aKRzBBuBPfrLdqUYCM9Itc+EI70lzijVIsF1AmjuWM bF7A1QUQfufvISKQQ404hNrbBgl9fENnE+cpzB72B2jYyBsrT/SR5/Ms8VBNv9F5tuyy YiDiu63DhEBRhBjERmY0QI885TH/KnIt9LNk04JFiJbp54kAhlxWebFOgLJilSi81ZL6 4mOg== 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=DXmqduOiDW3D22jN8dgm9xBEUb6oLd0KACY8pjovXKI=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=kB6y+rrfW0HWz1Wmg7OHh78E81sO7PR3fs61N6KHxOpJaU0XSwmWvofaAqvRy+/Qta vW3GVto2XcOpBqIfbOUEMzFRIDMK/J82V/GJI9ZT2wJWHz54GPb5HEfv/dDeHlex+Qi8 ZXmp1bGKP/brTke1UxEYddWX/GeGbkpFWJbnq57L4wJ6bB7oSN7prGQrnnOQ/OvUWlYf tHpgV6Z0JGPY/SiGlboZsJMtcKclU1JBQBVFld0YH8hCGhX7KPDFBDTnf/iy3Dl2wXue RZrm+7cagPHKN6jR8nS5frWFt4TSpRdYaOyVtn5PGcJVEe3tXrEkvqIgkj9DTDFp222b kUBw==; 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 q26-20020ac8735a000000b0042e49a73daesi223167qtp.385.2024.02.28.12.38.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 12:38:03 -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 1rfQfJ-0005ow-Aj; Wed, 28 Feb 2024 15:36:33 -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 1rfQfH-0005gh-Fm; Wed, 28 Feb 2024 15:36:31 -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 1rfQfE-0001Oo-OF; Wed, 28 Feb 2024 15:36:30 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0170351779; Wed, 28 Feb 2024 23:35:59 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 95EED8BA81; Wed, 28 Feb 2024 23:35:22 +0300 (MSK) Received: (nullmailer pid 267650 invoked by uid 1000); Wed, 28 Feb 2024 20:35:21 -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-7.2.10 47/47] tests/vm: avoid re-building the VM images all the time Date: Wed, 28 Feb 2024 23:35:15 +0300 Message-Id: <20240228203521.267565-14-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 2cc2203d09..e332fd13c3 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -103,7 +103,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 2276364c42..6a54d9d4e0 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -634,9 +634,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)