From patchwork Wed May 29 16:09:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 799865 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp814182wrz; Wed, 29 May 2024 09:12:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMcLMeYwBKoPttbtOqNnAAaq8xp8ZWaouh9As3lce7wdFK5MAdU4eWHdC5D64xCTKI1c697LvNM8NsXAaXMSbs X-Google-Smtp-Source: AGHT+IF9hXsLoxwX66B+WELxmLsf4OiNru8aOyzv39md+HWg1k+ymtkOoBmVVNsm/z0HAYfNwgtM X-Received: by 2002:a05:622a:1346:b0:43e:39db:360e with SMTP id d75a77b69052e-43fb0f06772mr154166521cf.65.1716999167376; Wed, 29 May 2024 09:12:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716999167; cv=none; d=google.com; s=arc-20160816; b=h472zSaJJvfqxc39sm5+j+XeL02kUgg/x55KtbnDmvyf39a+2hJU6wrPh04bxnJKEO oeGYWVbNS44xXiu4wepavW4dIW5DljZA9PKae4j2nlZUtoPIGLP5b1I+YngAkIy24H43 aVX9J26b5KsVr4AsztkQJAI68zWjGbvHywcX1JdS8NCxs+7buXW+3hv1EwfBae1qpHUj 530NBL8t5ANaJcUG3pNeVWjHqihSPx4aZNHCIDW2v1qyz5cFiUE0r2qIBb0fwLkZzKLG fK853RqtYDK81sSNL7tWlCDSM0Xaa38qGs7V/5YLpEX8/Rwd+1Yci9VO3uv/Lx/QrzwI i4iw== 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:dkim-signature; bh=4mFJU9rFkOCPkiRRJRVguUKwofFuR8N6rDGAXVArW6I=; fh=73Bjh8AhN5WIZkOkggOaOI6x10w+Om+h0ZWVmgoFcNA=; b=gcglG79e+HiDovv3MmjpY2cvxeGgS1UxQavwArGhc6DS6wnVqA+AUknk0t+EdEkWnn Ig7iQ0nJ+0rk4g9vG+gub0apSriNBOJH46lG1s8UcRIYihMv6T9jIr9JDs0Eb4YsuAaz IrHJzgddxYaFjBe5R89Eu/ixx8nazQWJJsyge23QTz8OSiKx9gik/IHdPpyTYN9NyV1m tS8tjkVZAJIfWGN0Dl/LFSqbZ07qgXdsF+xMLEwr5CuIP9nX3Q7z66vv6GtTNSH6TNyi LowxqXII3CTavX8xvUeNnwRM0PaHgF6a8ZPRBCCWa0w8tkX84dB2Y8+o/OtIJdfrIe83 y9vg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LZXloJhg; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-43fb18cacd2si128459821cf.687.2024.05.29.09.12.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2024 09:12:47 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=LZXloJhg; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCLs8-0000aP-Tl; Wed, 29 May 2024 12:09:52 -0400 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 1sCLs7-0000Yb-2M for qemu-devel@nongnu.org; Wed, 29 May 2024 12:09:51 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCLrx-0003I0-B2 for qemu-devel@nongnu.org; Wed, 29 May 2024 12:09:50 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-57a033c2ed4so503816a12.1 for ; Wed, 29 May 2024 09:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716998979; x=1717603779; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4mFJU9rFkOCPkiRRJRVguUKwofFuR8N6rDGAXVArW6I=; b=LZXloJhgR4Jf3HrYJT7ZZ4BWg5EFNqZYDqtQlvZb1fddhPhdtSv+DyNVGqhcd8Z4lK 6osD6EwRPEWPgWNjNQFDO79vEajgbshTPWF8ThE9IUyQ30tyNrAjCjwln7J1JIumn8TH qmlwsE0jxJu5csQNmWyrbUrkzGX8RoG10M5RDk3p7mzGCAzujW5qxB5Kz0WnO836qGUe UtX83dTW+AWDWQ94hr+GBXlHL4dwE7vVZmBgUqiyypDElXoAsNDb+l+fcqB8GuZjU09E QyalW9kZa10okgnSaY3GaZ1M2lfmIR+fwlwOPe4vMWamRxIsG3jk7ngnTMU+x54kGywq xq4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716998979; x=1717603779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4mFJU9rFkOCPkiRRJRVguUKwofFuR8N6rDGAXVArW6I=; b=BILaK8N4RoCgwkV3nqaLwDXhjHG+OvRSuPUG6Uu6hME9qQDM51c1xJg4ZlBvjBONTx AJHUa1upMZhJptFYCHQGMBWYobfHLPn+gsSZ09idnkxkatX6L47kH9KAZRB0GJO6SYUq Shh5/zbCGxhh90Qr5huYf6x5iG5VMUqgqFSa7KpinJZuct5Ewo9LFOW3nlZg3tSAC8YT dPeD06wH0DQLIu4SAXDZSKlRCelu44aVX4kUnwEgy4N+0hzTPjkoY7dq6NKsGWbYhvp0 L6Eg1QB4b/aOBTuHlg12+yOAUw0GX1ibozw3tpofnxYvaArp/rUoTWfCrZ+yo6c99jJO 9axw== X-Gm-Message-State: AOJu0Ywd5fudgqNF3hOq/vwZTCN3Ss4bIQP/T3FbDZMn0XAqfqX5KfcP CEJOwVhKm+ZxHRbIc8yX6hpgJm4wYmg++/+WlYQtzDKdPEJMqiLflKxbzTGSlAw= X-Received: by 2002:a50:c309:0:b0:578:6c08:88fb with SMTP id 4fb4d7f45d1cf-5786c088c0bmr8728475a12.12.1716998978694; Wed, 29 May 2024 09:09:38 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5785233bb04sm8555012a12.12.2024.05.29.09.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 09:09:36 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 688095F8E7; Wed, 29 May 2024 17:09:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Wainer dos Santos Moschetta , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Beraldo Leal , Thomas Huth , Richard Henderson , Leif Lindholm , John Snow , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Mark Cave-Ayland , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Jiaxun Yang , qemu-arm@nongnu.org, Cleber Rosa , Joel Stanley , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Marcin Juszkiewicz , Peter Maydell , qemu-s390x@nongnu.org, Radoslaw Biernacki Subject: [PATCH 04/10] tests/vm: remove plain centos image Date: Wed, 29 May 2024 17:09:28 +0100 Message-Id: <20240529160934.982373-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240529160934.982373-1-alex.bennee@linaro.org> References: <20240529160934.982373-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 This isn't really used and we have lighter weight docker containers for testing this stuff directly. Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20240521125314.1255403-5-alex.bennee@linaro.org> --- tests/vm/Makefile.include | 1 - tests/vm/centos | 51 --------------------------------------- 2 files changed, 52 deletions(-) delete mode 100755 tests/vm/centos diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index ac56824a87..13ed80f72d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -45,7 +45,6 @@ vm-help vm-test: @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" ifneq ($(GENISOIMAGE),) - @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" ifneq ($(EFI_AARCH64),) @echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 VM" @echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 VM" diff --git a/tests/vm/centos b/tests/vm/centos deleted file mode 100755 index d25c8f8b5b..0000000000 --- a/tests/vm/centos +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python3 -# -# CentOS 8 Stream image -# -# Copyright 2018, 2022 Red Hat Inc. -# -# Authors: -# Fam Zheng -# -# This code is licensed under the GPL version 2 or later. See -# the COPYING file in the top-level directory. -# - -import os -import sys -import subprocess -import basevm -import time - -class CentosVM(basevm.BaseVM): - name = "centos" - arch = "x86_64" - BUILD_SCRIPT = """ - set -e; - cd $(mktemp -d); - export SRC_ARCHIVE=/dev/vdb; - sudo chmod a+r $SRC_ARCHIVE; - tar -xf $SRC_ARCHIVE; - make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1; - make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1; - """ - - def build_image(self, img): - cimg = self._download_with_cache("https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qcow2") - img_tmp = img + ".tmp" - subprocess.check_call(['cp', '-f', cimg, img_tmp]) - self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) - self.wait_ssh() - self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") - self.ssh_root_check("dnf update -y") - self.ssh_root_check("dnf install -y dnf-plugins-core") - self.ssh_root_check("dnf config-manager --set-enabled powertools") - self.ssh_root_check("dnf install -y podman make ninja-build git python3") - self.ssh_root("poweroff") - self.wait() - os.rename(img_tmp, img) - return 0 - -if __name__ == "__main__": - sys.exit(basevm.main(CentosVM))