From nobody Sun Feb 8 20:35:44 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=1655390061; cv=none; d=zohomail.com; s=zohoarc; b=jnTMoGsmqXXA5IAM5Ctt1wMNWc69JVgoxB63F+qgQvK7LDOnDxY3q1S5rdQZf0rIJZFgImh3ArYlocPvsRcZJS5qvA7nm2upYzs6SZxszBLvwf4Sq3Aeyao5Qrqtx8zaAMVLPl2azqWRdF06p4h4YK1Bkip8TXN5Qkm/OYJJba0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390061; h=Content-Type: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=dvIAdWWPVC6PS5ery4qe80FI/IIRHE71s1pIPXZ/D8k=; b=DCtzhMAaKsszmE1NDhDAgSlqJ+xt7RSZ+yCyNa9CDZ8WXrXeG3JGxdV4YwjxSQMrmeIx91cQim2ztTHU13ycifIr+mBtxCiq5ox67t7PvqMetGfpqshQ4BWIvdEs/rWkzmGh3+QNu7qoiPkCYKTWrDvQFKBnPLKr6ertXqSpPlY= 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 1655390061379973.221341766245; Thu, 16 Jun 2022 07:34:21 -0700 (PDT) Received: from localhost ([::1]:50674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qZc-0008UX-Vn for importer@patchew.org; Thu, 16 Jun 2022 10:34:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSi-00074q-8V for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSg-0008IX-Ja for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:08 -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-493-LZrqgMzdPPempN90R4aiiQ-1; Thu, 16 Jun 2022 10:27:01 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5457C85A583; Thu, 16 Jun 2022 14:27:01 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE11A2027EB4; Thu, 16 Jun 2022 14:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dvIAdWWPVC6PS5ery4qe80FI/IIRHE71s1pIPXZ/D8k=; b=DJ0jgmZM5OhzW/ukV1ZyqKVNfKRzN5/g15UfHit99TNLdfa6PsgicJC0UdzM+vKXj9UsjG 5iJqfvLvfRm2Yan+UDF4x5pZnDF901KbEbwxTo0MCpRnxlgPj62yIsmt6I2pjaT4JEc/IC 0P0eixSuL+CBYKKuTdjKhJGayhDRtwk= X-MC-Unique: LZrqgMzdPPempN90R4aiiQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 01/10] tests/qemu-iotests: hotfix for 307, 223 output Date: Thu, 16 Jun 2022 10:26:50 -0400 Message-Id: <20220616142659.3184115-2-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390063931100001 Fixes: 58a6fdcc Signed-off-by: John Snow Tested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Hanna Reitz --- 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 Sun Feb 8 20:35:44 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=1655390527; cv=none; d=zohomail.com; s=zohoarc; b=azSECJ1dEgxLfUg9EjVpIf2Xx6YWa0VS1wS0naiRjWbd+u2+YfsHKHm/h5sx1i7d+aqoPCd51JzB8qcMCIskRlk0qiB/lUSLo5a6DfPTM4i5H+MzhNv0wNFKgUeMwLMT89gfVq4d/cDi6AAWN+veuBWLBc2QF1YzD5Y+L3B4gcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390527; 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=B+WeHfPtE/vntl5/4VfZkYtsV1NjrUxcUHeUAyVfzCs=; b=gDh1PiK295nKCMraFyWq9sxG2VygHrVVbIHTGOMFY/2o/sjg81KOMGW9Ws+TGo36W3oKcS1td+AUR2cLhi8pKPpEO+/gnV1YwgsxNVNDMC0Hi5ZIRAOkxIRpEBJi7nlfESOsrh+Y3UlJljBuM3Np/nFVfkE11AQ61JtZHxjBeoE= 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 1655390527453770.6337383488661; Thu, 16 Jun 2022 07:42:07 -0700 (PDT) Received: from localhost ([::1]:34228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qhC-0000C2-F3 for importer@patchew.org; Thu, 16 Jun 2022 10:42:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSj-000793-HV for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSh-0008Iu-22 for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:09 -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-136-RFtK5_ILP6WvihqZ_sFT2A-1; Thu, 16 Jun 2022 10:27:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC9901C07830; Thu, 16 Jun 2022 14:27:01 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61B0E2024CB6; Thu, 16 Jun 2022 14:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389626; 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=B+WeHfPtE/vntl5/4VfZkYtsV1NjrUxcUHeUAyVfzCs=; b=FLWwBGPENuF2hCQ20vpkLqELdZVEeCbxPPvSY614eXkIgihvA6knyZSjoAUhkridXVVfpU kHJstXlZeeMNjkqFtU7MpctsI3IXQux705h8RDkKkiM+OBN/C8R/hjyS+Z07Cv3Zf0zDWy eFGF/rwD3joHiaQTT75D5L31W1hNd90= X-MC-Unique: RFtK5_ILP6WvihqZ_sFT2A-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 02/10] tests/qemu-iotests: skip 108 when FUSE is not loaded Date: Thu, 16 Jun 2022 10:26:51 -0400 Message-Id: <20220616142659.3184115-3-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390528580100001 Content-Type: text/plain; charset="utf-8" In certain container environments we may not have FUSE at all, so skip the test in this circumstance too. Signed-off-by: John Snow Reviewed-by: Hanna Reitz Reviewed-by: Thomas Huth --- 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 Sun Feb 8 20:35:44 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=1655389738; cv=none; d=zohomail.com; s=zohoarc; b=lgpsZ5hgmLKuaVsUAqJ0Hh2nTE1hpQYINut72J4ksH+K6rnU6/tD5ie26v77QFEbCcpP+MbSmA1yhMCYuIrTzTsIgqfg/lBh62UcZZ+HN+msVXbcb5RtACqfS98fqKlNMcuIZExYIw58m0w0nJQjGArMiOS+xoE/c1UlxBf7IcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655389738; 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=yOldU7HXmr3cSUL6y0DdrpnBSZFJz1ROhO5R9+jqjJQ=; b=VsWhCtZdn/XyJHBbnsALho5Nciz5AQLdC52pyWxWTzMTJK3NujwF6bTQyusGPe6Zgw0RpkYMJzH9SgZ+eJ3dXeRG+d0tD9Jh6tNZukfgAvhBxws5rrzWSQQNqLlpFS9to1m44yUgdXboimoTlSpRnOjpxSHhN6bZIF9IZ2lIEv8= 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 1655389738602968.575950636814; Thu, 16 Jun 2022 07:28:58 -0700 (PDT) Received: from localhost ([::1]:40892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qUT-0001WG-9R for importer@patchew.org; Thu, 16 Jun 2022 10:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSj-000778-1r for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21352) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSh-0008Io-0H for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:08 -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-397-Gb8YCjGDNca7riC3u5PW8Q-1; Thu, 16 Jun 2022 10:27:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50A06383328A; Thu, 16 Jun 2022 14:27:02 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA5052027EB4; Thu, 16 Jun 2022 14:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389626; 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=yOldU7HXmr3cSUL6y0DdrpnBSZFJz1ROhO5R9+jqjJQ=; b=LXtnuKpRJkGzc/A/fEO5c83Ga+BnxoPKdxXRzaWvJ8s1est+dsJTXcrmqyevZ2wqtTS58Y 91vlmujlQxCMNSUy+PZ2qb6BYvlArZ7W55jas05CiMdMr7MGdcuMCv/7OH93FEb9j8ZHXi MFYB/VLAbrrivh4WyTMs/kndWcK52tg= X-MC-Unique: Gb8YCjGDNca7riC3u5PW8Q-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 03/10] qga: treat get-guest-fsinfo as "best effort" Date: Thu, 16 Jun 2022 10:26:52 -0400 Message-Id: <20220616142659.3184115-4-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655389740112100001 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 could not 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 --- qga/commands-posix.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 0469dc409d4..5989d4dca9d 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1207,7 +1207,13 @@ 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= . */ + fprintf(stderr, "realpath(%s) returned NULL/ENOENT\n", devpath= ); + fs->name =3D g_strdup("??\?-ENOENT"); + } else { + error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); + } return; } =20 --=20 2.34.3 From nobody Sun Feb 8 20:35:44 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=1655389754; cv=none; d=zohomail.com; s=zohoarc; b=NY29Op2gu8DZuYXKjoBwvyH14UP5goH6d/MsJ80DwII0vksLWIIFdr63FOCMWvAOQFsBCkDbHeygyFXmDTUqPw3hHGI6ybR5k/gakjLndJfUAYmbAAsqE7i1NkQ0GqlwjxX5Au4xMk7nMuFHdvfw3LWEbCadBTk0lgtsPyxaynw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655389754; 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=G6tMKijyAuyp5B5P+m2RJAudQVxyXyybi6mn44J3pMBtLaFDkaJ1P1hOoQ2lgGFzBDhEJrvYsBfG+pk0fCojawO9aaP3QDyM/PdbH8SBDxwSbotdUhfw0x+SrOjx2NAqZKL9ANRDOeOg9ysFoyWP4G5eQ9PP1II7eH2Na/Hzp4w= 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 1655389754632732.347358892328; Thu, 16 Jun 2022 07:29:14 -0700 (PDT) Received: from localhost ([::1]:41360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qUj-0001pT-C2 for importer@patchew.org; Thu, 16 Jun 2022 10:29:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSh-00073c-5T for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30948) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSf-0008HZ-2v for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:06 -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-12-hBMNqepqN06XaphDyjwWPg-1; Thu, 16 Jun 2022 10:27:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CEC6C101E988; Thu, 16 Jun 2022 14:27:02 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 605392024CB6; Thu, 16 Jun 2022 14:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389624; 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=IVoQ8eXUYKNpRrfnjYDVIrJka9ikzX9VHHOT2gUmsnSXerwoGDGqKMmvd1CQXuJJ0sVkcC t6VqzPiBhaTIRw4oprDEt7ZA+3a6J149JEZJZBI6jPPtBPetYoRkoWd7GOMhN6+2YxEg/S b5Is8+TGO6CsC/D1VCgeczrh0UWXG8Q= X-MC-Unique: hBMNqepqN06XaphDyjwWPg-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 04/10] tests/vm: use 'cp' instead of 'ln' for temporary vm images Date: Thu, 16 Jun 2022 10:26:53 -0400 Message-Id: <20220616142659.3184115-5-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655389756056100001 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 --- 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 Sun Feb 8 20:35:44 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=1655390121; cv=none; d=zohomail.com; s=zohoarc; b=WEo3cqPNurQyb/dS3h+X4fs8RZ//rer4skZ5i8vkUJxGjCAvUVNwciY2mrs2FMIh3/DtKH/WxQAG72Q/zFRSBr84KLHs9e9rcAZ1+mAXK8/Nz9HeC8tKohmvMbW+pUdhLe8L0F1/YG4gClBkHkZymIzf+AVZooGHa9Nl4DDv6V8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390121; 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=nY2MDk6BzFjWY/6uEPBTJebGecNouwmHSHdFjYXnELPA58aNP9BaqR1bIRxcGW2VvBLTzUtzv3tfq26wwY6LZka1tTv7dbYMaGevD9i4zhjo7sXPZqKjXNNVZsPRS3aXIk9uvwdLhOVVtSlutP5DkI0pCdB5ykcS0oKzO9h91e0= 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 1655390121234957.475631279333; Thu, 16 Jun 2022 07:35:21 -0700 (PDT) Received: from localhost ([::1]:52752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qae-0001fu-0U for importer@patchew.org; Thu, 16 Jun 2022 10:35:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSl-0007EC-NN for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSj-0008LK-Dj for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:11 -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-232-X56zZbI1NMiRmqplHhWBPg-1; Thu, 16 Jun 2022 10:27:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 606968339A2; Thu, 16 Jun 2022 14:27:03 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBEDF2027EB4; Thu, 16 Jun 2022 14:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389628; 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=bAJm1H/mYu5ni+Zyqdil0eKAxHl5UaRnQ11e48KVZgk/Bvw5cWFkbfwuLyZkjvF5f1f720 TUBoJw2N4cWTr8o/BBofZVh5CjQ9OzlyY9gsScC0U5vbICHPDdlwSGPW/DccNIPDL9qb7y N92aQRnAsqA8QKBYBvBuSHnvRF9RDEo= X-MC-Unique: X56zZbI1NMiRmqplHhWBPg-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 05/10] tests/vm: switch CentOS 8 to CentOS 8 Stream Date: Thu, 16 Jun 2022 10:26:54 -0400 Message-Id: <20220616142659.3184115-6-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390122283100001 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 --- 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 Sun Feb 8 20:35:44 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=1655390329; cv=none; d=zohomail.com; s=zohoarc; b=diM58LIm3tnNeqG7ApnGwRnI9mfXUaYe4lTgcOnc2Kp8aZkmMu7V8H91BjakhBy5GEDYsQm9fCh0LiGV+gVldYoU4nWiWUAnMU2/igIPcWtcTZpuk0oTfkWdECs7I7QNxpL6EXJ6VM9k7i70CytkbCY1UxmnTaNgZDwMTFiLUow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390329; 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=mYpIaOBNhbMdhCWQ4DgYkE/J8tHxsf8vKRrXsuuirj12OuCf1kOMJWWyX8hH8Hy7gAoORtycNrNYz7S46NtBtl7E4JYyWYeLwUmP81LgItt+nW4m8DD9yu8kmjtdZaoMy9MahWOD7jUwOC0lvcq6MttuUjkrh4qZVqrxvPAFKV0= 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 1655390329334684.2955113865296; Thu, 16 Jun 2022 07:38:49 -0700 (PDT) Received: from localhost ([::1]:57188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qdy-0004fy-J9 for importer@patchew.org; Thu, 16 Jun 2022 10:38:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSi-00076q-V3 for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:23015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSg-0008IC-4L for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:08 -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-223-y1yCKI5DMIKHMwZb5JI1hA-1; Thu, 16 Jun 2022 10:27:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E0BDE3C10227; Thu, 16 Jun 2022 14:27:03 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7063D2024CB6; Thu, 16 Jun 2022 14:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389625; 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=RD/vfw5pJ3y/PO/F93IqGoujlm6Zgc237nI0NF2HV9ITc8X0wv7WkRQtFWyb8A/l2ycomN Sz15GoWw+1MsJNaFFcjwpnqHu5YraKHe3b7sezKT92TXzFnlKMOqKfrmmk5pKhGeQ277yX RdPHmgcMiOadqhynDbiQce+CxA9VFrQ= X-MC-Unique: y1yCKI5DMIKHMwZb5JI1hA-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 06/10] tests/vm: switch centos.aarch64 to CentOS 8 Stream Date: Thu, 16 Jun 2022 10:26:55 -0400 Message-Id: <20220616142659.3184115-7-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390331410100001 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 --- 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 Sun Feb 8 20:35:44 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=1655390679; cv=none; d=zohomail.com; s=zohoarc; b=BvINYpVjpot96HktonKTX5nFxWmVrJXGW8ssC7tWTSPZ2kkUGLGGya7cXX2vBX1LFlGtJICdJHu7vyL/KhMMhxndm7XJuxFofXt3uJEYW0cNgm46JBff22CTTenS9ATMHDl0eYCgN0szNgD6ura7ot4oPg9ttbPT0yz3iP+1r9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390679; 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=cu/CGohzvVkR7AbYBIfSTwQ8or0vTs17zNmaLedZDa6mjAQkxFOBF3vEw2YcU6x0Li+S32B9DYLqGoZvRXPemldDAVerxayPFQHRUy66n00DX76pMmXXLxtxdy9XUrMOZyWJmsEVefz24XwqzmyLm9itNwBXy+SEbHZ30Jprcnc= 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 1655390679660162.7753929907651; Thu, 16 Jun 2022 07:44:39 -0700 (PDT) Received: from localhost ([::1]:36566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qjd-0001tH-H5 for importer@patchew.org; Thu, 16 Jun 2022 10:44:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSk-0007BJ-Bo for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSi-0008KQ-GH for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:10 -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-205-1HUyc34wOTa_gMigWoDpWA-1; Thu, 16 Jun 2022 10:27:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 635073C10229; Thu, 16 Jun 2022 14:27:04 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED5472024CB6; Thu, 16 Jun 2022 14:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389627; 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=Rs2zDz0mEr9n+Nv8pMDLd6P2LsqelF0cRl9X9iyOoP+iExd6IxhzV8CxPRloUdzsA8J1LB al3T3Nzn+LeSS2AK+pKV6b0hIk6cHjoqiPbahNxzwqgt7QKEXIaq+eAiWDRO0jbDRiuPUb AeXdYL0KFicaSudocpZAOXrEoL1sM4I= X-MC-Unique: 1HUyc34wOTa_gMigWoDpWA-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 07/10] tests/vm: update sha256sum for ubuntu.aarch64 Date: Thu, 16 Jun 2022 10:26:56 -0400 Message-Id: <20220616142659.3184115-8-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390681243100001 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 --- 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 Sun Feb 8 20:35:44 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=1655389775; cv=none; d=zohomail.com; s=zohoarc; b=XeEC0UZpuC5Zu01tZkgBIunH8oav2SWUJrm6f864WTfZC0P2Y1+VJwMYIIQJcOAQVP741qVFr9BGex3bm272rpavKAvLUDl19dwqi/lCbLc09Z3pSIEbGPUQ356ERi9VVTo6Nsvr3bhShcgxsZhWvYO/UAopmKimPrxEjkHYxjU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655389775; 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=agRPGQFE77PZQEzTEM+AlrV0u0HxB3OOHAHNOat9e0k=; b=WCGVkPBJJn4gWXz2CFiqLpnw9Uu9WtgRIjfgHkB9BogwuA8naAHbBJ7bEBXeh/rbLWgd8WjoxPi8pUkUoG6VSCIWnLh05YIlPl5DXCPvw+34nqLONHoAex5eSHJSUa5GZzDnLsDpgwaRWgZ9RVs1AUrTztKRw08pW8JjTnlT/Ns= 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 1655389775429661.8537122710062; Thu, 16 Jun 2022 07:29:35 -0700 (PDT) Received: from localhost ([::1]:41646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qV4-00021k-C1 for importer@patchew.org; Thu, 16 Jun 2022 10:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSl-0007Bp-30 for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSj-0008Ko-3x for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:10 -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-288-mEBvJdhIOWKEaLPDVYh7Ag-1; Thu, 16 Jun 2022 10:27:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DC70785A584; Thu, 16 Jun 2022 14:27:04 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7090D2027EB4; Thu, 16 Jun 2022 14:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389628; 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=agRPGQFE77PZQEzTEM+AlrV0u0HxB3OOHAHNOat9e0k=; b=FMHOr9hAW/vWue9eZUCixtTKj0mlb2c80rE79FB1CJ1ZZ948lsE/pZezFv++IQYHWWWjWX B2OlaVvfJ+/+xv5dc5mIizQYPKYMJ9+DA1egqHsMQdlcaQ3vNt8gpGGx8Ib17RWJEvqvw7 dki39DBSjTofTraX7XUqJaPW5lXDxac= X-MC-Unique: mEBvJdhIOWKEaLPDVYh7Ag-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 08/10] tests/vm: remove ubuntu.i386 VM test Date: Thu, 16 Jun 2022 10:26:57 -0400 Message-Id: <20220616142659.3184115-9-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655389776253100001 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 --- 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 588bc999cc9..70eee2510c6 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -8,7 +8,7 @@ EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch6= 4-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 @@ -39,7 +39,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 Sun Feb 8 20:35:44 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=1655390036; cv=none; d=zohomail.com; s=zohoarc; b=QsMUuNUUkyMGqoCWlZ4DS+FZafwNYamQsHQ3j7f+Mg0/7VCF0usuVIl0wDbkK0HQBnvRgsf+JkyqlZgrl8HL7Lx5bggm7rfSfkv/uL4Eo/BXRs58c9/0upcnVSlxdNLxgKm6sAoZFfQ27rZ0akLSGFMQ/g4xA1tqpltAhTD8obw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390036; 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=LPZvk7PBU+lMG2z0pT88Zo4Y3iVMywqiB7GBKXIy/nc=; b=MacnZVbiZSI2qa2+Uq6i6gd57mtlU80NHXcuMPF5aCDH8CvT0icuSZVVIge8P71ht+CCNkQdDOEOkBKbFrja5aC5t9ucnhzhVrcSMTcXhrUhpkmVaI1AivJ2nchGeKyf/xKsoWcMyaKHijp4gk35m5WhUYm70zLLUoULQhhy+cI= 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 1655390036170468.20082418071104; Thu, 16 Jun 2022 07:33:56 -0700 (PDT) Received: from localhost ([::1]:50082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qZH-00084e-4E for importer@patchew.org; Thu, 16 Jun 2022 10:33:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSs-0007aO-Nf for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSr-0008N2-90 for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:18 -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-147-5rvN6uysNf2aBQyca1vyag-1; Thu, 16 Jun 2022 10:27:05 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 790EB3C10221; Thu, 16 Jun 2022 14:27:05 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id F014D2024CB6; Thu, 16 Jun 2022 14:27:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389636; 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=LPZvk7PBU+lMG2z0pT88Zo4Y3iVMywqiB7GBKXIy/nc=; b=MmtEG0jZ2qGHN7yn82TzlqIPo6LLmpaQM5b9M65QVai3mIpYgsFgYeozw/oKRHymlbktux KkHbNffn7A568/XugU7z+EsX3LRp8Dgweu3Ce7pxoQdN5fRC7/LHsTWkAXoprUYboCGHpS w1amj83S3TbOVqt5zEuRILhv1PBh5f4= X-MC-Unique: 5rvN6uysNf2aBQyca1vyag-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 09/10] tests/vm: remove duplicate 'centos' VM test Date: Thu, 16 Jun 2022 10:26:58 -0400 Message-Id: <20220616142659.3184115-10-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390037799100001 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 --- 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 70eee2510c6..f3b7a9d299d 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -6,7 +6,7 @@ HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =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 Sun Feb 8 20:35:44 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=1655390259; cv=none; d=zohomail.com; s=zohoarc; b=fizys6SEn0ihYwRFl/X3oUa/AOUHPrXy1dPXu02b4sTaKL9nGXjo1DcvsA/prEVz8p8QKgl8GhZEIDJfqN4lNjDoMwCSGI5Rma6S8p/++IDze7n55SawJ10aPin/FlYt+mLpVjOjUJnh5BJ2J53pSJpf2J2ZR5u5HzI1ZpqhLcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655390259; 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=PnvBQgVfSEEBkwYFoj+TsRXzrJoZSeRlZ1fKUirKNzE=; b=eJQVg1TS7u+nDZPET9Py5MdenB2a2pqP//q21WEtdbK8i5XkZFQBzqLVu5Im4uPYO3zMrTsyRt3c7PC0uRHxFNZC8320nIfBv2s7oDV/r97Y6H2cWLWWNGZzYI/QZhB9lYrWqoUVBKA3sk++UxCKU5ZJ1GuELOxUQwXz4WDz6nc= 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 16553902599611005.5776505562661; Thu, 16 Jun 2022 07:37:39 -0700 (PDT) Received: from localhost ([::1]:56696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1qcs-0004Km-R9 for importer@patchew.org; Thu, 16 Jun 2022 10:37:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSt-0007e3-ON for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1qSk-0008Li-BT for qemu-devel@nongnu.org; Thu, 16 Jun 2022 10:27:19 -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-533-eUdgqtqnPdaHxzpOMxIkDg-1; Thu, 16 Jun 2022 10:27:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F285B3C1022A; Thu, 16 Jun 2022 14:27:05 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.34.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85E0E2024CB6; Thu, 16 Jun 2022 14:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655389629; 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=PnvBQgVfSEEBkwYFoj+TsRXzrJoZSeRlZ1fKUirKNzE=; b=WbP7ceM0qmwAId6Hvzg2oR8RhusmYK1K0RpQcXAhv27bRp7mnC+MQ8PCy8bP+0IGRqgAzm o6B1HFNeMtDClx+DOrUjVVfgwgpBWFR1uRf/7KZMfHvVwHNwH10Z1Olkn8f8GaPu0My/XZ qgdPVOecCW1PVtsZ2TWflh3xoqmuIcQ= X-MC-Unique: eUdgqtqnPdaHxzpOMxIkDg-1 From: John Snow To: qemu-devel@nongnu.org Cc: Beraldo Leal , qemu-block@nongnu.org, Hanna Reitz , Wainer dos Santos Moschetta , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Kevin Wolf , Daniel Berrange , Michael Roth , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , John Snow Subject: [PATCH v2 10/10] tests/vm: add 512MB extra memory per core Date: Thu, 16 Jun 2022 10:26:59 -0400 Message-Id: <20220616142659.3184115-11-jsnow@redhat.com> In-Reply-To: <20220616142659.3184115-1-jsnow@redhat.com> References: <20220616142659.3184115-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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: -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: 1655390260937100001 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. 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 --- tests/vm/basevm.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7d0413df35..69200ca5f1e 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -99,6 +99,12 @@ 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() + + if args.jobs and args.jobs > 4: + # Add a gig per every 2 jobs over 4 + overage =3D (args.jobs - 4) // 2 + self._config['memory'] =3D f"{4 + overage}G" + if config !=3D None: self._config.update(config) self.validate_ssh_keys() --=20 2.34.3