From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167075; cv=none; d=zohomail.com; s=zohoarc; b=BRC6hg7jbIfJ4OCL59zGendCIVgsk80vfJbiWDeK1ovmzJRlhvDmYTIkIz6ZRfu5/9t9coh9MwQL16FDbN3lTTwWaHG4uKzKisdcZs8VgBTQXdBTFvO/loFJ4AshikoSejntXqrNm6fNxqECTpGCD0k6IZVdSgcd53EsNAykaoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167075; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IpLM0FT+7pHSpjWY8RUVyOzAc9Z8imqTmnKVtzrRDGQ=; b=LZbrAmdVfUiQbowpLxQhiIuAH7Ueyij4P3csT1ZIsZaaCTYghCq7Fo1FGIy6MSat5fytQ0XeQ6Bum59lDu/JxJ0zvjMq9hcznAME0fhSb83uzuYCWNfOYFLg4kfz4x8RoJHLJobOyrC1OT5AKLbMLbMJl3D505/VrXa13251lD0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167075716592.678925425022; Wed, 6 Jul 2022 21:11:15 -0700 (PDT) Received: from localhost ([::1]:42124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9IrC-0004mk-Ni for importer@patchew.org; Thu, 07 Jul 2022 00:11:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ije-0003eP-4U for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008Dn-Mx for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-P9Sq8jfBMxuHRjsPHNoNHA-1; Thu, 07 Jul 2022 00:03:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2E6F28032EA; Thu, 7 Jul 2022 04:03:12 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id B02CF2EF97; Thu, 7 Jul 2022 04:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IpLM0FT+7pHSpjWY8RUVyOzAc9Z8imqTmnKVtzrRDGQ=; b=iMIs/j5oWfvNAgY9q4RSvT6vCLKPaQ0qWIBam+7Fid9gFu+z9EbD+2YnYzjxsS9tpv/oFR 03UZhbzn4l6DZ09+Yd5UGzdg0PHtOA/nN2pOioV9LZ/RXb6EO0Y3OwqCgoHhYxWWEsgRNa 7N0O823H3boFTHJgrgCjDkeivVqUpXU= X-MC-Unique: P9Sq8jfBMxuHRjsPHNoNHA-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 01/13] qga: treat get-guest-fsinfo as "best effort" Date: Thu, 7 Jul 2022 00:02:58 -0400 Message-Id: <20220707040310.4163682-2-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167076827100001 Content-Type: text/plain; charset="utf-8" In some container environments, there may be references to block devices witnessable from a container through /proc/self/mountinfo that reference devices we simply don't have access to in the container, and cannot provide information about. Instead of failing the entire fsinfo command, return stub information for these failed lookups. This allows test-qga to pass under docker tests, which are in turn used by the CentOS VM tests. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- qga/commands-posix.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0469dc409d4..950c9d72fe7 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1207,7 +1207,12 @@ static void build_guest_fsinfo_for_device(char const= *devpath, =20 syspath =3D realpath(devpath, NULL); if (!syspath) { - error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); + if (errno =3D=3D ENOENT) { + /* This devpath may not exist because of container config, etc= . */ + fs->name =3D g_path_get_basename(devpath); + } else { + error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); + } return; } =20 --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167070; cv=none; d=zohomail.com; s=zohoarc; b=PbOICXZ4yOkvSUfyRVQMHCSPTfttt4+xSjBth1C4PPjcUhP43lxbt/c3A1hnoxz+cYBytm6pRhekvu3OdsQRR+NmKuSsRXDxyQAAk159fmw43lbzKWaydBJzY0Get84USJzELU4tUzBWHjzKFhG9x1eYsyn1u+90eV8gbpQOwao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167070; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j5YIYs9jopjefngCfsXUxlp83tbCNHKgy3FlWqpRbBw=; b=WWCr5BWwIqhDaQYq9i+oPOTmviiBT7zGrzFKebrCtY9V54aLs6dz4rtyJ7UFpCZq2mRk4UiEY0pfqVhQSKmXKMCSBzBV0tPMOKDkpJCOWC/s46RuQZUDY4GTcrVbAs319s9KaHef5qeyp7jWwvM+ATLw9tmU5bEOcWqDFKNSyMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167070706774.6379847530884; Wed, 6 Jul 2022 21:11:10 -0700 (PDT) Received: from localhost ([::1]:41618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Ir6-0004Ob-VA for importer@patchew.org; Thu, 07 Jul 2022 00:11:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijf-0003gO-Hl for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008DB-Gh for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:27 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-98-nsbrP1kLPJqbvRKdOq_mEw-1; Thu, 07 Jul 2022 00:03:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD8FE811E76; Thu, 7 Jul 2022 04:03:12 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C1AC18ECC; Thu, 7 Jul 2022 04:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j5YIYs9jopjefngCfsXUxlp83tbCNHKgy3FlWqpRbBw=; b=fqJuNwzetHHWP1Z0L4CRpDzHzu86GB5mqdUCi/ltdfMuhZCJwqPHp1asJ/PABg4NMU2bAQ m12AyfhrzSQKHfOQ7wWSl5YaOiDea6TzMDgNDUNcoSkyfw8AgHeM0bFY2T0jnydGEryQZj KHLa2jWmARjAQRIAGFtdTKDuewJi/LU= X-MC-Unique: nsbrP1kLPJqbvRKdOq_mEw-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 02/13] tests/vm: use 'cp' instead of 'ln' for temporary vm images Date: Thu, 7 Jul 2022 00:02:59 -0400 Message-Id: <20220707040310.4163682-3-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167072757100001 Content-Type: text/plain; charset="utf-8" If the initial setup fails, you've permanently altered the state of the downloaded image in an unknowable way. Use 'cp' like our other test setup scripts do. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/centos b/tests/vm/centos index 5c7bc1c1a9a..be4f6ff2f14 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -34,7 +34,7 @@ class CentosVM(basevm.BaseVM): def build_image(self, img): cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2") img_tmp =3D img + ".tmp" - subprocess.check_call(["ln", "-f", cimg, img_tmp]) + subprocess.check_call(['cp', '-f', cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh() --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167494; cv=none; d=zohomail.com; s=zohoarc; b=Rxu/WFnlwwP1JrdfkMPKw4Nt/nlDOl/CmsUGwiFHK66c9vl17flr+tCj0DbBsqv/YYPNVPzP+g+pwvV6XnbTDiri6Qo3M4vTM94IoMm3uyMkelwQDEL7swneN9LuoA3miezSDhiYc8yLZGRIvAKMMSsjpLm6BxkN4gxWWI0MSdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167494; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vg8eq9vfkjKWNpJJvbWz+KMxzoXB5T1FPMyw1NPbxgU=; b=jNMnA6qa22Hc4HiDGZ3ncNx7wRIdTbfZwSpaJhO0p6dJ6GAiE186VAeOQ655nl1UCrr2ZNj79JbB8jEnJBpuI9Q3J4LP0O3bulQSbtpJI8+5jWZuqPfyUggNRUWGTLJVUlvNTwlT1mciFEhPsoR6StdBXMK04YOGTUpZWDGdsBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167494954495.11098287396567; Wed, 6 Jul 2022 21:18:14 -0700 (PDT) Received: from localhost ([::1]:56350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Ixx-0006AS-O0 for importer@patchew.org; Thu, 07 Jul 2022 00:18:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijh-0003h0-HT for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46139) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijb-0008H9-8R for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:29 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-390-OmK2Gkr7Puy7CqFXD7Un0A-1; Thu, 07 Jul 2022 00:03:13 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B1DF3810D3E; Thu, 7 Jul 2022 04:03:13 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCE5118ECB; Thu, 7 Jul 2022 04:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vg8eq9vfkjKWNpJJvbWz+KMxzoXB5T1FPMyw1NPbxgU=; b=JBDuUCoTCZYdKQOrnVV7u+O8zN5hospdIFQmsN0JOKjwKDcTHudy/Kdxmso/g+YgoHS328 xOKMdVUx1o8qD9v7QsSV4E+fMgx97sPEPMqpSeO9EZ5DQU4Ek9SAHhiGI3615TJ+iFNNPV WfvbXtVlG7qt2q289/6ztZqxCuU0mLM= X-MC-Unique: OmK2Gkr7Puy7CqFXD7Un0A-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 03/13] tests/vm: switch CentOS 8 to CentOS 8 Stream Date: Thu, 7 Jul 2022 00:03:00 -0400 Message-Id: <20220707040310.4163682-4-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167495373100001 Content-Type: text/plain; charset="utf-8" The old CentOS image didn't work anymore because it was already EOL at the beginning of 2022. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/centos | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm/centos b/tests/vm/centos index be4f6ff2f14..3a527c47b3d 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -1,8 +1,8 @@ #!/usr/bin/env python3 # -# CentOS image +# CentOS 8 Stream image # -# Copyright 2018 Red Hat Inc. +# Copyright 2018, 2022 Red Hat Inc. # # Authors: # Fam Zheng @@ -32,7 +32,7 @@ class CentosVM(basevm.BaseVM): """ =20 def build_image(self, img): - cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8/x86_64/images/CentOS-8-GenericCloud-8.3.2011-20201204.2.x86_64.qcow2") + cimg =3D self._download_with_cache("https://cloud.centos.org/cento= s/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220125.1.x86_64.qco= w2") img_tmp =3D img + ".tmp" subprocess.check_call(['cp', '-f', cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167278; cv=none; d=zohomail.com; s=zohoarc; b=UeWo984DGLApA8cIXvYMr3Xbk4zwJY/YDzg2xkWpYyifbYEERGCWT15HQmY5u2WR/E2mmX6oV3rC2Lqvf+V3CZC8434lSTx1cfcmiWkDmeQWa2Lx9FmKbNJMgp846x88W2o1f9ZZYSe8jq/6VPJqkkbG64dBjvial7UjPx3cbbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167278; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yksPv9490WfF8W+kA8XOMXtIlRgev9TptRTlum9Bhfk=; b=YAi4OPRZ1GP4ZbkRSXiBb+2OYmgtvarBniqH5G+AWSK24E77x2pWVDiDkm60e7fLZfoQSYQ0vEYAtPvbhwV/mDr5gYevNRk+nOGtemy88kMizZA7iykzOLNk632U5v82Ypi48QHdpHLf+lKR0KbKqZswwrjOkHhP4J/doExzAi0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167278459306.33855933802704; Wed, 6 Jul 2022 21:14:38 -0700 (PDT) Received: from localhost ([::1]:50136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9IuS-0001nU-HU for importer@patchew.org; Thu, 07 Jul 2022 00:14:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijj-0003hB-TI for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ije-0008Mx-N3 for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-422-iRoxWKUcOYG28nv1S7OrPQ-1; Thu, 07 Jul 2022 00:03:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BAA2E80192F; Thu, 7 Jul 2022 04:03:13 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49A4C18ECC; Thu, 7 Jul 2022 04:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yksPv9490WfF8W+kA8XOMXtIlRgev9TptRTlum9Bhfk=; b=dHyWYlN37zaKmtMTVvyg3AlWxXhhc+AUdQcSvXhmBx3iF5BF1fiQgS1Wr3ecwxeoeRSuBR krq7H/PHBHZh6RJ5C8HcKZnFdYSqlOp6y/ajuywuYlcZlN5F1Y7NF0tYbumXgAeKLV7zAq 6AXd2aRtgUPfpryKC/i430EvOAD+zv0= X-MC-Unique: iRoxWKUcOYG28nv1S7OrPQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 04/13] tests/vm: switch centos.aarch64 to CentOS 8 Stream Date: Thu, 7 Jul 2022 00:03:01 -0400 Message-Id: <20220707040310.4163682-5-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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, URI_DOTEDU=1.246 autolearn=no 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167280187100005 Content-Type: text/plain; charset="utf-8" Switch this test over to using a cloud image like the base CentOS8 VM test, which helps make this script a bit simpler too. Note: At time of writing, this test seems pretty flaky when run without KVM support for aarch64. Certain unit tests like migration-test, virtio-net-failover, test-hmp and qom-test seem quite prone to fail under TCG. Still, this is an improvement in that at least pure build tests are functional. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/centos.aarch64 | 174 ++++++---------------------------------- 1 file changed, 24 insertions(+), 150 deletions(-) diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index 96c450f8be5..2de7ef6992c 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -20,150 +20,38 @@ import time import traceback import aarch64vm =20 + DEFAULT_CONFIG =3D { 'cpu' : "max", 'machine' : "virt,gic-version=3Dmax", - 'install_cmds' : "yum install -y make ninja-build git python3 gcc gcc-= c++ flex bison, "\ - "yum install -y glib2-devel perl pixman-devel zlib-devel, "\ - "alternatives --set python /usr/bin/python3, "\ - "sudo dnf config-manager "\ - "--add-repo=3Dhttps://download.docker.com/linux/centos/docker-ce.r= epo,"\ - "sudo dnf install --nobest -y docker-ce.aarch64,"\ - "systemctl enable docker", + 'install_cmds' : ( + "dnf config-manager --set-enabled powertools, " + "dnf config-manager --add-repo=3Dhttps://download.docker.com/linux= /centos/docker-ce.repo, " + "dnf install -y make ninja-build git python38 gcc gcc-c++ flex bis= on "\ + "glib2-devel perl pixman-devel zlib-devel docker-ce.aarch64, " + "systemctl enable docker, " + ), # We increase beyond the default time since during boot # it can take some time (many seconds) to log into the VM. 'ssh_timeout' : 60, } =20 + class CentosAarch64VM(basevm.BaseVM): - name =3D "centos.aarch64" + name =3D "centos8.aarch64" arch =3D "aarch64" - login_prompt =3D "localhost login:" - prompt =3D '[root@localhost ~]#' - image_name =3D "CentOS-8-aarch64-1905-dvd1.iso" - image_link =3D "http://mirrors.usc.edu/pub/linux/distributions/centos/= 8.0.1905/isos/aarch64/" + image_name =3D "CentOS-Stream-GenericCloud-8-20220125.1.aarch64.qcow2" + image_link =3D "https://cloud.centos.org/centos/8-stream/aarch64/image= s/" image_link +=3D image_name BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); - sudo chmod a+r /dev/vdb; - tar --checkpoint=3D.10 -xf /dev/vdb; + export SRC_ARCHIVE=3D/dev/vdb; + sudo chmod a+r $SRC_ARCHIVE; + tar -xf $SRC_ARCHIVE; ./configure {configure_opts}; make --output-sync {target} -j{jobs} {verbose}; """ - def set_key_perm(self): - """Set permissions properly on certain files to allow - ssh access.""" - self.console_wait_send(self.prompt, - "/usr/sbin/restorecon -R -v /root/.ssh\n") - self.console_wait_send(self.prompt, - "/usr/sbin/restorecon -R -v "\ - "/home/{}/.ssh\n".format(self._config["guest_user"])) - - def create_kickstart(self): - """Generate the kickstart file used to generate the centos image."= "" - # Start with the template for the kickstart. - ks_file =3D self._source_path + "/tests/vm/centos-8-aarch64.ks" - subprocess.check_call("cp {} ./ks.cfg".format(ks_file), shell=3DTr= ue) - # Append the ssh keys to the kickstart file - # as the post processing phase of installation. - with open("ks.cfg", "a") as f: - # Add in the root pw and guest user. - rootpw =3D "rootpw --plaintext {}\n" - f.write(rootpw.format(self._config["root_pass"])) - add_user =3D "user --groups=3Dwheel --name=3D{} "\ - "--password=3D{} --plaintext\n" - f.write(add_user.format(self._config["guest_user"], - self._config["guest_pass"])) - # Add the ssh keys. - f.write("%post --log=3D/root/ks-post.log\n") - f.write("mkdir -p /root/.ssh\n") - addkey =3D 'echo "{}" >> /root/.ssh/authorized_keys\n' - addkey_cmd =3D addkey.format(self._config["ssh_pub_key"]) - f.write(addkey_cmd) - f.write('mkdir -p /home/{}/.ssh\n'.format(self._config["guest_= user"])) - addkey =3D 'echo "{}" >> /home/{}/.ssh/authorized_keys\n' - addkey_cmd =3D addkey.format(self._config["ssh_pub_key"], - self._config["guest_user"]) - f.write(addkey_cmd) - f.write("%end\n") - # Take our kickstart file and create an .iso from it. - # The .iso will be provided to qemu as we boot - # from the install dvd. - # Anaconda will recognize the label "OEMDRV" and will - # start the automated installation. - gen_iso_img =3D 'genisoimage -output ks.iso -volid "OEMDRV" ks.cfg' - subprocess.check_call(gen_iso_img, shell=3DTrue) - - def wait_for_shutdown(self): - """We wait for qemu to shutdown the VM and exit. - While this happens we display the console view - for easier debugging.""" - # The image creation is essentially done, - # so whether or not the wait is successful we want to - # wait for qemu to exit (the self.wait()) before we return. - try: - self.console_wait("reboot: Power down") - except Exception as e: - sys.stderr.write("Exception hit\n") - if isinstance(e, SystemExit) and e.code =3D=3D 0: - return 0 - traceback.print_exc() - finally: - self.wait() - - def build_base_image(self, dest_img): - """Run through the centos installer to create - a base image with name dest_img.""" - # We create the temp image, and only rename - # to destination when we are done. - img =3D dest_img + ".tmp" - # Create an empty image. - # We will provide this as the install destination. - qemu_img_create =3D "qemu-img create {} 50G".format(img) - subprocess.check_call(qemu_img_create, shell=3DTrue) - - # Create our kickstart file to be fed to the installer. - self.create_kickstart() - # Boot the install dvd with the params as our ks.iso - os_img =3D self._download_with_cache(self.image_link) - dvd_iso =3D "centos-8-dvd.iso" - subprocess.check_call(["cp", "-f", os_img, dvd_iso]) - extra_args =3D "-cdrom ks.iso" - extra_args +=3D " -drive file=3D{},if=3Dnone,id=3Ddrive1,cache=3Dw= riteback" - extra_args +=3D " -device virtio-blk,drive=3Ddrive1,bootindex=3D1" - extra_args =3D extra_args.format(dvd_iso).split(" ") - self.boot(img, extra_args=3Dextra_args) - self.console_wait_send("change the selection", "\n") - # We seem to need to hit esc (chr(27)) twice to abort the - # media check, which takes a long time. - # Waiting a bit seems to be more reliable before hitting esc. - self.console_wait("Checking") - time.sleep(5) - self.console_wait_send("Checking", chr(27)) - time.sleep(5) - self.console_wait_send("Checking", chr(27)) - print("Found Checking") - # Give sufficient time for the installer to create the image. - self.console_init(timeout=3D7200) - self.wait_for_shutdown() - os.rename(img, dest_img) - print("Done with base image build: {}".format(dest_img)) - - def check_create_base_img(self, img_base, img_dest): - """Create a base image using the installer. - We will use the base image if it exists. - This helps cut down on install time in case we - need to restart image creation, - since the base image creation can take a long time.""" - if not os.path.exists(img_base): - print("Generate new base image: {}".format(img_base)) - self.build_base_image(img_base); - else: - print("Use existing base image: {}".format(img_base)) - # Save a copy of the base image and copy it to dest. - # which we will use going forward. - subprocess.check_call(["cp", img_base, img_dest]) =20 def boot(self, img, extra_args=3DNone): aarch64vm.create_flash_images(self._tmpdir, self._efi_aarch64) @@ -185,42 +73,28 @@ class CentosAarch64VM(basevm.BaseVM): super(CentosAarch64VM, self).boot(img, extra_args=3Dextra_args) =20 def build_image(self, img): + cimg =3D self._download_with_cache(self.image_link) img_tmp =3D img + ".tmp" - self.check_create_base_img(img + ".base", img_tmp) - - # Boot the new image for the first time to finish installation. - self.boot(img_tmp) - self.console_init() - self.console_wait_send(self.login_prompt, "root\n") - self.console_wait_send("Password:", - "{}\n".format(self._config["root_pass"])) - - self.set_key_perm() - self.console_wait_send(self.prompt, "rpm -q centos-release\n") - enable_adapter =3D "sed -i 's/ONBOOT=3Dno/ONBOOT=3Dyes/g'" \ - " /etc/sysconfig/network-scripts/ifcfg-enp0s1\n" - self.console_wait_send(self.prompt, enable_adapter) - self.console_wait_send(self.prompt, "ifup enp0s1\n") - self.console_wait_send(self.prompt, - 'echo "qemu ALL=3D(ALL) NOPASSWD:ALL" | '\ - 'sudo tee /etc/sudoers.d/qemu\n') - self.console_wait(self.prompt) - - # Rest of the commands we issue through ssh. + subprocess.run(['cp', '-f', cimg, img_tmp]) + self.exec_qemu_img("resize", img_tmp, "50G") + self.boot(img_tmp, extra_args =3D ["-cdrom", self.gen_cloud_init_i= so()]) self.wait_ssh(wait_root=3DTrue) + self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") =20 # If the user chooses *not* to do the second phase, # then we will jump right to the graceful shutdown if self._config['install_cmds'] !=3D "": install_cmds =3D self._config['install_cmds'].split(',') for cmd in install_cmds: - self.ssh_root(cmd) + self.ssh_root_check(cmd) + self.ssh_root("poweroff") - self.wait_for_shutdown() + self.wait() os.rename(img_tmp, img) print("image creation complete: {}".format(img)) return 0 =20 + if __name__ =3D=3D "__main__": defaults =3D aarch64vm.get_config_defaults(CentosAarch64VM, DEFAULT_CO= NFIG) sys.exit(basevm.main(CentosAarch64VM, defaults)) --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167256; cv=none; d=zohomail.com; s=zohoarc; b=arskcn9tx4036UFuGHKJtrjjbbDZRT3tlQVe8calcwqQ4nWU8MPVtH2I/pk6+HE09ckFo7/2ao0eGQsUOhEbHUA0pCP5DSHOPY/zWuOIS+TWENg1a22ZEGpJ4AhG7aitye+Fu5JiIt11PRucdR4C7q+pJnhnL1FJKerYy1QbXds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167256; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=en+iqPqKmiYmVVeQ+kRktypDrRuF7A46+deZSmk4yVc=; b=kI/jo3KAgnJ6wvaqqpV1bB+IDeHuJLHflMtQwdv0xFQtVf2kZrf+rFu7KpEpWpmyAWnj30+Z5FzYuN/pPv7md22vpJONKBqtrS9jO+AnZiKCp+tOHwC0WjQTyCcaur9xOLsXXxuTcGe2mXcxGe4j1FPZ8INT7MLe8H6wGBf9HwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167255995312.85903361206385; Wed, 6 Jul 2022 21:14:15 -0700 (PDT) Received: from localhost ([::1]:49380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Iu6-0001GZ-4f for importer@patchew.org; Thu, 07 Jul 2022 00:14:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ije-0003eQ-4a for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:58288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008DQ-Mr for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-rxIi8A1LOo-kTLPZgVM37w-1; Thu, 07 Jul 2022 00:03:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4705D811E76; Thu, 7 Jul 2022 04:03:14 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8F8B18ECC; Thu, 7 Jul 2022 04:03:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=en+iqPqKmiYmVVeQ+kRktypDrRuF7A46+deZSmk4yVc=; b=faN+kdVa+q6XatJ/+ugQZ8cqORs49ytJUieElet0I+kDjJ034kogMn9slrD14Us/5XQv7T 0XVRqTJr83LwT5S2bRQW7Ec21dJOVUuiP317yw/AnSbnm1adhLDJYQSBMIAvjqh0IaQSF/ qyGwYoDx8qdRqFYxzZz1W3JL6DGYCI4= X-MC-Unique: rxIi8A1LOo-kTLPZgVM37w-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 05/13] tests/vm: update sha256sum for ubuntu.aarch64 Date: Thu, 7 Jul 2022 00:03:02 -0400 Message-Id: <20220707040310.4163682-6-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167257996100001 Content-Type: text/plain; charset="utf-8" This checksum changes weekly; use a fixed point image and update the checksum so we don't have to re-download it quite so much. Note: Just like the centos.aarch64 test, this test currently seems very flaky when run as a TCG test. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/ubuntu.aarch64 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 index b291945a7e9..fc9c2ce22ff 100755 --- a/tests/vm/ubuntu.aarch64 +++ b/tests/vm/ubuntu.aarch64 @@ -32,9 +32,13 @@ DEFAULT_CONFIG =3D { class UbuntuAarch64VM(ubuntuvm.UbuntuVM): name =3D "ubuntu.aarch64" arch =3D "aarch64" + # NOTE: The Ubuntu 18.04 cloud images are updated weekly. The + # release below has been chosen as the latest at time of writing. + # Using the rolling latest release means the SHA will be wrong + # within a week. image_name =3D "ubuntu-18.04-server-cloudimg-arm64.img" - image_link =3D "https://cloud-images.ubuntu.com/releases/18.04/release= /" + image_name - image_sha256=3D"0fdcba761965735a8a903d8b88df8e47f156f48715c00508e4315c= 506d7d3cb1" + image_link =3D "https://cloud-images.ubuntu.com/releases/bionic/releas= e-20220610/" + image_name + image_sha256=3D"0eacc5142238788365576b15f1d0b6f23dda6d3e545ee22f5306af= 7bd6ec47bd" BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657166828; cv=none; d=zohomail.com; s=zohoarc; b=B+yfKRm0QMRF0Z2joYQr00+iuA9DuP1fot8ufU60hGR+NERR2HcTSjwtOC4ShAemipVlRIr5HG5RQz+RbRrA+HYTLfOfuvjdLoTMrfy9DTH8KHBzJ1OpfsyauHa9SlLRV6SypAqnTSvQCksB+7nLCN8VfDQjMyuNJIdK7+PMlF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657166828; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RRQ9LOn83sbCv0V/CPQVc1hKJ3UCStB7PAksh6XsJ0Q=; b=X6B3U4R3TTxRUsDvNXBBQh2Gap72MPx95tdgEOYwn12LxMwMlz03Z4m6z7u63rCbVfgarGl40Lvkqn0fbzMGp6suhJ2z1PhcZ3sEDXsZceHKFznyVZejJWJC+Ctgh2pX+kJGrr0ehiMM5KIg+EZ2+CWerHxTH4JFuflO8434rak= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657166828235242.830485413843; Wed, 6 Jul 2022 21:07:08 -0700 (PDT) Received: from localhost ([::1]:60578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9InC-0006Y5-8w for importer@patchew.org; Thu, 07 Jul 2022 00:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijd-0003dZ-9F for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36333) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008Da-Ir for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:24 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-54-vIopo60ANQCg3axo_Fad-A-1; Thu, 07 Jul 2022 00:03:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5AD13810D3C; Thu, 7 Jul 2022 04:03:14 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 538C318ECB; Thu, 7 Jul 2022 04:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RRQ9LOn83sbCv0V/CPQVc1hKJ3UCStB7PAksh6XsJ0Q=; b=abZW9qBmZaOwfZ0a4P5V1CjQqRJaDAsomLRGn1BjQVVEnXCsIRY61PJFqEw6DCA+D1vgMX unTJLr/FkAAFTK0T87gNrrcMKeE5MJuR0igK/hxNA/hF3bxbFR8nO/3MCEMsHHGxaT6+IB BLKaDnPDv6Dlr4Lq1VQlZQovhbeU7oM= X-MC-Unique: vIopo60ANQCg3axo_Fad-A-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 06/13] tests/vm: remove ubuntu.i386 VM test Date: Thu, 7 Jul 2022 00:03:03 -0400 Message-Id: <20220707040310.4163682-7-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657166829526100001 Content-Type: text/plain; charset="utf-8" Ubuntu 18.04 is out of our support window, and Ubuntu 20.04 does not support i386 anymore. The debian project does, but they do not provide any cloud images for it, a new expect-style script would have to be written. Since we have i386 cross-compiler tests hosted on GitLab CI, we don't need to support this VM test anymore. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/Makefile.include | 3 +-- tests/vm/ubuntu.i386 | 40 --------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100755 tests/vm/ubuntu.i386 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 5f5b1fbfe68..a94f0ebf7f1 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -17,7 +17,7 @@ EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarc= h64-code.fd) =20 X86_IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) -X86_IMAGES +=3D ubuntu.i386 centos +X86_IMAGES +=3D centos ifneq ($(EFI_AARCH64),) ARM64_IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif @@ -48,7 +48,6 @@ vm-help vm-test: @echo " vm-build-fedora - Build QEMU in Fedora VM" ifneq ($(GENISOIMAGE),) @echo " vm-build-centos - Build QEMU in CentOS VM, with = Docker" - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" ifneq ($(EFI_AARCH64),) @echo " vm-build-ubuntu.aarch64 - Build QEMU in ubuntu aarch64 V= M" @echo " vm-build-centos.aarch64 - Build QEMU in CentOS aarch64 V= M" diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 deleted file mode 100755 index 47681b6f87d..00000000000 --- a/tests/vm/ubuntu.i386 +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python3 -# -# Ubuntu i386 image -# -# Copyright 2017 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 sys -import basevm -import ubuntuvm - -DEFAULT_CONFIG =3D { - 'install_cmds' : "apt-get update,"\ - "apt-get build-dep -y qemu,"\ - "apt-get install -y libfdt-dev language-pack-en ninja= -build", -} - -class UbuntuX86VM(ubuntuvm.UbuntuVM): - name =3D "ubuntu.i386" - arch =3D "i386" - image_link=3D"https://cloud-images.ubuntu.com/releases/bionic/"\ - "release-20191114/ubuntu-18.04-server-cloudimg-i386.img" - image_sha256=3D"28969840626d1ea80bb249c08eef1a4533e8904aa51a327b40f37a= c4b4ff04ef" - BUILD_SCRIPT =3D """ - set -e; - cd $(mktemp -d); - sudo chmod a+r /dev/vdb; - tar -xf /dev/vdb; - ./configure {configure_opts}; - make --output-sync {target} -j{jobs} {verbose}; - """ - -if __name__ =3D=3D "__main__": - sys.exit(basevm.main(UbuntuX86VM, DEFAULT_CONFIG)) --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657166847; cv=none; d=zohomail.com; s=zohoarc; b=EypBTZraHMk6MaUlWd9Y6R5rWAEiMx5yVao4K4e86yW6RfLSbPeIUAhL3wHiYsk93lqHrrWg8ovBXoi1XlckKkOzXWcEiQxWVWUKnTkX+kNTrswnUO2It4w+m8RxYdIy0MMRdzyZv6ETL5nI7A6N7ts4YvWgPM37Pj5B8CYZswo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657166847; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9OCzpUY1FBuX8FnWkisjH+FmaFq8eQSHhDzCjN4bwN8=; b=IjXzO3d2QMXt/De2Lpl/9b1cFzo8hWS1fUVOEF0YXo+7wNf2y3lW+5/pT+d+WTeYJ6n3quzOO9elyA/e32IJAJanSBujfwxyME2pU2aM1ZPOORiukmiQBr0VCfUms9p0fIW2L++TmXx+RBnXNwUFLIjB2T6pV4QpfbO4H8IcKd8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657166847989980.3332916071494; Wed, 6 Jul 2022 21:07:27 -0700 (PDT) Received: from localhost ([::1]:33048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9InW-0006zy-UR for importer@patchew.org; Thu, 07 Jul 2022 00:07:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijd-0003dH-KB for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008Dv-HL for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:24 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-500-ILPqodVAMUG4qcU-T--DYQ-1; Thu, 07 Jul 2022 00:03:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 537391C05AC1; Thu, 7 Jul 2022 04:03:15 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id D530218ECB; Thu, 7 Jul 2022 04:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9OCzpUY1FBuX8FnWkisjH+FmaFq8eQSHhDzCjN4bwN8=; b=FhOFfZrlqD2ULztroelPXfrJYqsLakpwSlWBJrlWChAEeNHpzDuJ9Ui7qFNtNhjrSyzyDd xPVuwIjattdbfUzEQpLXhhwsnOIAlCDbmBiXSI0BZwxkj9u+gOO81nrhR4y5XasYyI3O0y L3hJtD26V6QWuj1AxXpisuXYGuxqEhA= X-MC-Unique: ILPqodVAMUG4qcU-T--DYQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 07/13] tests/vm: remove duplicate 'centos' VM test Date: Thu, 7 Jul 2022 00:03:04 -0400 Message-Id: <20220707040310.4163682-8-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657166849507100001 Content-Type: text/plain; charset="utf-8" This is listed twice by accident; we require genisoimage to run the test, so remove the unconditional entry. Signed-off-by: John Snow Reviewed-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a94f0ebf7f1..8d2a164552d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -15,7 +15,7 @@ endif =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -X86_IMAGES :=3D freebsd netbsd openbsd centos fedora haiku.x86_64 +X86_IMAGES :=3D freebsd netbsd openbsd fedora haiku.x86_64 ifneq ($(GENISOIMAGE),) X86_IMAGES +=3D centos ifneq ($(EFI_AARCH64),) --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657166828; cv=none; d=zohomail.com; s=zohoarc; b=hncIqNzFUfrU1LDSt+QcgyfjOmU58rmupHq5RZuZ7i2KbixPnVubsVrgJGpPIM3TemV6F1BVIsEb/KzZoTdB9o9Q/7fEuPDgYeV3ZnXUnxj4hfHh2f+i0dBzBWYcRebQzKbU17Ri04/FKgE/DcM+/Hda/BkKuB20c/r1kFGfk48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657166828; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eRKBQamr/85kyaYuX5mWgzy/vvLNJp/dZKHc2HThgMU=; b=SCEHEac4khzeNte6dH4w9MWXRl2/o82ygJAn3wQ45r/tC03oeeKJHcm9SZ0tPuVbLZrCHDVHsgtV17dCr3PsRcNirfukSi68on80STOhvPtpChql/62Q5zeKqZ1HPaQ+CxXOVPfq4QW8fD/MV6wGxw1fVH4S7bSc3tHAyGU6EVw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16571668281123.4705364035856974; Wed, 6 Jul 2022 21:07:08 -0700 (PDT) Received: from localhost ([::1]:60458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9InC-0006U3-DD for importer@patchew.org; Thu, 07 Jul 2022 00:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijc-0003dE-D6 for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008Dy-Gd for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:22 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-170-WHscINeSOj6yCpbGEmAjnw-1; Thu, 07 Jul 2022 00:03:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D25E6185A7B2; Thu, 7 Jul 2022 04:03:15 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 603D62EF97; Thu, 7 Jul 2022 04:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eRKBQamr/85kyaYuX5mWgzy/vvLNJp/dZKHc2HThgMU=; b=icsIl+U/XdQ4XCoLTfaLK0agtM2gRBe7p1pFdUWn8X9JKZ2PtQxZe6NglOxQIe3vbWRttT 3xCB85b1MSMKkqf8IXNg+59+kPSxTaISzUoJs5ul6l5Q/2xnKY+YLeTkQ43p1avRBdKpxY /sH5k6ilzsqcAzDwLKcgXft2Tnp7Dks= X-MC-Unique: WHscINeSOj6yCpbGEmAjnw-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 08/13] tests/vm: add 1GB extra memory per core Date: Thu, 7 Jul 2022 00:03:05 -0400 Message-Id: <20220707040310.4163682-9-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657166829528100002 Content-Type: text/plain; charset="utf-8" If you try to run a 16 or 32 threaded test, you're going to run out of memory very quickly with qom-test and a few others. Bump the memory limit to try to scale with larger-core machines. Granted, this means that a 16 core processor is going to ask for 16GB, but you *probably* meet that requirement if you have such a machine. 512MB per core didn't seem to be enough to avoid ENOMEM and SIGABRTs in the test cases in practice on a six core machine; so I bumped it up to 1GB which seemed to help. Add this magic in early to the configuration process so that the config file, if provided, can still override it. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/basevm.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7d0413df35..4fd9af10b7f 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -99,6 +99,11 @@ def __init__(self, args, config=3DNone): self._source_path =3D args.source_path # Allow input config to override defaults. self._config =3D DEFAULT_CONFIG.copy() + + # 1GB per core, minimum of 4. This is only a default. + mem =3D max(4, args.jobs) + self._config['memory'] =3D f"{mem}G" + if config !=3D None: self._config.update(config) self.validate_ssh_keys() --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167107; cv=none; d=zohomail.com; s=zohoarc; b=S/vmT+7k5WtDd8uelj7AJm4XJYOJOB2wPuamMLxCS/ZEBRcgAlPPEtM+3L/9S2RZFB9Crrckwe0FSawKJPOrJbR/xCKq2jKdDibNMGJyIn9ToUot6W4wt1ULe5qVrW2oz1KlxPufoNbss4tTZ2FhGwDsBKThx6XSBjTkvoZ1hPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167107; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BlS4nuHDSk+xz/TPcNnNuXIwz7cEjDyk1wvZa0fZC9o=; b=Cdr2gGb50LJQFKX5NIjD3CqwtbHlm6BybUXO+an7yvFuIOEwBii2ApjYw/4NpGk+FVUZP3momkZaVqeehrQpIkWm/jLwqYvdni/oSvyoenAJ9K/pLaVH+DklOfJ/z3bYORnLpXf9R6VL9L36ZklZ3C0G1KidholhR+CK5UJwPNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167107400877.5516181895276; Wed, 6 Jul 2022 21:11:47 -0700 (PDT) Received: from localhost ([::1]:42474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Iri-00051g-Dk for importer@patchew.org; Thu, 07 Jul 2022 00:11:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijg-0003gv-IN for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38058) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ija-0008E7-66 for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:28 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-385-nosgbFuHMDCQMZFYkZVYEA-1; Thu, 07 Jul 2022 00:03:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D7F789C8B9; Thu, 7 Jul 2022 04:03:16 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id E00242EF97; Thu, 7 Jul 2022 04:03:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BlS4nuHDSk+xz/TPcNnNuXIwz7cEjDyk1wvZa0fZC9o=; b=NkeRrrgX0LwfOMAKKa//Ieqpo0dKZZJ2P2ruprmx8i9iYJUCsxKVLm+/4+YJXowWtziM1m UrdHorUjGOm95vuKFyBX4RG/ddBAOSVcwmeqaSOEOBwWAnZPT0iccNfWLJ3gvcaiGrgyQR 2kJZ697A6BiiL90hk9/Lg9d3WGt+1b4= X-MC-Unique: nosgbFuHMDCQMZFYkZVYEA-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 09/13] tests/vm: upgrade Ubuntu 18.04 VM to 20.04 Date: Thu, 7 Jul 2022 00:03:06 -0400 Message-Id: <20220707040310.4163682-10-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167109039100001 Content-Type: text/plain; charset="utf-8" 18.04 has fallen out of our support window, so move ubuntu.aarch64 forward to ubuntu 20.04, which is now our oldest supported Ubuntu release. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/ubuntu.aarch64 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 index fc9c2ce22ff..666947393bd 100755 --- a/tests/vm/ubuntu.aarch64 +++ b/tests/vm/ubuntu.aarch64 @@ -32,13 +32,13 @@ DEFAULT_CONFIG =3D { class UbuntuAarch64VM(ubuntuvm.UbuntuVM): name =3D "ubuntu.aarch64" arch =3D "aarch64" - # NOTE: The Ubuntu 18.04 cloud images are updated weekly. The - # release below has been chosen as the latest at time of writing. - # Using the rolling latest release means the SHA will be wrong - # within a week. - image_name =3D "ubuntu-18.04-server-cloudimg-arm64.img" - image_link =3D "https://cloud-images.ubuntu.com/releases/bionic/releas= e-20220610/" + image_name - image_sha256=3D"0eacc5142238788365576b15f1d0b6f23dda6d3e545ee22f5306af= 7bd6ec47bd" + # NOTE: The Ubuntu 20.04 cloud images are periodically updated. The + # fixed image chosen below is the latest release at time of + # writing. Using a rolling latest instead would mean that the SHA + # would be incorrect at an indeterminate point in the future. + image_name =3D "focal-server-cloudimg-arm64.img" + image_link =3D "https://cloud-images.ubuntu.com/focal/20220615/" + ima= ge_name + image_sha256=3D"95a027336e197debe88c92ff2e554598e23c409139e1e750b71b3b= 820b514832" BUILD_SCRIPT =3D """ set -e; cd $(mktemp -d); --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167497; cv=none; d=zohomail.com; s=zohoarc; b=NBI6Jxs1lZzrzc8ztt8u4s2YJvS1jQbVvW9DDaO7BY1m/txF7AoDwSEqnigB8ZC9qdJUcig4KIo34qzE2A3xkUQ/1tUyBrZ+IY1ZddVNTg7HOLRT0PpVokcN/kt4P4WUgmJL9jg85fcgh+NrKqfTYVBvSulz1IQFziuRXCdmEM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167497; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4+eG9q27lvcFshdYkip0FSqTPvTbmYctfKst4KfhumE=; b=DXhbSX0aRqKBec7xzQ0KKyR/nmiKH5xbjAb1Gb18vxwKZxrAiaW6q1otvkHFKCoG+nTxUwtapPGroWrOIG+EVJinBiq9YO7a7TmnJR8OT0V7HI+kR+pUlrFGEeTomhFdeRUgeHMSypUGbiZkmaIHD8cp0ROpbVMXnymv4100FwQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167497004274.71985066175034; Wed, 6 Jul 2022 21:18:17 -0700 (PDT) Received: from localhost ([::1]:56574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Iy0-0006Je-1T for importer@patchew.org; Thu, 07 Jul 2022 00:18:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijg-0003gu-Ed for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60036) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ija-0008EV-Cy for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:28 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-6dmDMtCOMbS-wFUzUbkZQA-1; Thu, 07 Jul 2022 00:03:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDB9A8339C1; Thu, 7 Jul 2022 04:03:17 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CEA218ECC; Thu, 7 Jul 2022 04:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4+eG9q27lvcFshdYkip0FSqTPvTbmYctfKst4KfhumE=; b=QSA15jCjtVplZkj4ygxEyANjxS0ABVHKQNkE6o4BoGlLg/pz98o3Glm5NUuPKIUPEK/LE5 QYrOul7+CQZ0tgwqF6oBbBNsvabTENOeL20LJfseia9KkHoEOs+IP7fuM7Avbw3LE8cx3b mm3kic8A6MRWLIGpAfU0N06fSZS9pJY= X-MC-Unique: 6dmDMtCOMbS-wFUzUbkZQA-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 10/13] tests/vm: Remove docker cross-compile test from CentOS VM Date: Thu, 7 Jul 2022 00:03:07 -0400 Message-Id: <20220707040310.4163682-11-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167497269100003 Content-Type: text/plain; charset="utf-8" The fedora container has since been split apart, so there's no suitable nearby target that would support "test-mingw" as it requires both x32 and x64 support -- so either fedora-cross-win32 nor fedora-cross-win64 would be truly suitable. Just remove this test as superfluous with our current CI infrastructure. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/centos | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/vm/centos b/tests/vm/centos index 3a527c47b3d..097a9ca14d3 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -28,7 +28,6 @@ class CentosVM(basevm.BaseVM): tar -xf $SRC_ARCHIVE; make docker-test-block@centos8 {verbose} J=3D{jobs} NETWORK=3D1; make docker-test-quick@centos8 {verbose} J=3D{jobs} NETWORK=3D1; - make docker-test-mingw@fedora {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def build_image(self, img): --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167055; cv=none; d=zohomail.com; s=zohoarc; b=bZxm3jR2wTBvL/qAWC+KaHcfCStSnLg0KNyY4gg3r5KQRJMalA6WAYuv+9TILz73Kgvn+ltjLXDOO0IOrNZdt1jW5t0A3qkzf3EGGXAQIzIq+bNTpUIeycAZ74e12o9aYKPhUZHZsNsyPQF3cSCFNIwrG3ly/zfWx8sqUjVIMqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167055; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AMIei2hcuuM+fB0KPCKp5cCbCSDtNxfH8/XKbJiJjMs=; b=UzFaIwCyEtq2S2209W9m7JehUxGYp06xD8UDHYozx/Gh/gLcDZN1HPC9LXyC5WcopuMUfgENLrZuL1U84RMUBQ5gZzOEEGsjfIAiZ6ksGRx4hdsPs3Dk3DIDj92Ot0NbWiu3C8xcu1aYI2cWT1qQ7Aou0/F9v/vMi1JDCfCY+vw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167055882669.3533289811736; Wed, 6 Jul 2022 21:10:55 -0700 (PDT) Received: from localhost ([::1]:40810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9Iqs-0003qu-Ti for importer@patchew.org; Thu, 07 Jul 2022 00:10:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijd-0003dk-Pr for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9IjZ-0008EH-Gz for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:25 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-511-WmcfcITOMjGwQP9q8Ev1qw-1; Thu, 07 Jul 2022 00:03:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B299101A588; Thu, 7 Jul 2022 04:03:18 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0733418ECC; Thu, 7 Jul 2022 04:03:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AMIei2hcuuM+fB0KPCKp5cCbCSDtNxfH8/XKbJiJjMs=; b=chF5jRekMTDOxPjiDbV2lQcHQodUMp6uISZYRQiJ36CMfGeILI0+6+lkymWeHeu+yiqeNb f4D/H414D6U00D1DVFLcBwVluvtH/BimnhVH2AAh24ezGOGNDOxSGTtZh+OoFY9N+GtQ1b +yI+WLQfjNpX78hMAkYAc3xwg+KBGZA= X-MC-Unique: WmcfcITOMjGwQP9q8Ev1qw-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 11/13] tests/qemu-iotests: hotfix for 307, 223 output Date: Thu, 7 Jul 2022 00:03:08 -0400 Message-Id: <20220707040310.4163682-12-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167056765100001 Content-Type: text/plain; charset="utf-8" Do not merge; staged in Hanna's branch. Signed-off-by: John Snow --- tests/qemu-iotests/223.out | 4 ++-- tests/qemu-iotests/307.out | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/223.out b/tests/qemu-iotests/223.out index 06479415312..26fb347c5da 100644 --- a/tests/qemu-iotests/223.out +++ b/tests/qemu-iotests/223.out @@ -93,7 +93,7 @@ exports available: 3 export: 'n2' description: some text size: 4194304 - flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + flags: 0xded ( flush fua trim zeroes df multi cache fast-zero ) min block: 1 opt block: 4096 max block: 33554432 @@ -212,7 +212,7 @@ exports available: 3 export: 'n2' description: some text size: 4194304 - flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + flags: 0xded ( flush fua trim zeroes df multi cache fast-zero ) min block: 1 opt block: 4096 max block: 33554432 diff --git a/tests/qemu-iotests/307.out b/tests/qemu-iotests/307.out index ec8d2be0e0a..390f05d1b78 100644 --- a/tests/qemu-iotests/307.out +++ b/tests/qemu-iotests/307.out @@ -83,7 +83,7 @@ exports available: 2 export: 'export1' description: This is the writable second export size: 67108864 - flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + flags: 0xded ( flush fua trim zeroes df multi cache fast-zero ) min block: XXX opt block: XXX max block: XXX @@ -109,7 +109,7 @@ exports available: 1 export: 'export1' description: This is the writable second export size: 67108864 - flags: 0xced ( flush fua trim zeroes df cache fast-zero ) + flags: 0xded ( flush fua trim zeroes df multi cache fast-zero ) min block: XXX opt block: XXX max block: XXX --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167279; cv=none; d=zohomail.com; s=zohoarc; b=FtsU4V1YEq+BdgywdJ2D8cof303Evaf72nfhIpLplYkhsDl6oGM/uO+oaPfgZBvLwG14MJD0RpBowXSGI5Pe7cG+LjD4ijuYlA1qzMVD0eS1TO2kUJVTLeaQUpxAtcuf/mHwlYWHCqGFOeP97uWjdJuX4XlCE0evMbbDdrT7tNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fCzC0BaFW3gSNThvTiDi2RPUQ/x+scAFMBXUbHK1bS4=; b=JnVNAmZMWxWZegwps9Eyhi0OWBImhw9IddSAIpIhyDt/f0EAcEXgimFUe6HEWQOe1BmzLclmgfWmh2JUUuqlgaEQGizx1G0iUDUJxjbqU9oIgA8kbCc3ky3+dm8/exDhwwSVMasC0+o1mgExX0M/9toVQnMDctiFrZD2HItiTJc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165716727963945.325152055228386; Wed, 6 Jul 2022 21:14:39 -0700 (PDT) Received: from localhost ([::1]:50212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9IuT-0001qZ-TE for importer@patchew.org; Thu, 07 Jul 2022 00:14:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijh-0003h2-RO for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijb-0008J4-KT for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:29 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-156-zxI84UTAPEG0YNRRxP32xA-1; Thu, 07 Jul 2022 00:03:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0675729AB401; Thu, 7 Jul 2022 04:03:19 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8958818ECB; Thu, 7 Jul 2022 04:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fCzC0BaFW3gSNThvTiDi2RPUQ/x+scAFMBXUbHK1bS4=; b=NOAQ85NPu34cWG0ILvwue20ay95xR/jALKebppqd8PTdEc2ZMUOIERLWUuT1EinJkFv5fU QFWku6zzUOQmYdhtTLcLFm6F2aHybc13aqGqownd/+M+40aKz9MW68iCyDihVxuDKCtbV2 t9kNQaAJ6X+Lk0xLawB0Af8T31KROCk= X-MC-Unique: zxI84UTAPEG0YNRRxP32xA-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , John Snow Subject: [PATCH v3 12/13] tests/qemu-iotests: skip 108 when FUSE is not loaded Date: Thu, 7 Jul 2022 00:03:09 -0400 Message-Id: <20220707040310.4163682-13-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167280082100003 Content-Type: text/plain; charset="utf-8" Do not merge: Staged in Hanna's branch. Signed-off-by: John Snow --- tests/qemu-iotests/108 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 index 9e923d6a59f..54e935acf28 100755 --- a/tests/qemu-iotests/108 +++ b/tests/qemu-iotests/108 @@ -60,6 +60,11 @@ if sudo -n losetup &>/dev/null; then else loopdev=3Dfalse =20 + # Check for usable FUSE in the host environment: + if test ! -c "/dev/fuse"; then + _notrun 'No passwordless sudo nor usable /dev/fuse' + fi + # QSD --export fuse will either yield "Parameter 'id' is missing" # or "Invalid parameter 'fuse'", depending on whether there is # FUSE support or not. --=20 2.34.3 From nobody Mon Feb 9 04:31:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657167667; cv=none; d=zohomail.com; s=zohoarc; b=ePze1U05faU2SONdsac6YL5qA5hM4oFSmp84HEAmNU3nSOJHuO8i2fSZKz1lDdLbudyQ+67dp5DBa0nXjJdoH4EIGvfpdO1fKkWic8lU1sOnad55Fh8Y5vnvKJfsaJoygZ/tLvQxtBYFMbtiG1GpyfJhSp1euRltJJISKP64Oho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657167667; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p+RWfE7neJtjY+loDDhgELGrFjYe0lhFyZ0sDk+J0fY=; b=e8h2jxZDfG4ghx81XZGjkN7z+cx011fJloNxQmtlmEoU9c180KYo48svW5kCtg4yyHTxVZHZskvl0IIlYzQznhI1mdh5SXNyhvaNU32wavT74IhlCrjsegkdoVtUrxHQ2+ewNyHVBPhA+VfdNbxuLmYjKpoAnqTgDbVO5V2GNxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657167667607958.0802714915608; Wed, 6 Jul 2022 21:21:07 -0700 (PDT) Received: from localhost ([::1]:59876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9J0k-0000Fh-Fi for importer@patchew.org; Thu, 07 Jul 2022 00:21:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ijg-0003gw-NN for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:56003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9Ija-0008EZ-EN for qemu-devel@nongnu.org; Thu, 07 Jul 2022 00:03:28 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-382-GcS8RSGYPv6-N42a--zFog-1; Thu, 07 Jul 2022 00:03:20 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C2272296A62F; Thu, 7 Jul 2022 04:03:19 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 171452EF97; Thu, 7 Jul 2022 04:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657166601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p+RWfE7neJtjY+loDDhgELGrFjYe0lhFyZ0sDk+J0fY=; b=VQbjwnM0mssyKeSjkn6dqHSruEnVZUd5cN+5jneTVB0+taaJ8emTWcLODdyE2qGSNnSCcx fVOXl045NiSUJwcA2ucFaxAn22tb9dbPFEaTeubRHDfsaeLlyNWn7V4BUTZUwIDfMhte0v OhoSAlunopRUzguZsKxg1aIn0X0C2Hg= X-MC-Unique: GcS8RSGYPv6-N42a--zFog-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Hanna Reitz , Daniel Berrange , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Thomas Huth , Vladimir Sementsov-Ogievskiy , John Snow Subject: [PATCH v3 13/13] iotests: fix copy-before-write for macOS and FreeBSD Date: Thu, 7 Jul 2022 00:03:10 -0400 Message-Id: <20220707040310.4163682-14-jsnow@redhat.com> In-Reply-To: <20220707040310.4163682-1-jsnow@redhat.com> References: <20220707040310.4163682-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657167668689100001 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Do not merge: this is a copy of Vladimir's fix that will be taken in through the iotests tree. Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: John Snow --- tests/qemu-iotests/tests/copy-before-write | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/qemu-iotests/tests/copy-before-write b/tests/qemu-iotest= s/tests/copy-before-write index 16efebbf8f0..56937b9dfff 100755 --- a/tests/qemu-iotests/tests/copy-before-write +++ b/tests/qemu-iotests/tests/copy-before-write @@ -192,6 +192,11 @@ read 1048576/1048576 bytes at offset 0 =20 def test_timeout_break_guest(self): log =3D self.do_cbw_timeout('break-guest-write') + # macOS and FreeBSD tend to represent ETIMEDOUT as + # "Operation timed out", when Linux prefer + # "Connection timed out" + log =3D log.replace('Operation timed out', + 'Connection timed out') self.assertEqual(log, """\ wrote 524288/524288 bytes at offset 0 512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) --=20 2.34.3