From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593611916; cv=none; d=zohomail.com; s=zohoarc; b=WixftSjr4gOu0XE5G5Kudhaxeki0nI8BJocbzAGe6OdV9Ws8LbhECAoJVWZArno6aR1d0bu79GUijWf27XoMWBsvrvXfS0Z13B3M7lCAtL29GohsoEc0TQ2oeXLtCvOE0d/nWDLIhTmp68Gv25V47WMM81+scVVT99Yuv52vvjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593611916; 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=+TAlbHIsXZGW5UODRkH4obAQs4koVX0V9BG/gRdLybw=; b=dDMkyGlsbcM3ijl2CtwAA01qap776xOn1GhtF04yUlpUPyOpuXGBvMp8oHo0GuTBrDhUArSmMCoVBWFupZ3MOSbAnvRy5V9eZ8fWCcGG2I30YzOtojr4n4FQRDqkEg4+EGWYKkLfBxtsoc7pEZqpFneAzkLO2C/RlEuA5SEJDt0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159361191619637.195513441122785; Wed, 1 Jul 2020 06:58:36 -0700 (PDT) Received: from localhost ([::1]:58932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdFy-0003yH-SL for importer@patchew.org; Wed, 01 Jul 2020 09:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdET-00028v-2k for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:01 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdER-0005oi-Fz for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:00 -0400 Received: by mail-wr1-x443.google.com with SMTP id o11so23962721wrv.9 for ; Wed, 01 Jul 2020 06:56:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v18sm7914893wrv.49.2020.07.01.06.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:56:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ECC7A1FF87; Wed, 1 Jul 2020 14:56:52 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+TAlbHIsXZGW5UODRkH4obAQs4koVX0V9BG/gRdLybw=; b=y09k1vHUBlQF6ueTAew75bX5pYxYqt0PC9MgykKFtA/gJVlmKc7nDYFKeo1XfNNRPs 3iLZezc0+CT+/fyIz2Ohh5FF3Qh3xJdvO0O+6MbhETkDFBKFoJZrbjI9RRkwTMOfhk0r V3SO4T/AuhMj1XxRjcQKx67mMUO8PmZMn7xDi/zJR/rhJWCAb7SPYfP5tS1nvh8zQ65W 4dxM5hT9LbWkNxeaOqWIKDcDcPDlkeJ2zb/HBe1Xi9zULkpx6mbl4t6SxNHQtV0BWul5 kRYnsAodSJA8nXSKPvR8baXcvJGKya3r+PJYMEkAM45sGklUwNIytfTbL/OpVICZTdv7 y81Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+TAlbHIsXZGW5UODRkH4obAQs4koVX0V9BG/gRdLybw=; b=DSR0X8SsXzOs3nuHIZFuqSKxAiELDv9yOtS2uipBRACn3msc6PHdsyIUBpyOFhbDDs z4cCM64a1ZY5cQ7ZntArSUT/Pt/NSKb4Yt742qkRA0593c1H0KPlsGgitxJaNhDHZFXN GW6nIkEH1cPIJrdrA3c35SseYOXOOpefBI54PF3DqWkYr/ha4pBknVMM0VqzV9FImFD6 AnIj+GSU9W2VpJO/OOPTLSuH8GhbmCdDpHsDmddnd49D3rK/ZvTqF+NM55grEdWVITgq 31czWVPd6BacR7eCTieUunbnzFgxOOWWooCYf1ZxKrCpTIZF2NvT8VAb8YAQxhoTUOqT r0cw== X-Gm-Message-State: AOAM530tXEuDpHpuIkjGO6xdhQ+OdV0xHB7WNJtQB1yaWgFUR8yvOzLP JLdRYHokwJiWiNVg3jnkopEfKA== X-Google-Smtp-Source: ABdhPJzLiB4X3i0qDIl00ICcftlAoLeJuOPbYzJXhxSE5gi26UBKqyyzv2WvfhcZ4qeblUN6hPeyxA== X-Received: by 2002:a5d:4051:: with SMTP id w17mr25745216wrp.183.1593611818079; Wed, 01 Jul 2020 06:56:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 01/40] hw/isa: check for current_cpu before generating IRQ Date: Wed, 1 Jul 2020 14:56:13 +0100 Message-Id: <20200701135652.1366-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, Bug 1878645 <1878645@bugs.launchpad.net>, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It's possible to trigger this function from qtest/monitor at which point current_cpu won't point at the right place. Check it and fall back to first_cpu if it's NULL. Signed-off-by: Alex Benn=C3=A9e Cc: Bug 1878645 <1878645@bugs.launchpad.net> --- hw/isa/lpc_ich9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index cd6e169d47a..791c878eb0b 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -439,7 +439,7 @@ static void ich9_apm_ctrl_changed(uint32_t val, void *a= rg) cpu_interrupt(cs, CPU_INTERRUPT_SMI); } } else { - cpu_interrupt(current_cpu, CPU_INTERRUPT_SMI); + cpu_interrupt(current_cpu ? current_cpu : first_cpu, CPU_INTER= RUPT_SMI); } } } --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612051; cv=none; d=zohomail.com; s=zohoarc; b=hWgRJDQ8yIeAxJh1oIoiYQBssi5egYlvRBfmtD9pm6R9VY0iNIN6yFxsSx+KLS/b3XuSdBYKJHRZueznQ+qoN+4sqp8XkCF10X7OXeDXPbWiqlnXks1ejpz7VNJlMCnTQY2/AZHRZz32ceypVs2BDIl/69ijgGjRdcNB2AXiUHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612051; 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=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=fx+WH4wdwebPEB4skOHlpWp2XMZcrKz9PoRy79MMJ9OToKskGS9fJxSzpa9fGYFD7HLlH+M6BvnKfDJu3sh1gSn7Og4D6LQb4B81CoxueSYREi8GgCKQQm92Tsmdlc37HhQ2MlvMJ2L/XXOJXtaEJvm/748QA3yA4mocg39aAyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612051181494.53030129778665; Wed, 1 Jul 2020 07:00:51 -0700 (PDT) Received: from localhost ([::1]:38842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdI6-0007Vr-5P for importer@patchew.org; Wed, 01 Jul 2020 10:00:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdES-00028H-CS for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:00 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEQ-0005oP-MT for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id h5so23945925wrc.7 for ; Wed, 01 Jul 2020 06:56:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v24sm9082410wrd.92.2020.07.01.06.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:56:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0D3341FF8C; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=fGXJWryQ2lB2psc9eeFMRSIN3DKGiQetKXI7zlHAk6i90uos8tgDmFBc3E2OOmEc7w m+ogh+EBgA1bYyzlxWR4aZlFLHcUNvdDlpMpQs/Z1p/W6cIsNFR6dcX+mj9ilrCHkTtB l8xb4VoyPkZC1SVe8n10Y4y8bIaPOXsn+htsf5NruypcjVGvxf6idP3wWN7GD3nj3ZPs sBntT076sltLoBv8pAfsxcLosKg6tCnvHBPvgxRv9PalLwS1ioTbJpTLkrOrVk27VpPT 8U/wg/AaGzO815ER6H+NqhaPhRCjzk43k+03egQpvTupMgMkLzbDN2LQowvagd5+Au5L UQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KLxxBVgESg8+q++r/+fvnKLfCmcpFTynVpvVjZzQTYc=; b=OvU02tgZblIcuAV2iobvr2+sS633RHUVV5rgNK6OxnH2UOdL7kDm3g9j8N1EkB9TOI Lb/KGLQUTMBpHUduF4IvW8n+RbLWaNK6AjMTgRS7ZP8ZBcC4K+rw+gXIGOMi8bu3ode1 IcVe7bz4YVEZXrrtyZChvi41TUVr95vDPNlRURWTQ+f8iBKSST+Hg4p8wRYZnvt5YzEm /ac+aPi6F7AYGdw2HNmPk8jw15bsB20SirpJ0HlFEvuYOruzPCglKZseqTqBcO+hHdIw 21okgcvc/GWCEpC/frSVyX1h7i23jqWhdOo6nHE0dW1rewXFkDwnugwx+u8+94sqCBzl UV3w== X-Gm-Message-State: AOAM532bGmXrF+TbBxUXeuyol2vzY3HIE4FhTEuqQt9dV4ZblQyQgYWk VoX4CBuiuAkqQl5Q+vijNg1Lcg== X-Google-Smtp-Source: ABdhPJxNFvD93CDJv9jpFM+fRtRLAjhfL+HLRwR7w9yda627AY2LRi5zK6K7WOynVOs4rtNns7hoZw== X-Received: by 2002:a5d:4bd2:: with SMTP id l18mr26230996wrt.119.1593611817031; Wed, 01 Jul 2020 06:56:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 02/40] iotests: Fix 051 output after qdev_init_nofail() removal Date: Wed, 1 Jul 2020 14:56:14 +0100 Message-Id: <20200701135652.1366-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Kevin Wolf , Thomas Huth , berrange@redhat.com, "open list:Block layer core" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , cota@braap.org, John Snow , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Commit 96927c744 replaced qdev_init_nofail() call by isa_realize_and_unref() which has a different error message. Update the test output accordingly. Gitlab CI error after merging b77b5b3dc7: https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375 Reported-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20200616154949.6586-1-philmd@redhat.com> --- tests/qemu-iotests/051.pc.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 0ea80d35f0e..da8ad871876 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -142,7 +142,7 @@ QEMU X.Y.Z monitor - type 'help' for more information =20 Testing: -drive if=3Dide QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs med= ia, but drive is empty +(qemu) QEMU_PROG: Device needs media, but drive is empty =20 Testing: -drive if=3Dvirtio QEMU X.Y.Z monitor - type 'help' for more information @@ -214,7 +214,7 @@ QEMU X.Y.Z monitor - type 'help' for more information =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dide,readonly=3Don QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is re= ad-only +(qemu) QEMU_PROG: Block node is read-only =20 Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dvirtio,readonly=3Don QEMU X.Y.Z monitor - type 'help' for more information --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593611913; cv=none; d=zohomail.com; s=zohoarc; b=FESUjfOGz3QmTknwq/uS5hpON3/fuqkLWxRMUlWUkAMzVXH4Tt/L6YOqBBZFrj84UtDX+1GkRdeoKsID5awmhQkpqb8hWHGL+2ZmZHthrGokH/5oKsSJdCp3Lpo0JsPwtHhVFpwsUqqvIxts/va/e6oTDaRqh2961hlT9oLHXHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593611913; 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=o9fzqGYWOKLSCCS48dXnjjFGr8lTIeZq2AiEKkz+F/8=; b=UAnuz358SEz749nyBat4BftuTw7+2pZjuu31tb+Vt48lexVpHGIzQMLYNAhW4c1pKjfXO+LjHbzMnWlUgMkCnS2jHSnkA5K4QAyPA6zBd+MNffgtgO0ZsGPijTUVngV6zj7xj3Nt0ZWnTTv0mSunsSLPqZeBXcN9uLmItre0x0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593611913255281.617573372562; Wed, 1 Jul 2020 06:58:33 -0700 (PDT) Received: from localhost ([::1]:58662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdFv-0003rg-FD for importer@patchew.org; Wed, 01 Jul 2020 09:58:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdER-00027u-5m for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:56:59 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:52898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEP-0005oA-DV for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:56:58 -0400 Received: by mail-wm1-x32f.google.com with SMTP id q15so22525715wmj.2 for ; Wed, 01 Jul 2020 06:56:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 33sm7781948wri.16.2020.07.01.06.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:56:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2264E1FF8F; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o9fzqGYWOKLSCCS48dXnjjFGr8lTIeZq2AiEKkz+F/8=; b=FFktANPMP1gm56eJM7vU0gICRUYK+rOS9MRo4BtozhbdvJOnEuRaCqUB4lIc5skdkE +YwdLD9Xq6absutuPfYPpaTiMIeV/KYrqreKfP0dc9mCi3+pI2SlbrY6Xg05qua5BzJA kZGmjnopSBlr0PFgwWjUqv6JdsKwsNb7V/l1xt0DbX1w6SiuDGxpWf9/i/62CJY67SvL aw1i6pSppiu/226mV9mrjW+FYTEkFZ8TCNV1c8avjJSbquKbdKlaoDfoSk5KRzf+MwPa 841eF9hjogCuFDddcopaKgDj2YiIUN8kGdXY1pPt0j756ZR4j2HB3rKkLYrHzaJcJcTn TUZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o9fzqGYWOKLSCCS48dXnjjFGr8lTIeZq2AiEKkz+F/8=; b=ePFExLDemzLtk5bGKFdGeqyfTMaXFXARet4pSQfkk25pBnktpFqDYipBbEWNtc6UEA u4ReUEAvsx2usZNe5P2yBSjvzgS+HuV2u/ay0kmRX6QHZetsN8ScfKlnVENEFmvJN2VX oYXActFdjgDcW2UVkJYkXDVQRFqEfRS72JG4AFO1En3hL4M8nIOIW36/I9CU04XbFuad Jd/UGnPE+f4HW3KaszXhxYXtBdpB09AyjT0lrvszvVOTad07Wl1nQN49/wfR+sFj94ZD B3FJEA2vdcxaHyb79/8xw4hj9V0f4tkxM9ah3OrqHPZGIlGkAtfQS9PchYJvPzB11FxZ +yRw== X-Gm-Message-State: AOAM530czO9RYa2bPcweq2IMupb1/ZitCSYkMx3qI4OuESAAf6ILDZRn Ypyug+d514Ndi81yZsOO7m01Sw== X-Google-Smtp-Source: ABdhPJzqEpQASPVcD8Szo5tbPw+oR67vF5YGbqDkAI2lV7QYZN2Fx352bKUSn3V6V2myyuQmGhGYGw== X-Received: by 2002:a1c:7916:: with SMTP id l22mr19059046wme.115.1593611815975; Wed, 01 Jul 2020 06:56:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 03/40] crypto/linux_keyring: fix 'secret_keyring' configure test Date: Wed, 1 Jul 2020 14:56:15 +0100 Message-Id: <20200701135652.1366-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, David Edmondson , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: David Edmondson The configure test for 'secret_keyring' incorrectly checked the 'have_keyring' variable. Fixes: 54e7aac0562452e4fcab65ca5001d030eef2de15 Signed-off-by: David Edmondson Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Message-Id: <20200618092636.71832-1-david.edmondson@oracle.com> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4a22dcd5631..65309a08dbc 100755 --- a/configure +++ b/configure @@ -6461,7 +6461,7 @@ EOF fi if test "$secret_keyring" !=3D "no" then - if test "$have_keyring" =3D=3D "yes" + if test "$have_keyring" =3D "yes" then secret_keyring=3Dyes else --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612073; cv=none; d=zohomail.com; s=zohoarc; b=kHvPOV6LzVbKR+vcVR7v32L7e//AiTgSqnw0pBY7XRIgOtPHWPN+/skKnkZ16ZSrggDa0ikA5llSBvlt/orJ+Ak9ch8C/KkJHcdI53+TS6kGsY1UW1sJ6teG2qdfQsv5vvSVwTnDNjZlxHRPYseJBYZlg1v5XcaKZctlA+xWNSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612073; 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=/2Na6SuLR2BPH24MTaa9ZH4OY5rPBs3TXnZRAXFwy5s=; b=NlnIaTTMdCvkGvQdgSyu9PA6g6BEZAw01arIBK7eOu1Y3nchU/A800hn5vQqXeYE3iZXPkqVWNl5uLNtrjcaBh+QZ7X8jPGJPNk27dqvIivRDy+Hs4k4BzrbqoWXlXX+OHO6E47vW1JoWoEjDCpRbUB4zRbyaIIINJYtZgyVuCE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612073078385.19688679370097; Wed, 1 Jul 2020 07:01:13 -0700 (PDT) Received: from localhost ([::1]:38978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdI6-0007Zd-LG for importer@patchew.org; Wed, 01 Jul 2020 10:00:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0002Bu-Bd for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:02 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdES-0005q6-Ao for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:02 -0400 Received: by mail-wr1-x442.google.com with SMTP id z13so23959360wrw.5 for ; Wed, 01 Jul 2020 06:56:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k126sm7565612wmf.3.2020.07.01.06.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:56:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 37DB41FF90; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/2Na6SuLR2BPH24MTaa9ZH4OY5rPBs3TXnZRAXFwy5s=; b=HukKTbwS3xLaKvtwiGlyUulYjK3Nk/fFVapHUciO2MHMhGV7OxoU7hw43GXLEYlOkJ SH6EhPYd/uJLh9glIUnMETUJrbvDujT67OU7awC7box+xi7kDkzXVq16Asoug5nCNvMh jqbThx1296xqxTV3aUBc7wjAewd5X7tc1PPw3F2tP1VYEE5vjT9e9zFFGItoJRu/x44M xN7DkGKbTxHyclA0GROLaPr00E9mpDQO4JU44GfxNKHoer+20QIRnTfUqG9wLgWtkxeR h0itNVumENwl9cMVb2WSPFSqjrqAm05uZFhb2dFIUOkuhM1qVjLh6IbnAjTUVqkkGb7y gJ+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/2Na6SuLR2BPH24MTaa9ZH4OY5rPBs3TXnZRAXFwy5s=; b=H0nJhKsSM9v1+/JkDJp7MzygKroJcBLk2s9Iw+viAmi824WTxow4puXNSh0WVGEQIn 1iOEHBbsyWEJXPKZweyyM9LMJieDaPdEw9v2CfTlVO7q7NUb65TxudDibbLpgB+FrFUX gBa4lDZH8DrJPOwNl7Xvx37hJj/asPNNbGYVncklie/LDs1Mlwr7tdasUAHnRXEnQYZF 6+xYmSdf3H4OSx/MNK7wZoBxLeSfb68TBkTRyGq3gVhZ4ZBxg5UsVaF7Prvqs3kHsSLV XkY5+LTPv/yl4dGfw5jjsnZvOcfrlADHJt0NONsLdLQJzdSZmd2VL4+8vE0NbVB+v3yI MC7A== X-Gm-Message-State: AOAM533cbDIN4vv7JA0WoiH7qtPSqg9s3f+YFY/3qn08zghmEKL4gENK ExgBbuYkpES3YTJUyaUOxz4c/Q== X-Google-Smtp-Source: ABdhPJzK/fHQ+I0MxFyvBgP9OF2EUl+2nE6RhxzDcOKJuOaYJyT0vpRxtqe2MfgjBDT25IrmkSmMkQ== X-Received: by 2002:a5d:4603:: with SMTP id t3mr29010137wrq.38.1593611818952; Wed, 01 Jul 2020 06:56:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 04/40] util/coroutine: Cleanup start_switch_fiber_ for TSAN. Date: Wed, 1 Jul 2020 14:56:16 +0100 Message-Id: <20200701135652.1366-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Kevin Wolf , berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, Stefan Hajnoczi , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley This is a cleanup patch to follow-up the patch which introduced TSAN. This patch makes separate start_switch_fiber_ functions for TSAN and ASAN. This does two things: 1. Unrelated ASAN and TSAN code is separate and each function only has arguments that are actually needed. 2. The co->tsan_caller_fiber and co->tsan_co_fiber fields are only access from within #ifdef CONFIG_TSAN. Signed-off-by: Robert Foley Reviewed-by: Stefan Hajnoczi Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200626170001.27017-1-robert.foley@linaro.org> --- util/coroutine-ucontext.c | 52 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c index f0b66320e10..fff20aad80a 100644 --- a/util/coroutine-ucontext.c +++ b/util/coroutine-ucontext.c @@ -52,8 +52,10 @@ typedef struct { #endif sigjmp_buf env; =20 +#ifdef CONFIG_TSAN void *tsan_co_fiber; void *tsan_caller_fiber; +#endif =20 #ifdef CONFIG_VALGRIND_H unsigned int valgrind_stack_id; @@ -77,7 +79,10 @@ union cc_arg { int i[2]; }; =20 -/* QEMU_ALWAYS_INLINE only does so if __OPTIMIZE__, so we cannot use it. */ +/* + * QEMU_ALWAYS_INLINE only does so if __OPTIMIZE__, so we cannot use it. + * always_inline is required to avoid TSan runtime fatal errors. + */ static inline __attribute__((always_inline)) void on_new_fiber(CoroutineUContext *co) { @@ -87,6 +92,7 @@ void on_new_fiber(CoroutineUContext *co) #endif } =20 +/* always_inline is required to avoid TSan runtime fatal errors. */ static inline __attribute__((always_inline)) void finish_switch_fiber(void *fake_stack_save) { @@ -109,18 +115,29 @@ void finish_switch_fiber(void *fake_stack_save) #endif } =20 -static inline __attribute__((always_inline)) void start_switch_fiber( - CoroutineAction action, void **fake_stack_save, - const void *bottom, size_t size, void *new_fiber) +/* always_inline is required to avoid TSan runtime fatal errors. */ +static inline __attribute__((always_inline)) +void start_switch_fiber_asan(CoroutineAction action, void **fake_stack_sav= e, + const void *bottom, size_t size) { #ifdef CONFIG_ASAN __sanitizer_start_switch_fiber( action =3D=3D COROUTINE_TERMINATE ? NULL : fake_stack_save, bottom, size); #endif +} + +/* always_inline is required to avoid TSan runtime fatal errors. */ +static inline __attribute__((always_inline)) +void start_switch_fiber_tsan(void **fake_stack_save, + CoroutineUContext *co, + bool caller) +{ #ifdef CONFIG_TSAN - void *curr_fiber =3D - __tsan_get_current_fiber(); + void *new_fiber =3D caller ? + co->tsan_caller_fiber : + co->tsan_co_fiber; + void *curr_fiber =3D __tsan_get_current_fiber(); __tsan_acquire(curr_fiber); =20 *fake_stack_save =3D curr_fiber; @@ -144,12 +161,9 @@ static void coroutine_trampoline(int i0, int i1) =20 /* Initialize longjmp environment and switch back the caller */ if (!sigsetjmp(self->env, 0)) { - start_switch_fiber( - COROUTINE_YIELD, - &fake_stack_save, - leader.stack, - leader.stack_size, - self->tsan_caller_fiber); + start_switch_fiber_asan(COROUTINE_YIELD, &fake_stack_save, leader.= stack, + leader.stack_size); + start_switch_fiber_tsan(&fake_stack_save, self, true); /* true=3Dc= aller */ siglongjmp(*(sigjmp_buf *)co->entry_arg, 1); } =20 @@ -208,10 +222,10 @@ Coroutine *qemu_coroutine_new(void) =20 /* swapcontext() in, siglongjmp() back out */ if (!sigsetjmp(old_env, 0)) { - start_switch_fiber( - COROUTINE_YIELD, - &fake_stack_save, - co->stack, co->stack_size, co->tsan_co_fiber); + start_switch_fiber_asan(COROUTINE_YIELD, &fake_stack_save, co->sta= ck, + co->stack_size); + start_switch_fiber_tsan(&fake_stack_save, + co, false); /* false=3Dnot caller */ =20 #ifdef CONFIG_SAFESTACK /* @@ -287,8 +301,10 @@ qemu_coroutine_switch(Coroutine *from_, Coroutine *to_, =20 ret =3D sigsetjmp(from->env, 0); if (ret =3D=3D 0) { - start_switch_fiber(action, &fake_stack_save, - to->stack, to->stack_size, to->tsan_co_fiber); + start_switch_fiber_asan(action, &fake_stack_save, to->stack, + to->stack_size); + start_switch_fiber_tsan(&fake_stack_save, + to, false); /* false=3Dnot caller */ siglongjmp(to->env, action); } =20 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612106; cv=none; d=zohomail.com; s=zohoarc; b=hgACPskqC0s1ji5DcBxBIXxwYNsmG2MGqejeDEx87AO9W2uAaDN3r+f6v+oCqpw8R6ak8yRJhWvRheQntFqeOmOOcpuHbjAcfcq65vylRS7GSyMdoYXQUk6DRB2SWZIcq8weZdMqzom4mk7qs7sUym/KkQ8MrxwwtGHnhsGYh28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612106; 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=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=jdwtpXn0tq6ZiSMI7X4faOSjUS7MSDKxeJcxCAhUWBu0r/M029Pmcq9DnJY4816Qtvc6ixWUg/xj3M4eOsFkdlkta2j+l0SQicxmJjkWQvJ1FNtwOy4VBOYLWc7mQsEzYMqqyJKOLH6rQwJDCDG47ObonWSAf2vSz+HnWJl4d+c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612106905768.3377477697812; Wed, 1 Jul 2020 07:01:46 -0700 (PDT) Received: from localhost ([::1]:39586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdII-0007tS-T1 for importer@patchew.org; Wed, 01 Jul 2020 10:00:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEZ-0002OW-Bl for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:47060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEW-0005rB-2u for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:07 -0400 Received: by mail-wr1-x432.google.com with SMTP id r12so23891641wrj.13 for ; Wed, 01 Jul 2020 06:57:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 65sm7973132wma.48.2020.07.01.06.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4DFE71FF91; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=SnlSS0zQX/Muk/NpdPlmirftbBZaI2iqZ7F8X01Q4MwhLWbv0XGRNNcT9/z4GjyVvY P99F3fUTrkK6ml5XHzFcxfCOwTzNswE1JKNc+2iiu8l24KZJIImlOmLCMIiYcc0D682j juKhCS9RWfILHaYvlM6O+XzlOHOAZaF1dtmiK+ZOLQg2+5/cRAVGaIF+ZyKfrOvNYsGw 5shIZGmXnDFscDaUWiFXEkgKttzgUj+Ucn6Njgcu2ABlGsisvbuTe58/kbcozDu7lB6H Y0TRdMoOcXwjT88OCehjlrSKDo3v5hLqOSb/wrJ1UNH4EogGz4OCzl23Mi/F1jxoJPV4 JrKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m1Iumf3YfxuO4NhxteboEtLnibs/CAVIrPHuCmkmoi4=; b=XEM2PXeGUlbbQozPuq3jesgSugRSVArWaTUTWBYzDLoOSuirRKfx3qd1oUfHPk9bZ8 RhDvwIv16TNPLWZM7OOv4voh7zIOx1eeUXA27iPdIN5SdwQgdge5+lGSNN6axO1jV6f8 XK/twOXH/c7RWEao6vHVeAk7c2yY+JR8WVufGD7TfqCJyUe/yGJWwgtE3tyeB0g1ymmS WpeHN4XQupFrWjwHBus51ZcP1mrnBcm4xxTz/P+e2LAWbOzqZynJgrdzQK0FMEAMWTFB uKJWbS3rep4sof9ZdlzeQsp61hwGTY3TP2vMoZHThRt2BwQS7ZlKl4hrv9yYbU7FWfFQ q3lA== X-Gm-Message-State: AOAM532G4jHTybbm8JmuWtoilhKwYMchm9U0DmUAFft37csL5s5dANtc WimK1Mx+x7cokibkQE6bH8LKuR1vGmw= X-Google-Smtp-Source: ABdhPJxHAp9VDh3w7xsyS9lmWls5rfYiofvVyk9rdc29YD9ZqNlElGudl6VuU8oPe0au0wvO0dIM4Q== X-Received: by 2002:a5d:4e48:: with SMTP id r8mr26381040wrt.309.1593611822633; Wed, 01 Jul 2020 06:57:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 05/40] tests/vm: pass args through to BaseVM's __init__ Date: Wed, 1 Jul 2020 14:56:17 +0100 Message-Id: <20200701135652.1366-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Adding the args parameter to BaseVM's __init__. We will shortly need to pass more parameters to the class so let's just pass args rather than growing the parameter list. Signed-off-by: Robert Foley Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-2-robert.foley@linaro.org> --- tests/vm/basevm.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index a80b616a08d..5a58e6c3930 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -61,11 +61,10 @@ class BaseVM(object): # 4 is arbitrary, but greater than 2, # since we found we need to wait more than twice as long. tcg_ssh_timeout_multiplier =3D 4 - def __init__(self, debug=3DFalse, vcpus=3DNone, genisoimage=3DNone, - build_path=3DNone): + def __init__(self, args): self._guest =3D None - self._genisoimage =3D genisoimage - self._build_path =3D build_path + self._genisoimage =3D args.genisoimage + self._build_path =3D args.build_path self._tmpdir =3D os.path.realpath(tempfile.mkdtemp(prefix=3D"vm-te= st-", suffix=3D".tmp", dir=3D".")) @@ -78,7 +77,7 @@ class BaseVM(object): self._ssh_pub_key_file =3D os.path.join(self._tmpdir, "id_rsa.pub") open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY) =20 - self.debug =3D debug + self.debug =3D args.debug self._stderr =3D sys.stderr self._devnull =3D open(os.devnull, "w") if self.debug: @@ -92,8 +91,8 @@ class BaseVM(object): (",ipv6=3Dno" if not self.ipv6 else ""), "-device", "virtio-net-pci,netdev=3Dvnet", "-vnc", "127.0.0.1:0,to=3D20"] - if vcpus and vcpus > 1: - self._args +=3D ["-smp", "%d" % vcpus] + if args.jobs and args.jobs > 1: + self._args +=3D ["-smp", "%d" % args.jobs] if kvm_available(self.arch): self._args +=3D ["-enable-kvm"] else: @@ -456,8 +455,7 @@ def main(vmcls): return 1 logging.basicConfig(level=3D(logging.DEBUG if args.debug else logging.WARN)) - vm =3D vmcls(debug=3Dargs.debug, vcpus=3Dargs.jobs, - genisoimage=3Dargs.genisoimage, build_path=3Dargs.build= _path) + vm =3D vmcls(args) if args.build_image: if os.path.exists(args.image) and not args.force: sys.stderr.writelines(["Image file exists: %s\n" % args.im= age, --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612303; cv=none; d=zohomail.com; s=zohoarc; b=ePCwTXJ6odf6nL1FwWPGG2p+pSYWFCLus1fIaxbqSVlaMSZxWm6+TI8Ucfaur0fkjr6zVl5I7vZKVH277ed0iEt26WMB6Rnbm0BDK+LdhVmfv7Zi95wJMk6x27OFGDQxh268pk6wWq/O4ZgtJ8/s+sd8deUeWvJqTnP5F+89zkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612303; 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=Uqu+G7KWNLFFsBFSWuF2fzigErk1o01AVduM2CJF95Y=; b=TQ9Yfbc1MJpLUjIrW7UIRSK4qMw1TU5yZ2hAwHTTgnpR36lbZnAk4uvQTkbk1mAprmKBNUJI+dYtVLCbXs8SNvVL4mbR+Ynzdozmy7nCxFE6608j3AUnEecHrvQkv4xwyzQJ3nr+mNywh7Y6Umsk0C93qBL+9jBiAzGBptplB0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612303292741.3774266156287; Wed, 1 Jul 2020 07:05:03 -0700 (PDT) Received: from localhost ([::1]:55840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdMD-0006Nh-QQ for importer@patchew.org; Wed, 01 Jul 2020 10:05:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEb-0002Tc-Dj for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:09 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEY-0005rm-VH for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:09 -0400 Received: by mail-wr1-x42a.google.com with SMTP id b6so23927319wrs.11 for ; Wed, 01 Jul 2020 06:57:06 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b18sm7689783wmb.18.2020.07.01.06.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 655F11FF92; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Uqu+G7KWNLFFsBFSWuF2fzigErk1o01AVduM2CJF95Y=; b=jC87SJqbYxh+evflc4EauyFWYT1fbtj+o2LsQXhz8F4Vhkb/prSZMjgIUfdav73ipH QuhAGQDudwmGLgU5TGXCufwrvvFDdeTNGsDuViG9LWvYCdw56JFaJfMKHcoKxY6AgWce UPwV52zurauMmVkMkuRwjqBhYP2ZG/TlyeSNmgZXqjKPZ+urdFAQv8EPo4JOZLJBrfKQ DppmCtksckfAmXBQepR6go2uA9qmxgS9xvWXEAfCG1Gtnw25YT9OcsVy7iv1hn0sMfnf pi/S+H8+4lNOQ4SnpIvphGU1U2OnfQ022Sdm22OxR9LcWx9RdP8ePz/4qJpSKxJc7CLZ l61g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Uqu+G7KWNLFFsBFSWuF2fzigErk1o01AVduM2CJF95Y=; b=kZ3LzXCknRkfj9vlj0lI6aApbvHs/M/+c4/JmhyyR4nbhzVgrWoR75hh3DWH4nKLnz sF6hfsIGCgP+AMFStXSglvXNi7UED/yrq4ZaHwJS/SRsjAv4MLPFbFfFMA6TuHh3pVmB rV5nKGeql4nqBFmPfrG/FfdNOhKfTLG2lZPZTt6MlyEkdkkZRWdNDXyj5q8ePeGuMQLx P0u10UobVduoeQmbho3AGWSqjkA8TWm3qMxY7N2GseOzroelptYMdxBVpfjXCeuKEbv/ N86jCw57ptAQ6HopmamDLw5ac9n0e4VZGB5ksHfMnlZOJt0KTUDk+oml42nt+HP1lMp6 P7mQ== X-Gm-Message-State: AOAM533Y929rRpiTNslmi60GXfkQ1pSfxy9OmMKwH+AfODaP5lsPkGRb RVfEMPJlmewrwqk0XitJSoR0MQ== X-Google-Smtp-Source: ABdhPJwkqr6h2btrwSAgjpY5aUdAkleI2GmyenzQAKM7tzTblSBpowZmdtieCXjPkiT3oY10/lo0fw== X-Received: by 2002:a5d:6651:: with SMTP id f17mr28880812wrw.29.1593611825174; Wed, 01 Jul 2020 06:57:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 06/40] tests/vm: Add configuration to basevm.py Date: Wed, 1 Jul 2020 14:56:18 +0100 Message-Id: <20200701135652.1366-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Added use of a configuration to tests/vm/basevm.py. The configuration provides parameters used to configure a VM. This allows for providing alternate configurations to the VM being created/launched. cpu, machine, memory, and NUMA configuration are all examples of configuration which we might want to vary on the VM being creat= ed or launched. This will for example allow for creating an aarch64 vm. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-3-robert.foley@linaro.org> --- tests/vm/basevm.py | 172 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 133 insertions(+), 39 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5a58e6c3930..cfe20c58f7e 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -29,16 +29,41 @@ import tempfile import shutil import multiprocessing import traceback - -SSH_KEY =3D open(os.path.join(os.path.dirname(__file__), - "..", "keys", "id_rsa")).read() -SSH_PUB_KEY =3D open(os.path.join(os.path.dirname(__file__), - "..", "keys", "id_rsa.pub")).read() - +import shlex + +SSH_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "id_rsa") +SSH_PUB_KEY_FILE =3D os.path.join(os.path.dirname(__file__), + "..", "keys", "id_rsa.pub") + +# This is the standard configuration. +# Any or all of these can be overridden by +# passing in a config argument to the VM constructor. +DEFAULT_CONFIG =3D { + 'cpu' : "max", + 'machine' : 'pc', + 'guest_user' : "qemu", + 'guest_pass' : "qemupass", + 'root_pass' : "qemupass", + 'ssh_key_file' : SSH_KEY_FILE, + 'ssh_pub_key_file': SSH_PUB_KEY_FILE, + 'memory' : "4G", + 'extra_args' : [], + 'qemu_args' : "", + 'dns' : "", + 'ssh_port' : 0, + 'install_cmds' : "", + 'boot_dev_type' : "block", + 'ssh_timeout' : 1, +} +BOOT_DEVICE =3D { + 'block' : "-drive file=3D{},if=3Dnone,id=3Ddrive0,cache=3Dwriteback "\ + "-device virtio-blk,drive=3Ddrive0,bootindex=3D0", + 'scsi' : "-device virtio-scsi-device,id=3Dscsi "\ + "-drive file=3D{},format=3Draw,if=3Dnone,id=3Dhd0 "\ + "-device scsi-hd,drive=3Dhd0,bootindex=3D0", +} class BaseVM(object): - GUEST_USER =3D "qemu" - GUEST_PASS =3D "qemupass" - ROOT_PASS =3D "qemupass" =20 envvars =3D [ "https_proxy", @@ -57,25 +82,38 @@ class BaseVM(object): poweroff =3D "poweroff" # enable IPv6 networking ipv6 =3D True + # This is the timeout on the wait for console bytes. + socket_timeout =3D 120 # Scale up some timeouts under TCG. # 4 is arbitrary, but greater than 2, # since we found we need to wait more than twice as long. tcg_ssh_timeout_multiplier =3D 4 - def __init__(self, args): + def __init__(self, args, config=3DNone): self._guest =3D None self._genisoimage =3D args.genisoimage self._build_path =3D args.build_path + # Allow input config to override defaults. + self._config =3D DEFAULT_CONFIG.copy() + if config !=3D None: + self._config.update(config) + self.validate_ssh_keys() self._tmpdir =3D os.path.realpath(tempfile.mkdtemp(prefix=3D"vm-te= st-", suffix=3D".tmp", dir=3D".")) atexit.register(shutil.rmtree, self._tmpdir) - - self._ssh_key_file =3D os.path.join(self._tmpdir, "id_rsa") - open(self._ssh_key_file, "w").write(SSH_KEY) - subprocess.check_call(["chmod", "600", self._ssh_key_file]) - - self._ssh_pub_key_file =3D os.path.join(self._tmpdir, "id_rsa.pub") - open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY) + # Copy the key files to a temporary directory. + # Also chmod the key file to agree with ssh requirements. + self._config['ssh_key'] =3D \ + open(self._config['ssh_key_file']).read().rstrip() + self._config['ssh_pub_key'] =3D \ + open(self._config['ssh_pub_key_file']).read().rstrip() + self._ssh_tmp_key_file =3D os.path.join(self._tmpdir, "id_rsa") + open(self._ssh_tmp_key_file, "w").write(self._config['ssh_key']) + subprocess.check_call(["chmod", "600", self._ssh_tmp_key_file]) + + self._ssh_tmp_pub_key_file =3D os.path.join(self._tmpdir, "id_rsa.= pub") + open(self._ssh_tmp_pub_key_file, + "w").write(self._config['ssh_pub_key']) =20 self.debug =3D args.debug self._stderr =3D sys.stderr @@ -84,11 +122,14 @@ class BaseVM(object): self._stdout =3D sys.stdout else: self._stdout =3D self._devnull + netdev =3D "user,id=3Dvnet,hostfwd=3D:127.0.0.1:{}-:22" self._args =3D [ \ - "-nodefaults", "-m", "4G", - "-cpu", "max", - "-netdev", "user,id=3Dvnet,hostfwd=3D:127.0.0.1:0-:22" + - (",ipv6=3Dno" if not self.ipv6 else ""), + "-nodefaults", "-m", self._config['memory'], + "-cpu", self._config['cpu'], + "-netdev", + netdev.format(self._config['ssh_port']) + + (",ipv6=3Dno" if not self.ipv6 else "") + + (",dns=3D" + self._config['dns'] if self._config['dns'] else "= "), "-device", "virtio-net-pci,netdev=3Dvnet", "-vnc", "127.0.0.1:0,to=3D20"] if args.jobs and args.jobs > 1: @@ -99,6 +140,55 @@ class BaseVM(object): logging.info("KVM not available, not using -enable-kvm") self._data_args =3D [] =20 + if self._config['qemu_args'] !=3D None: + qemu_args =3D self._config['qemu_args'] + qemu_args =3D qemu_args.replace('\n',' ').replace('\r','') + # shlex groups quoted arguments together + # we need this to keep the quoted args together for when + # the QEMU command is issued later. + args =3D shlex.split(qemu_args) + self._config['extra_args'] =3D [] + for arg in args: + if arg: + # Preserve quotes around arguments. + # shlex above takes them out, so add them in. + if " " in arg: + arg =3D '"{}"'.format(arg) + self._config['extra_args'].append(arg) + + def validate_ssh_keys(self): + """Check to see if the ssh key files exist.""" + if 'ssh_key_file' not in self._config or\ + not os.path.exists(self._config['ssh_key_file']): + raise Exception("ssh key file not found.") + if 'ssh_pub_key_file' not in self._config or\ + not os.path.exists(self._config['ssh_pub_key_file']): + raise Exception("ssh pub key file not found.") + + def wait_boot(self, wait_string=3DNone): + """Wait for the standard string we expect + on completion of a normal boot. + The user can also choose to override with an + alternate string to wait for.""" + if wait_string is None: + if self.login_prompt is None: + raise Exception("self.login_prompt not defined") + wait_string =3D self.login_prompt + # Intentionally bump up the default timeout under TCG, + # since the console wait below takes longer. + timeout =3D self.socket_timeout + if not kvm_available(self.arch): + timeout *=3D 8 + self.console_init(timeout=3Dtimeout) + self.console_wait(wait_string) + + def __getattr__(self, name): + # Support direct access to config by key. + # for example, access self._config['cpu'] by self.cpu + if name.lower() in self._config.keys(): + return self._config[name.lower()] + return object.__getattribute__(self, name) + def _download_with_cache(self, url, sha256sum=3DNone, sha512sum=3DNone= ): def check_sha256sum(fname): if not sha256sum: @@ -130,8 +220,9 @@ class BaseVM(object): "-t", "-o", "StrictHostKeyChecking=3Dno", "-o", "UserKnownHostsFile=3D" + os.devnull, - "-o", "ConnectTimeout=3D1", - "-p", self.ssh_port, "-i", self._ssh_key_file] + "-o", + "ConnectTimeout=3D{}".format(self._config["ssh_timeout"= ]), + "-p", self.ssh_port, "-i", self._ssh_tmp_key_file] # If not in debug mode, set ssh to quiet mode to # avoid printing the results of commands. if not self.debug: @@ -180,14 +271,14 @@ class BaseVM(object): "virtio-blk,drive=3D%s,serial=3D%s,bootindex= =3D1" % (name, name)] =20 def boot(self, img, extra_args=3D[]): - args =3D self._args + [ - "-drive", "file=3D%s,if=3Dnone,id=3Ddrive0,cache=3Dwriteback" = % img, - "-device", "virtio-blk,drive=3Ddrive0,bootindex=3D0"] - args +=3D self._data_args + extra_args + boot_dev =3D BOOT_DEVICE[self._config['boot_dev_type']] + boot_params =3D boot_dev.format(img) + args =3D self._args + boot_params.split(' ') + args +=3D self._data_args + extra_args + self._config['extra_args'] logging.debug("QEMU args: %s", " ".join(args)) qemu_path =3D get_qemu_path(self.arch, self._build_path) guest =3D QEMUMachine(binary=3Dqemu_path, args=3Dargs) - guest.set_machine('pc') + guest.set_machine(self._config['machine']) guest.set_console() try: guest.launch() @@ -301,7 +392,8 @@ class BaseVM(object): self.console_send(command) =20 def console_ssh_init(self, prompt, user, pw): - sshkey_cmd =3D "echo '%s' > .ssh/authorized_keys\n" % SSH_PUB_KEY.= rstrip() + sshkey_cmd =3D "echo '%s' > .ssh/authorized_keys\n" \ + % self._config['ssh_pub_key'].rstrip() self.console_wait_send("login:", "%s\n" % user) self.console_wait_send("Password:", "%s\n" % pw) self.console_wait_send(prompt, "mkdir .ssh\n") @@ -360,23 +452,23 @@ class BaseVM(object): "local-hostname: {}-guest\n".format(name)]) mdata.close() udata =3D open(os.path.join(cidir, "user-data"), "w") - print("guest user:pw {}:{}".format(self.GUEST_USER, - self.GUEST_PASS)) + print("guest user:pw {}:{}".format(self._config['guest_user'], + self._config['guest_pass'])) udata.writelines(["#cloud-config\n", "chpasswd:\n", " list: |\n", - " root:%s\n" % self.ROOT_PASS, - " %s:%s\n" % (self.GUEST_USER, - self.GUEST_PASS), + " root:%s\n" % self._config['root_pass'], + " %s:%s\n" % (self._config['guest_user'], + self._config['guest_pass']), " expire: False\n", "users:\n", - " - name: %s\n" % self.GUEST_USER, + " - name: %s\n" % self._config['guest_user'], " sudo: ALL=3D(ALL) NOPASSWD:ALL\n", " ssh-authorized-keys:\n", - " - %s\n" % SSH_PUB_KEY, + " - %s\n" % self._config['ssh_pub_key'], " - name: root\n", " ssh-authorized-keys:\n", - " - %s\n" % SSH_PUB_KEY, + " - %s\n" % self._config['ssh_pub_key'], "locale: en_US.UTF-8\n"]) proxy =3D os.environ.get("http_proxy") if not proxy is None: @@ -447,15 +539,17 @@ def parse_args(vmcls): parser.disable_interspersed_args() return parser.parse_args() =20 -def main(vmcls): +def main(vmcls, config=3DNone): try: + if config =3D=3D None: + config =3D {} args, argv =3D parse_args(vmcls) if not argv and not args.build_qemu and not args.build_image: print("Nothing to do?") return 1 logging.basicConfig(level=3D(logging.DEBUG if args.debug else logging.WARN)) - vm =3D vmcls(args) + vm =3D vmcls(args, config=3Dconfig) if args.build_image: if os.path.exists(args.image) and not args.force: sys.stderr.writelines(["Image file exists: %s\n" % args.im= age, --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612179; cv=none; d=zohomail.com; s=zohoarc; b=Hr9WIuvzcW5XmqJOJ0ZvVBvudENsa2hNacMR9FBtxmgQ1C5Mhkxig01eFU+RfhLjaV9dglwEXHHj9K6tj556dOsX5S93KM/9jaPhKFmy85os85lk9UB6/uP/qpOd4a15mix6oRQZtpm1FU9I+K5bZoeXbl4nUw74SnWRSyHX7oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612179; 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=Jmf45TdSZl+xaFqF4i+rpuxLxpTS1OvMPwFk/ldTir0=; b=JWo+Uv+hA5dViOy9hVsGa4B3w4KvSlUDW00b+IC/zWUvrtUKlBd7LWPDmt/dI7A96slKvhSg6JyaqFg+44MBCHhk5dH3Q4/QD6Wh6XLhHsolfNoGP+zV4pB9q6mMQsXc3Zb3Enp+YTDxNxyPnz5HSBkD0ic8Hx8Yz+uECKcYoVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612179660187.69598707605644; Wed, 1 Jul 2020 07:02:59 -0700 (PDT) Received: from localhost ([::1]:47324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdKE-0002kE-3o for importer@patchew.org; Wed, 01 Jul 2020 10:02:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEX-0002Iw-50 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:05 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0005qa-1S for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:04 -0400 Received: by mail-wr1-x443.google.com with SMTP id q5so23946291wru.6 for ; Wed, 01 Jul 2020 06:57:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 22sm7749511wmb.11.2020.07.01.06.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 823AC1FF93; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jmf45TdSZl+xaFqF4i+rpuxLxpTS1OvMPwFk/ldTir0=; b=o0OvLhUp4coY2M9yujQyNmzbo1VHRdPx7zruEY4dq/A/yKB/YqV8wiVbhHt5sF3p4q 8muQoWFk50ZVMHV2/NJ+eMWNyLcRy/QXdzd6qcgIKDtF/ittytF3+q7ycL+eRm75LTZq PLR0/ERBhUqup05n4BUxHxgOO778VxtqOuvJO7LfTsROb4gaUF5BeeoqGMhCOVCeiYpN im0ZuQyuqe7/A72cmOaRSGbO//KdOWL/F1O9zvrsd6uV4BohNPkj46PA7yeVX9Xo9rnB aMs/Cwtja2Gg6S5f++pMFGLiJ4Ys+f6M86SKSKmx4mv4eIGef/fuABIM9wDNl66uZpAi i+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jmf45TdSZl+xaFqF4i+rpuxLxpTS1OvMPwFk/ldTir0=; b=Kz/5ei+KYwsZuJ+gjRaddzpfHAUY2IiDPb+B5aUD/1qPjsoKZVPUyCD0EiS2sMaY9A fWhYm2QsZXgf6OVt/9zmh568v67GeCcpTdnF8ac1c0NBJouLLMxEb9OelfpDHbeoOt4x tdzHw1PX2v0tNpu9fkY8pBi16cOKMFh0uZ172dKkDaYntju3R5gkVTmUvskMV7GYydKE N6Dn2Y4g5MLOaOnjGtLkpb7ZWBqks061lS8dUODLWwlkr3xOzORI3suMm734wcrKAXEl LY5g1FH/y5UrWTnZeFLGj4t3OvrG+I+8tqPsM4oYJxTkCjXm21xWgSFf+ugNFBXUj95m qx4A== X-Gm-Message-State: AOAM532pyla1A5GxXpDDV3JOujZYEIIsfgqp5ZeWUUqZmepiR1BHz07s H56KDkwiY6t5Yf7YpMbeXkCJIA== X-Google-Smtp-Source: ABdhPJwiLBLINo01kvjUpsTAoMUdJujKhVkWcafJ//b+mnw8Z08dT/ltHxsP+1Sj+oXXKWjDA658Ow== X-Received: by 2002:adf:91e1:: with SMTP id 88mr20819587wri.89.1593611820538; Wed, 01 Jul 2020 06:57:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 07/40] tests/vm: Added configuration file support Date: Wed, 1 Jul 2020 14:56:19 +0100 Message-Id: <20200701135652.1366-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Changes to tests/vm/basevm.py to allow accepting a configuration file as a parameter. Allows for specifying VM options such as cpu, machine, memory, and arbitrary qemu arguments for specifying options such as NUMA configuration. Also added an example conf_example_aarch64.yml and conf_example_x86.yml. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-4-robert.foley@linaro.org> --- configure | 9 ++++++ tests/vm/Makefile.include | 6 ++++ tests/vm/basevm.py | 40 +++++++++++++++++++++++- tests/vm/conf_example_aarch64.yml | 51 +++++++++++++++++++++++++++++++ tests/vm/conf_example_x86.yml | 50 ++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 tests/vm/conf_example_aarch64.yml create mode 100644 tests/vm/conf_example_x86.yml diff --git a/configure b/configure index 65309a08dbc..96256be057a 100755 --- a/configure +++ b/configure @@ -960,6 +960,13 @@ do fi done =20 +# Check for existence of python3 yaml, needed to +# import yaml config files into vm-build. +python_yaml=3D"no" +if $(python3 -c "import yaml" 2> /dev/null); then + python_yaml=3D"yes" +fi + : ${smbd=3D${SMBD-/usr/sbin/smbd}} =20 # Default objcc to clang if available, otherwise use CC @@ -6843,6 +6850,7 @@ if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi echo "genisoimage $genisoimage" +echo "python_yaml $python_yaml" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then echo "smbd $smbd" @@ -7928,6 +7936,7 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak +echo "PYTHON_YAML=3D$python_yaml" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a253aba4579..f6c3892bb28 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -44,6 +44,12 @@ endif @echo " QEMU_LOCAL=3D1 - Use QEMU binary local to this= build." @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" @echo " QEMU_IMG=3D/path/to/qemu-img - Change path to qemu-img tool" +ifeq ($(PYTHON_YAML),yes) + @echo " QEMU_CONFIG=3D/path/conf.yml - Change path to VM configurati= on .yml file." +else + @echo " (install python3-yaml to enable support for yaml file to confi= gure a VM.)" +endif + @echo " See conf_example_*.yml for file= format details." =20 vm-build-all: $(addprefix vm-build-, $(IMAGES)) =20 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index cfe20c58f7e..fa56fbbb4b6 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -481,7 +481,6 @@ class BaseVM(object): cwd=3Dcidir, stdin=3Dself._devnull, stdout=3Dself._stdout, stderr=3Dself._stdout) - return os.path.join(cidir, "cloud-init.iso") =20 def get_qemu_path(arch, build_path=3DNone): @@ -497,6 +496,41 @@ def get_qemu_path(arch, build_path=3DNone): qemu_path =3D "qemu-system-" + arch return qemu_path =20 +def parse_config(config, args): + """ Parse yaml config and populate our config structure. + The yaml config allows the user to override the + defaults for VM parameters. In many cases these + defaults can be overridden without rebuilding the VM.""" + if args.config: + config_file =3D args.config + elif 'QEMU_CONFIG' in os.environ: + config_file =3D os.environ['QEMU_CONFIG'] + else: + return config + if not os.path.exists(config_file): + raise Exception("config file {} does not exist".format(config_file= )) + # We gracefully handle importing the yaml module + # since it might not be installed. + # If we are here it means the user supplied a .yml file, + # so if the yaml module is not installed we will exit with error. + try: + import yaml + except ImportError: + print("The python3-yaml package is needed "\ + "to support config.yaml files") + # Instead of raising an exception we exit to avoid + # a raft of messy (expected) errors to stdout. + exit(1) + with open(config_file) as f: + yaml_dict =3D yaml.safe_load(f) + + if 'qemu-conf' in yaml_dict: + config.update(yaml_dict['qemu-conf']) + else: + raise Exception("config file {} is not valid"\ + " missing qemu-conf".format(config_file)) + return config + def parse_args(vmcls): =20 def get_default_jobs(): @@ -536,6 +570,9 @@ def parse_args(vmcls): help=3D"run tests with a snapshot") parser.add_option("--genisoimage", default=3D"genisoimage", help=3D"iso imaging tool") + parser.add_option("--config", "-c", default=3DNone, + help=3D"Provide config yaml for configuration. "\ + "See config_example.yaml for example.") parser.disable_interspersed_args() return parser.parse_args() =20 @@ -547,6 +584,7 @@ def main(vmcls, config=3DNone): if not argv and not args.build_qemu and not args.build_image: print("Nothing to do?") return 1 + config =3D parse_config(config, args) logging.basicConfig(level=3D(logging.DEBUG if args.debug else logging.WARN)) vm =3D vmcls(args, config=3Dconfig) diff --git a/tests/vm/conf_example_aarch64.yml b/tests/vm/conf_example_aarc= h64.yml new file mode 100644 index 00000000000..9d44ae356f7 --- /dev/null +++ b/tests/vm/conf_example_aarch64.yml @@ -0,0 +1,51 @@ +# +# Example yaml for use by any of the scripts in tests/vm. +# Can be provided as an environment variable QEMU_CONFIG +# +qemu-conf: + + # If any of the below are not provided, we will just use the qemu defa= ults. + + # Login username and password(has to be sudo enabled) + guest_user: qemu + guest_pass: "qemupass" + + # Password for root user can be different from guest. + root_pass: "qemupass" + + # If one key is provided, both must be provided. + #ssh_key: /complete/path/of/your/keyfile/id_rsa + #ssh_pub_key: /complete/path/of/your/keyfile/id_rsa.pub + + cpu: max + machine: virt,gic-version=3Dmax + memory: 16G + + # The below is a example for how to configure NUMA topology with + # 4 NUMA nodes and 2 different NUMA distances. + qemu_args: "-smp cpus=3D16,sockets=3D2,cores=3D8 + -numa node,cpus=3D0-3,nodeid=3D0 -numa node,cpus=3D4-7,nod= eid=3D1 + -numa node,cpus=3D8-11,nodeid=3D2 -numa node,cpus=3D12-15,= nodeid=3D3 + -numa dist,src=3D0,dst=3D1,val=3D15 -numa dist,src=3D2,dst= =3D3,val=3D15 + -numa dist,src=3D0,dst=3D2,val=3D20 -numa dist,src=3D0,dst= =3D3,val=3D20 + -numa dist,src=3D1,dst=3D2,val=3D20 -numa dist,src=3D1,dst= =3D3,val=3D20" + + # By default we do not set the DNS. + # You override the defaults by setting the below. + #dns: 1.234.567.89 + + # By default we will use a "block" device, but + # you can also boot from a "scsi" device. + # Just keep in mind your scripts might need to change + # As you will have /dev/sda instead of /dev/vda (for block device) + boot_dev_type: "block" + + # By default the ssh port is not fixed. + # A fixed ssh port makes it easier for automated tests. + #ssh_port: 5555 + + # To install a different set of packages, provide a command to issue + #install_cmds: "apt-get update ; apt-get build-dep -y qemu" + + # Or to skip the install entirely, just provide "" + #install_cmds: "" diff --git a/tests/vm/conf_example_x86.yml b/tests/vm/conf_example_x86.yml new file mode 100644 index 00000000000..78d3f5830fa --- /dev/null +++ b/tests/vm/conf_example_x86.yml @@ -0,0 +1,50 @@ +# +# Example yaml for use by any of the x86 based scripts in tests/vm. +# Can be provided as an environment variable QEMU_CONFIG +# +qemu-conf: + + # If any of the below are not provided, we will just use the qemu defa= ults. + + # Login username and password(has to be sudo enabled) + guest_user: "qemu" + guest_pass: "qemupass" + + # Password for root user can be different from guest. + root_pass: "qemupass" + + # Provide default ssh keys of current user. + # You need to edit the below for your user. + #ssh_key_file: /home//.ssh/id_rsa + #ssh_pub_key_file: /home//.ssh/id_rsa.pub + + cpu: max + machine: pc + memory: 8G + + # The below is a example for how to configure NUMA topology with + # 4 NUMA nodes and 2 different NUMA distances. + qemu_args: "-smp cpus=3D8,sockets=3D2,cores=3D4 + -object memory-backend-ram,size=3D4G,policy=3Dbind,host-no= des=3D0,id=3Dram-node0 + -object memory-backend-ram,size=3D4G,policy=3Dbind,host-no= des=3D0,id=3Dram-node1 + -object memory-backend-ram,size=3D4G,policy=3Dbind,host-no= des=3D1,id=3Dram-node2 + -object memory-backend-ram,size=3D4G,policy=3Dbind,host-no= des=3D1,id=3Dram-node3 + -numa node,cpus=3D0-1,nodeid=3D0 -numa node,cpus=3D2-3,nod= eid=3D1 + -numa node,cpus=3D4-5,nodeid=3D2 -numa node,cpus=3D6-7,nod= eid=3D3 + -numa dist,src=3D0,dst=3D1,val=3D15 -numa dist,src=3D2,dst= =3D3,val=3D15 + -numa dist,src=3D0,dst=3D2,val=3D20 -numa dist,src=3D0,dst= =3D3,val=3D20 + -numa dist,src=3D1,dst=3D2,val=3D20 -numa dist,src=3D1,dst= =3D3,val=3D20" + + # By default we do not set the DNS. + # You override the defaults by setting the below. + #dns: "1.234.567.89" + + # By default we will use a "block" device, but + # you can also boot from a "scsi" device. + # Just keep in mind your scripts might need to change + # As you will have /dev/sda instead of /dev/vda (for block device) + boot_dev_type: "block" + + # By default the ssh port is not fixed. + # A fixed ssh port makes it easier for automated tests. + ssh_port: 5555 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612212; cv=none; d=zohomail.com; s=zohoarc; b=bxQfcjHljonBsTltt5922PsIvjDim9cDjWSptfMgvWqCNoMcgy5n5riki2OWnfCKFfFwERLIUTryzO08l2evgknIj/pc34eyOpFH+Z5T0R3btl8sBCzOGZZHerRvM+zOCHcUTqNYtBZnWWJHVUeZCr20PINApTvRtxEKV0kMCeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612212; 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=yfaWvkBHiSQ15nCnLOaiCfwwNxNyBgCuiCJ/EYYdU+8=; b=EhvtfnzS10oGl8zz9WWO3cmU9G/oBZ5wRYR6g3KjoynOXGLE3fBXE3a0HJSNoqebsmHO1FdXdfCxvqz26NpLA4i5tcuk6KgEO+q5TSbH0etqT2evFK9uI0HuLZ+WOzQVR8diRiU1dE/Qm/rWhSZbdqAzjX1PCddmE7XZkX/5gtA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612212292640.2085334038401; Wed, 1 Jul 2020 07:03:32 -0700 (PDT) Received: from localhost ([::1]:39136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdID-0007dV-RG for importer@patchew.org; Wed, 01 Jul 2020 10:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEX-0002L8-VR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:05 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0005qb-1L for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:05 -0400 Received: by mail-wm1-x342.google.com with SMTP id g10so6887899wmc.1 for ; Wed, 01 Jul 2020 06:57:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p14sm8237564wrj.14.2020.07.01.06.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98A731FF96; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yfaWvkBHiSQ15nCnLOaiCfwwNxNyBgCuiCJ/EYYdU+8=; b=if3EKZ6XTRQMd1n/pE0OW6em6avDjU0f3oZycgdG0PACzBrCszAFZRrdE6E/uGq02o 03E7U7L6Ut92vTxxDRWuktudkQGoA4vHf62J2SlV0TlEdCFWQP8C4+iLIdXmmla9dfIb 6fQGPKHFsOyUo77BHsTM9uEWeEVGH2iexLdXF6qQytjb++kFFTpM23nc62WHjnlW5tTm eZWril+SZ+DacAQnFoMm7kjASMf5bJCMsM3KrPklsjO74XOKuEp/sUY+fDK/QL856nwy jvxyD5/nKgkAZritV+PhnYKU141aBETI5EzMzu55V9KdCTruskmRyi2xbQ3u5GYZ0r+k kI/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yfaWvkBHiSQ15nCnLOaiCfwwNxNyBgCuiCJ/EYYdU+8=; b=s7t76IclMYvrtXvQFLVSUv5ZbYyZQCeCmfJLLlgcwxWGYRTXtFTjXcMzfCka5mH9gG 71avP5cTM5HP9PgbpkwE6tquJv9NRyRBTMvNR8l1hf8mWyuVCaYPjqTRuB+I0YBF8ZSC GOhBCcClhEr3fIUbBRd1fkiP6AChwzSScfnWmWn2fjFXzFxqMDU8uhDOgYxNyVXHk+Qu dybmxP3xT+ynp31UUKdNWtGCYOvjZhY6TR5QQYLtDdgOB5l2OWOIRV8m0yFGeT7UfQDT rB/uiQJjgUyFgjUnwSgaASZb2wYMheQ8UM726mXh/8IXwHx3PtCQCaYv5t2syUNLak71 M5Qw== X-Gm-Message-State: AOAM531ER/WbCkIB+NbYaG/bxS72Nb9mTJ2anTKUEjPAQeN4H5rB1jyh YmVRsd15gvzWGvv33Vr1UCVFlA== X-Google-Smtp-Source: ABdhPJxgaQkbLQ3r1BIXfxh06nFVyQGndyxOblhDImRuy9how6rydjluJkwd92JW82FZSmQ+QEMsYA== X-Received: by 2002:a1c:7204:: with SMTP id n4mr19385880wmc.9.1593611820542; Wed, 01 Jul 2020 06:57:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 08/40] tests/vm: Add common Ubuntu python module Date: Wed, 1 Jul 2020 14:56:20 +0100 Message-Id: <20200701135652.1366-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley Add a common Ubuntu python module and make use of it with the ubuntu.i386 script. This is preparation for adding an Ubuntu script ubuntu.aarch64. Splitting out the common logic such as build_image() will reduce duplication. Signed-off-by: Robert Foley Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-5-robert.foley@linaro.org> --- tests/vm/ubuntu.i386 | 46 +++++++++------------------------ tests/vm/ubuntuvm.py | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 tests/vm/ubuntuvm.py diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 24527cc78c7..5ce72610a6c 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -11,15 +11,22 @@ # the COPYING file in the top-level directory. # =20 -import os import sys -import subprocess import basevm -import time +import ubuntuvm =20 -class UbuntuX86VM(basevm.BaseVM): +DEFAULT_CONFIG =3D { + 'install_cmds' : "apt-get update,"\ + "apt-get build-dep -y qemu,"\ + "apt-get install -y libfdt-dev language-pack-en", +} + +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); @@ -29,34 +36,5 @@ class UbuntuX86VM(basevm.BaseVM): make --output-sync {target} -j{jobs} {verbose}; """ =20 - def build_image(self, img): - cimg =3D self._download_with_cache( - "https://cloud-images.ubuntu.com/releases/bionic/release-20191= 114/ubuntu-18.04-server-cloudimg-i386.img", - sha256sum=3D"28969840626d1ea80bb249c08eef1a4533e8904aa51a327b4= 0f37ac4b4ff04ef") - img_tmp =3D 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 [ - "-device", "VGA", - "-cdrom", self.gen_cloud_init_iso() - ]) - self.wait_ssh() - self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") - self.ssh_root_check("apt-get update") - self.ssh_root_check("apt-get install -y cloud-initramfs-growroot") - # Don't check the status in case the guest hang up too quickly - self.ssh_root("sync && reboot") - time.sleep(5) - self.wait_ssh() - # The previous update sometimes doesn't survive a reboot, so do it= again - self.ssh_root_check("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sour= ces.list") - self.ssh_root_check("apt-get update") - self.ssh_root_check("apt-get build-dep -y qemu") - self.ssh_root_check("apt-get install -y libfdt-dev language-pack-e= n") - self.ssh_root("poweroff") - self.wait() - os.rename(img_tmp, img) - return 0 - if __name__ =3D=3D "__main__": - sys.exit(basevm.main(UbuntuX86VM)) + sys.exit(basevm.main(UbuntuX86VM, DEFAULT_CONFIG)) diff --git a/tests/vm/ubuntuvm.py b/tests/vm/ubuntuvm.py new file mode 100644 index 00000000000..6689ad87aa8 --- /dev/null +++ b/tests/vm/ubuntuvm.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python3 +# +# Ubuntu VM testing library +# +# Copyright 2017 Red Hat Inc. +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# Originally based on ubuntu.i386 Fam Zheng +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. + +import os +import subprocess +import basevm + +class UbuntuVM(basevm.BaseVM): + + def __init__(self, args, config=3DNone): + self.login_prompt =3D "ubuntu-{}-guest login:".format(self.arch) + basevm.BaseVM.__init__(self, args, config) + + def build_image(self, img): + """Build an Ubuntu VM image. The child class will + define the install_cmds to init the VM.""" + os_img =3D self._download_with_cache(self.image_link, + sha256sum=3Dself.image_sha256) + img_tmp =3D img + ".tmp" + subprocess.check_call(["cp", "-f", os_img, img_tmp]) + self.exec_qemu_img("resize", img_tmp, "+50G") + ci_img =3D self.gen_cloud_init_iso() + + self.boot(img_tmp, extra_args =3D [ "-device", "VGA", "-cdrom", ci= _img, ]) + + # First command we issue is fix for slow ssh login. + self.wait_ssh(wait_root=3DTrue, + cmd=3D"chmod -x /etc/update-motd.d/*") + # Wait for cloud init to finish + self.wait_ssh(wait_root=3DTrue, + cmd=3D"ls /var/lib/cloud/instance/boot-finished") + self.ssh_root("touch /etc/cloud/cloud-init.disabled") + # Disable auto upgrades. + # We want to keep the VM system state stable. + self.ssh_root('sed -ie \'s/"1"/"0"/g\' '\ + '/etc/apt/apt.conf.d/20auto-upgrades') + self.ssh_root("sed -ie s/^#\ deb-src/deb-src/g /etc/apt/sources.li= st") + + # If the user chooses not to do the install phase, + # then we will jump right to the graceful shutdown + if self._config['install_cmds'] !=3D "": + # Issue the install commands. + # This can be overriden by the user in the config .yml. + install_cmds =3D self._config['install_cmds'].split(',') + for cmd in install_cmds: + self.ssh_root(cmd) + self.graceful_shutdown() + os.rename(img_tmp, img) + return 0 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612226; cv=none; d=zohomail.com; s=zohoarc; b=gDSEDnbPmyPkHidq/3G+uam4Uws40eVsMTwKE4mb+XDmuBPXMXGkEEtC2fhZ2hGyKcJHD/XBHUqyesLW+eJ43R4srlkLz9R0aJxRCKuyNRuspCQ8cPe7642xiah6o4thXSnyw9vuHpNHPGJRbSTEdAjYJh5hKXgFSVzEO7tEhK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612226; 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=lPp8XkbnsM3c17W7WUUEalp68Xx8V1JQ2Yf70AfovqA=; b=KVOI3jz/sFPycM+lKyrbk21e1x/YBSEnSjaJyOl7Q0Ets4BYfuVeuk5aTRgyPQcbhzt6FFlgSDpMTm7rFyP5xt30P9jI0+AVM6VuB/1qn5vpqbhRf7iULvjDHBrLRSJZcA2FHErXdmi7vAsS6nZdCqs3a4WS5H8K79ITg3EhjAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612226710437.68443827105716; Wed, 1 Jul 2020 07:03:46 -0700 (PDT) Received: from localhost ([::1]:51052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdKz-0004L8-9g for importer@patchew.org; Wed, 01 Jul 2020 10:03:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEa-0002RS-Ii for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:08 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEX-0005rS-JA for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:08 -0400 Received: by mail-wr1-x431.google.com with SMTP id z2so1691298wrp.2 for ; Wed, 01 Jul 2020 06:57:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 207sm8165108wme.13.2020.07.01.06.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B60331FF98; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lPp8XkbnsM3c17W7WUUEalp68Xx8V1JQ2Yf70AfovqA=; b=hs6B33ZuIJP/corK1jB5ucTI9w3eJccTMvFHqd+Wbq40qTGa7ed8yo+pkq7kV2KPuZ dAEGGemtJ43yhk9IDG9vqLODV5/afVYJUlmy/RS+US028CU9Rt8pN8jr4g0XW314ejqh 56T1dy030+ENVNHcUYCT/xEsPH5KubVKH5bubg3J7PY/eDaow2Aku/BNEvAbdno1bJzM FL2D8Lgj9HAPnJezUG6EVXUl7f3hpgEwIsUhroz1WCfpUsOiizn2VG3bl9PiHxCsGovT h0aKfZ6IJWABO3FVCTlTMH0Qw+PdA+t9/XXFJILbCw+opBhEDHInW3Z01+yXJpsiNGJx 3Bhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lPp8XkbnsM3c17W7WUUEalp68Xx8V1JQ2Yf70AfovqA=; b=RmdGBPU9D7BfZs/R2LGAOMQrxFELXIeKwGKxdhmMx21Et8ylDwctqxZUuRW6CY0Klg fDNmugj5OcIkDpqJIhFToyUqClvge1oBSd6W4ju7O6I9WNvMN+A+bgT+JjiuTans0MDF 2J9VUT+sWoPkUqjtft25l8KcFLSxefABOAQAUA6PDkKXmtsAeI+YVQEZkq9ZVlVoo033 aVyc9MXpp+mPVvKMjWDnvkWg8xHGQv3xVxE6kPc/1FB0DexZlnaPNXzWzbYGDc0MBVFU gElW9W1JKlajZbhVqSxiEmNOQMWlD7ZuX1Sxau95L39YAVLlFVlYZsTU51FROBUAh2K4 ls4A== X-Gm-Message-State: AOAM530igDKYAKfAgmVxC3bNYzDw9psSas3h7Up7ex+aAhLoBXlHs+Ou pO8F1v3IGKLO3NuoKd+1kliBxw== X-Google-Smtp-Source: ABdhPJwNzyRXyKa71o1J9mM+/4urUsWcyziLA29ZMC+U5MmN74a3eckER20fy7k9LpPGYIPgYT6stQ== X-Received: by 2002:a5d:484b:: with SMTP id n11mr25751128wrs.320.1593611823980; Wed, 01 Jul 2020 06:57:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 09/40] tests/vm: Added a new script for ubuntu.aarch64. Date: Wed, 1 Jul 2020 14:56:21 +0100 Message-Id: <20200701135652.1366-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley ubuntu.aarch64 provides a script to create an Ubuntu 18.04 VM. Another new file is also added aarch64vm.py, which is a module with common methods used by aarch64 VMs, such as how to create the flash images. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-6-robert.foley@linaro.org> --- configure | 20 +++++++ tests/vm/Makefile.include | 11 ++++ tests/vm/aarch64vm.py | 106 ++++++++++++++++++++++++++++++++++++++ tests/vm/basevm.py | 12 +++++ tests/vm/ubuntu.aarch64 | 68 ++++++++++++++++++++++++ 5 files changed, 217 insertions(+) create mode 100644 tests/vm/aarch64vm.py create mode 100755 tests/vm/ubuntu.aarch64 diff --git a/configure b/configure index 96256be057a..1fb4d5b61e4 100755 --- a/configure +++ b/configure @@ -418,6 +418,7 @@ prefix=3D"/usr/local" mandir=3D"\${prefix}/share/man" datadir=3D"\${prefix}/share" firmwarepath=3D"\${prefix}/share/qemu-firmware" +efi_aarch64=3D"" qemu_docdir=3D"\${prefix}/share/doc/qemu" bindir=3D"\${prefix}/bin" libdir=3D"\${prefix}/lib" @@ -1109,6 +1110,8 @@ for opt do ;; --firmwarepath=3D*) firmwarepath=3D"$optarg" ;; + --efi-aarch64=3D*) efi_aarch64=3D"$optarg" + ;; --host=3D*|--build=3D*|\ --disable-dependency-tracking|\ --sbindir=3D*|--sharedstatedir=3D*|\ @@ -1787,6 +1790,7 @@ Advanced options (experts only): --sysconfdir=3DPATH install config in PATH$confsuffix --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files + --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. --with-confsuffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$confsuffix] --with-pkgversion=3DVERS use specified string as sub-version of the pa= ckage --enable-debug enable common debug build options @@ -3606,6 +3610,20 @@ EOF fi fi =20 +############################################ +# efi-aarch64 probe +# Check for efi files needed by aarch64 VMs. +# By default we will use the efi included with QEMU. +# Allow user to override the path for efi also. +if ! test -f "$efi_aarch64"; then + if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then + # valid after build + efi_aarch64=3D$PWD/pc-bios/edk2-aarch64-code.fd + else + efi_aarch64=3D"" + fi +fi + ########################################## # libcap-ng library probe if test "$cap_ng" !=3D "no" ; then @@ -6850,6 +6868,7 @@ if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi echo "genisoimage $genisoimage" +echo "efi_aarch64 $efi_aarch64" echo "python_yaml $python_yaml" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then @@ -7936,6 +7955,7 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak +echo "EFI_AARCH64=3D$efi_aarch64" >> $config_host_mak echo "PYTHON_YAML=3D$python_yaml" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index f6c3892bb28..4fa292765d5 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -5,6 +5,9 @@ IMAGES :=3D freebsd netbsd openbsd centos fedora ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos +ifneq ($(EFI_AARCH64),) +IMAGES +=3D ubuntu.aarch64 +endif endif =20 IMAGES_DIR :=3D $(HOME)/.cache/qemu-vm/images @@ -23,6 +26,11 @@ vm-help vm-test: 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" +else + @echo " (to build centos/ubuntu aarch64 images use configure --efi-aarch= 64)" +endif else @echo " (install genisoimage to build centos/ubuntu images)" endif @@ -65,6 +73,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(if $(V)$(DEBUG), --debug) \ $(if $(GENISOIMAGE),--genisoimage $(GENISOIMAGE)) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ + $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ --image "$@" \ --force \ --build-image $@, \ @@ -80,6 +89,7 @@ vm-build-%: $(IMAGES_DIR)/%.img $(if $(J),--jobs $(J)) \ $(if $(V),--verbose) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ + $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ --image "$<" \ $(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \ --snapshot \ @@ -102,6 +112,7 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(if $(J),--jobs $(J)) \ $(if $(V)$(DEBUG), --debug) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ + $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ --image "$<" \ --interactive \ false, \ diff --git a/tests/vm/aarch64vm.py b/tests/vm/aarch64vm.py new file mode 100644 index 00000000000..bb04cb19c91 --- /dev/null +++ b/tests/vm/aarch64vm.py @@ -0,0 +1,106 @@ +#!/usr/bin/env python3 +# +# VM testing aarch64 library +# +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# +import os +import sys +import subprocess +import basevm +from qemu.accel import kvm_available + +# This is the config needed for current version of QEMU. +# This works for both kvm and tcg. +CURRENT_CONFIG =3D { + 'cpu' : "max", + 'machine' : "virt,gic-version=3Dmax", +} + +# The minimum minor version of QEMU we will support with aarch64 VMs is 3. +# QEMU versions less than 3 have various issues running these VMs. +QEMU_AARCH64_MIN_VERSION =3D 3 + +# The DEFAULT_CONFIG will default to a version of +# parameters that works for backwards compatibility. +DEFAULT_CONFIG =3D {'kvm' : {'cpu' : "host", + 'machine' : "virt,gic-version=3Dhost"}, + 'tcg' : {'cpu' : "cortex-a57", + 'machine' : "virt"}, +} + +def get_config_defaults(vmcls, default_config): + """Fetch the configuration defaults for this VM, + taking into consideration the defaults for + aarch64 first, followed by the defaults for this VM.""" + config =3D default_config + config.update(aarch_get_config_defaults(vmcls)) + return config + +def aarch_get_config_defaults(vmcls): + """Set the defaults for current version of QEMU.""" + config =3D CURRENT_CONFIG + args, argv =3D basevm.parse_args(vmcls) + qemu_path =3D basevm.get_qemu_path(vmcls.arch, args.build_path) + qemu_version =3D basevm.get_qemu_version(qemu_path) + if qemu_version < QEMU_AARCH64_MIN_VERSION: + error =3D "\nThis major version of QEMU {} is to old for aarch64 V= Ms.\n"\ + "The major version must be at least {}.\n"\ + "To continue with the current build of QEMU, "\ + "please restart with QEMU_LOCAL=3D1 .\n" + print(error.format(qemu_version, QEMU_AARCH64_MIN_VERSION)) + exit(1) + if qemu_version =3D=3D QEMU_AARCH64_MIN_VERSION: + # We have an older version of QEMU, + # set the config values for backwards compatibility. + if kvm_available('aarch64'): + config.update(DEFAULT_CONFIG['kvm']) + else: + config.update(DEFAULT_CONFIG['tcg']) + return config + +def create_flash_images(flash_dir=3D"./", efi_img=3D""): + """Creates the appropriate pflash files + for an aarch64 VM.""" + flash0_path =3D get_flash_path(flash_dir, "flash0") + flash1_path =3D get_flash_path(flash_dir, "flash1") + fd_null =3D open(os.devnull, 'w') + subprocess.check_call(["dd", "if=3D/dev/zero", "of=3D{}".format(flash0= _path), + "bs=3D1M", "count=3D64"], + stdout=3Dfd_null, stderr=3Dsubprocess.STDOUT) + # A reliable way to get the QEMU EFI image is via an installed package= or + # via the bios included with qemu. + if not os.path.exists(efi_img): + sys.stderr.write("*** efi argument is invalid ({})\n".format(efi_i= mg)) + sys.stderr.write("*** please check --efi-aarch64 argument or "\ + "install qemu-efi-aarch64 package\n") + exit(3) + subprocess.check_call(["dd", "if=3D{}".format(efi_img), + "of=3D{}".format(flash0_path), + "conv=3Dnotrunc"], + stdout=3Dfd_null, stderr=3Dsubprocess.STDOUT) + subprocess.check_call(["dd", "if=3D/dev/zero", + "of=3D{}".format(flash1_path), + "bs=3D1M", "count=3D64"], + stdout=3Dfd_null, stderr=3Dsubprocess.STDOUT) + fd_null.close() + +def get_pflash_args(flash_dir=3D"./"): + """Returns a string that can be used to + boot qemu using the appropriate pflash files + for aarch64.""" + flash0_path =3D get_flash_path(flash_dir, "flash0") + flash1_path =3D get_flash_path(flash_dir, "flash1") + pflash_args_str =3D "-drive file=3D{},format=3Draw,if=3Dpflash "\ + "-drive file=3D{},format=3Draw,if=3Dpflash" + pflash_args =3D pflash_args_str.format(flash0_path, flash1_path) + return pflash_args.split(" ") + +def get_flash_path(flash_dir, name): + return os.path.join(flash_dir, "{}.img".format(name)) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index fa56fbbb4b6..5fd66f6b26a 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -92,6 +92,7 @@ class BaseVM(object): self._guest =3D None self._genisoimage =3D args.genisoimage self._build_path =3D args.build_path + self._efi_aarch64 =3D args.efi_aarch64 # Allow input config to override defaults. self._config =3D DEFAULT_CONFIG.copy() if config !=3D None: @@ -496,6 +497,14 @@ def get_qemu_path(arch, build_path=3DNone): qemu_path =3D "qemu-system-" + arch return qemu_path =20 +def get_qemu_version(qemu_path): + """Get the version number from the current QEMU, + and return the major number.""" + output =3D subprocess.check_output([qemu_path, '--version']) + version_line =3D output.decode("utf-8") + version_num =3D re.split(' |\(', version_line)[3].split('.')[0] + return int(version_num) + def parse_config(config, args): """ Parse yaml config and populate our config structure. The yaml config allows the user to override the @@ -573,6 +582,9 @@ def parse_args(vmcls): parser.add_option("--config", "-c", default=3DNone, help=3D"Provide config yaml for configuration. "\ "See config_example.yaml for example.") + parser.add_option("--efi-aarch64", + default=3D"/usr/share/qemu-efi-aarch64/QEMU_EFI.fd", + help=3D"Path to efi image for aarch64 VMs.") parser.disable_interspersed_args() return parser.parse_args() =20 diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 new file mode 100755 index 00000000000..21d454c27f1 --- /dev/null +++ b/tests/vm/ubuntu.aarch64 @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 +# +# Ubuntu aarch64 image +# +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# Originally based on ubuntu.i386 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 aarch64vm +import ubuntuvm + +DEFAULT_CONFIG =3D { + 'cpu' : "cortex-a57", + 'machine' : "virt,gic-version=3D3", + 'install_cmds' : "apt-get update,"\ + "apt-get build-dep -y --arch-only qemu,"\ + "apt-get install -y libfdt-dev pkg-config language-pa= ck-en", + # We increase beyond the default time since during boot + # it can take some time (many seconds) to log into the VM + # especially using softmmu. + 'ssh_timeout' : 60, +} + +class UbuntuAarch64VM(ubuntuvm.UbuntuVM): + name =3D "ubuntu.aarch64" + arch =3D "aarch64" + 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" + BUILD_SCRIPT =3D """ + set -e; + cd $(mktemp -d); + sudo chmod a+r /dev/vdb; + tar --checkpoint=3D.10 -xf /dev/vdb; + ./configure {configure_opts}; + make --output-sync {target} -j{jobs} {verbose}; + """ + def boot(self, img, extra_args=3DNone): + aarch64vm.create_flash_images(self._tmpdir, self._efi_aarch64) + default_args =3D aarch64vm.get_pflash_args(self._tmpdir) + if extra_args: + extra_args.extend(default_args) + else: + extra_args =3D default_args + # We always add these performance tweaks + # because without them, we boot so slowly that we + # can time out finding the boot efi device. + if '-smp' not in extra_args and \ + '-smp' not in self._config['extra_args'] and \ + '-smp' not in self._args: + # Only add if not already there to give caller option to chang= e it. + extra_args.extend(["-smp", "8"]) + + # We have overridden boot() since aarch64 has additional parameter= s. + # Call down to the base class method. + super(UbuntuAarch64VM, self).boot(img, extra_args=3Dextra_args) + +if __name__ =3D=3D "__main__": + defaults =3D aarch64vm.get_config_defaults(UbuntuAarch64VM, DEFAULT_CO= NFIG) + sys.exit(basevm.main(UbuntuAarch64VM, defaults)) --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612181; cv=none; d=zohomail.com; s=zohoarc; b=k9uu/pfoyUObzWRqnPerSGmpiuF/zsmbcimQTUOvpZZjNRlIV+U4sIsoV9l+mxGfw+h4bJEk/5dR9+qWMaRVmz+zO4gRohfUx/YKgAPAFhXNLujfB5GGPO7DR0E6nMNBWCmk82wRlY6cXHPT+zNOhH3Vh01jcEKlV9W/sXW9FUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612181; 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=kdMIZtPe+aZda1/mXQW7aQb8KseTM0tT+oUaOxEz8I4=; b=m2OmVGLOx1DjYc2YoswYciXGtsBRCJSCdULw13qKDI4kjwNUIOGoi5qnhDJ/M4kVrr05wNG5qtGPe5Bgx5liWspiv4MO4nDaxTKkAuPQORJ2OoXWfhBiO4qboafbRCcAgfM1kUmz+7uWCxJfpCcL4G5YStq1ae0Z6mECSs7fd90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159361218145371.53186477619238; Wed, 1 Jul 2020 07:03:01 -0700 (PDT) Received: from localhost ([::1]:47546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdKG-0002pk-6J for importer@patchew.org; Wed, 01 Jul 2020 10:03:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEY-0002NV-UA for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:06 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35406) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0005qj-2Z for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:06 -0400 Received: by mail-wr1-x442.google.com with SMTP id z2so1691002wrp.2 for ; Wed, 01 Jul 2020 06:57:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g13sm7916366wro.84.2020.07.01.06.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D0AB81FF99; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kdMIZtPe+aZda1/mXQW7aQb8KseTM0tT+oUaOxEz8I4=; b=FUi1Ug+K06dvncuG77Qt7vxbcICGi5I+96sl4/hStG1FXbAG7SZQuuw5bMGbjeErhi lT04KV0E+95hhsgHwEAqw1O+zhxG5SLaaPL/Q5bMIrJB2Msft6fTpe1+CrVtboUhjynS gJrs+JSANAKdk+QzHbMpsiwMb3XGUqWTyVzE1Vvi/DZVP+UVLxjTqTykyFL7/iu3uLEk esn52Tmo5/hyBzmRjAqV7/cqRWWgeKS2BUA8n2rTSSFn+oyrJtHb9PuZ3ywwiD6vJCbb 1bGrUT/w8CoZ6h1O9oYyzItl6kRdBqx497WJKIXRpUDDFopLzyfphH4idRqP4FdqBort a9bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kdMIZtPe+aZda1/mXQW7aQb8KseTM0tT+oUaOxEz8I4=; b=Ym+hKxRV2P9AcUkFwjzy9My1lIBeHLo4f1w6qwt4A6lN68Kp7Vuai15RHf0RsmsmxH Z3AcbcFjdKyRpTgt4HGTIhx/zSdyr7xJDsspyYKaJGVQ7MYuL3+526yWCWFy+v+ws88w bdAte4G7eafvbnBS7bRQwTe6q/OrnshPeS9sJ404lpwts+iBx7CFm+j4emDr6KA1edVf 0OjY7n+MqPBvuQCMTfSBGr9g1mWpMdygzXaVh8+B9wAONOoFydMi7zwp8QJYucp9lFOa wU25PgyXCb0rZpCVyeS13W59la77c5K5iMXY37xBSfXiIDS5FMPkwdyJ5ldsTDsKaNyd mfzg== X-Gm-Message-State: AOAM532pUyZ+b3qZbssain1aWyahrpIkr6cSGjsjMcEIPPUWo2YstljW KpYkzthn2949uQwmTENMLLh6rA== X-Google-Smtp-Source: ABdhPJxtH5F2ccF9Sf0g/KGEp/TTW7HRV9prurF3v2hg8yhY0PkHJLfoGuBHMZROTuZL7M3/bDpV/Q== X-Received: by 2002:a05:6000:1008:: with SMTP id a8mr27719999wrx.416.1593611820666; Wed, 01 Jul 2020 06:57:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 10/40] tests/vm: Added a new script for centos.aarch64. Date: Wed, 1 Jul 2020 14:56:22 +0100 Message-Id: <20200701135652.1366-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley centos.aarch64 creates a CentOS 8 image. Also added a new kickstart script used to build the centos.aarch64 image. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-7-robert.foley@linaro.org> --- tests/vm/Makefile.include | 3 +- tests/vm/centos-8-aarch64.ks | 51 ++++++++ tests/vm/centos.aarch64 | 227 +++++++++++++++++++++++++++++++++++ 3 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 tests/vm/centos-8-aarch64.ks create mode 100755 tests/vm/centos.aarch64 diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 4fa292765d5..39f918a430a 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -6,7 +6,7 @@ IMAGES :=3D freebsd netbsd openbsd centos fedora ifneq ($(GENISOIMAGE),) IMAGES +=3D ubuntu.i386 centos ifneq ($(EFI_AARCH64),) -IMAGES +=3D ubuntu.aarch64 +IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif endif =20 @@ -28,6 +28,7 @@ ifneq ($(GENISOIMAGE),) @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" else @echo " (to build centos/ubuntu aarch64 images use configure --efi-aarch= 64)" endif diff --git a/tests/vm/centos-8-aarch64.ks b/tests/vm/centos-8-aarch64.ks new file mode 100644 index 00000000000..fd6ebe4d49e --- /dev/null +++ b/tests/vm/centos-8-aarch64.ks @@ -0,0 +1,51 @@ +# CentOS aarch64 image kickstart file. +# This file is used by the CentOS installer to +# script the generation of the image. +# +# Copyright 2020 Linaro +# +ignoredisk --only-use=3Dvda +# System bootloader configuration +bootloader --append=3D" crashkernel=3Dauto" --location=3Dmbr --boot-drive= =3Dvda +autopart --type=3Dplain +# Partition clearing information +clearpart --linux --initlabel --drives=3Dvda +# Use text mode install +text +repo --name=3D"AppStream" --baseurl=3Dfile:///run/install/repo/AppStream +# Use CDROM installation media +cdrom +# Keyboard layouts +keyboard --vckeymap=3Dus --xlayouts=3D'' +# System language +lang en_US.UTF-8 + +# Network information +network --bootproto=3Ddhcp --device=3Denp0s1 --onboot=3Doff --ipv6=3Dauto= --no-activate +network --hostname=3Dlocalhost.localdomain +# Run the Setup Agent on first boot +firstboot --enable +# Do not configure the X Window System +skipx +# System services +services --enabled=3D"chronyd" +# System timezone +timezone America/New_York --isUtc + +# Shutdown after installation is complete. +shutdown + +%packages +@^server-product-environment +kexec-tools + +%end + +%addon com_redhat_kdump --enable --reserve-mb=3D'auto' + +%end +%anaconda +pwpolicy root --minlen=3D6 --minquality=3D1 --notstrict --nochanges --note= mpty +pwpolicy user --minlen=3D6 --minquality=3D1 --notstrict --nochanges --empt= yok +pwpolicy luks --minlen=3D6 --minquality=3D1 --notstrict --nochanges --note= mpty +%end diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 new file mode 100755 index 00000000000..d5232ecdb8c --- /dev/null +++ b/tests/vm/centos.aarch64 @@ -0,0 +1,227 @@ +#!/usr/bin/env python3 +# +# Centos aarch64 image +# +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# Originally based on ubuntu.aarch64 +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# + +import os +import sys +import subprocess +import basevm +import time +import traceback +import aarch64vm + +DEFAULT_CONFIG =3D { + 'cpu' : "max", + 'machine' : "virt,gic-version=3Dmax", + 'install_cmds' : "yum install -y make git python3 gcc gcc-c++ flex bis= on, "\ + "yum install -y glib2-devel pixman-devel zlib-devel, "\ + "yum install -y perl-Test-Harness, "\ + "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", + # We increase beyond the default time since during boot + # it can take some time (many seconds) to log into the VM. + 'ssh_timeout' : 60, +} + +class CentosAarch64VM(basevm.BaseVM): + name =3D "centos.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_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; + ./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 "../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]) + + def boot(self, img, extra_args=3DNone): + aarch64vm.create_flash_images(self._tmpdir, self._efi_aarch64) + default_args =3D aarch64vm.get_pflash_args(self._tmpdir) + if extra_args: + extra_args.extend(default_args) + else: + extra_args =3D default_args + # We always add these performance tweaks + # because without them, we boot so slowly that we + # can time out finding the boot efi device. + if '-smp' not in extra_args and \ + '-smp' not in self._config['extra_args'] and \ + '-smp' not in self._args: + # Only add if not already there to give caller option to chang= e it. + extra_args.extend(["-smp", "8"]) + # We have overridden boot() since aarch64 has additional parameter= s. + # Call down to the base class method. + super(CentosAarch64VM, self).boot(img, extra_args=3Dextra_args) + + def build_image(self, img): + 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. + self.wait_ssh(wait_root=3DTrue) + + # 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("poweroff") + self.wait_for_shutdown() + os.rename(img_tmp, img) + print("image creation complete: {}".format(img)) + return 0 + +if __name__ =3D=3D "__main__": + defaults =3D aarch64vm.get_config_defaults(CentosAarch64VM, DEFAULT_CO= NFIG) + sys.exit(basevm.main(CentosAarch64VM, defaults)) --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612179; cv=none; d=zohomail.com; s=zohoarc; b=eVRVIdIp7/5BsTxkiPDLNjemApDc7gFtTNcLV8JUBa/RUCQu9d2YtO7zcRaOkMa+g9gEZ2ONY2nlInV4Q51Lr1WndFhJAW65OvuILE4t7hChsUWBd/KZW4xx3Kl6Zt4oNo/gSsRzp6sWDD4qmeCoc/t6kAHMy7Z266usSFn7eck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612179; 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=i1iXs9z8IgQzO10xR7jkeUaTbh6mNju7MyNOqxfnXxI=; b=V5ePZDuqqN8np+4aEJ3ixKaY6KszksUfyea2gKrvrYX3URPDWz7yDr7B2R8RbdQDilzT2bDCUk3TD1VAbeb/i5CuqtZQ148DGByEp8n281tay1gTB6E8+X0PBz4T0yuOIv+ipTbJtqOZQ81kYfHi5rtVu5nEJJ0QKqaxuTfrt3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612179613876.5207128139216; Wed, 1 Jul 2020 07:02:59 -0700 (PDT) Received: from localhost ([::1]:47344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdKE-0002kg-CJ for importer@patchew.org; Wed, 01 Jul 2020 10:02:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEW-0002Hr-Pt for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:04 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:33189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0005qh-3A for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:04 -0400 Received: by mail-wr1-x443.google.com with SMTP id f18so15894175wrs.0 for ; Wed, 01 Jul 2020 06:57:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m16sm2290292wro.0.2020.07.01.06.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ED8C71FF9A; Wed, 1 Jul 2020 14:56:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i1iXs9z8IgQzO10xR7jkeUaTbh6mNju7MyNOqxfnXxI=; b=mK8K0+v2XHDmu0l81RPUdLR5im+XLOMLQ1hS4q0wTM72Xcw9c18pu5xFAFwZqVlLRU cE7icoQVOR1c1e74nf1Cj8Nn0EBRUUPMaHQdha9IzZtP+nVf5OAyp9XqNmqxa7uOboeK vCrcMLUdkHhhIfbr5JIbLruhtNfgvhhriY5H9da895iOaw/MAZp0T62NVIWgU6qtwmVg vAAnSfS9XKce6Z6xOlrt3s6fbwlgDxjxNtMfj6pg5ubeMpLr2q1T8U05n56osaStKkr0 igr7jkAvkT1J9LP4FxCgjYyExF9rzfh8CoumZA2tCcsUtmmsOM7SVXmzp7GK+Cu+m1bp yQeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i1iXs9z8IgQzO10xR7jkeUaTbh6mNju7MyNOqxfnXxI=; b=PCyKmWG+JAAnJRtVWPWk6Xd7mpFO0mNCBKHFze/32dr5idoOf2V/At7Mv89XeWvzvU IIp056hw+6HMVZz+19jvq8pDJ5r4LqHOLoP3+q4vzqxPvFzs/RTocWs3Qk7UTNBx0MF9 7XJc/pR5d/L+tuPPf6C0jRylkdjCuBtTZ7jptTsc1juY9BVzR4CuwBzen+w5ukwX81Ty ymWVroA7MKdHPijoAlWwrvTG6Dnp6eq9oJhfN+xLjHlY4y8DGauNrERlFHT41SaOjOKc 7BMpMeNK1GbSeWO8x/60fWD5R8xdx3n/n35xQ7a9fFj4ii8eA5mNOIg+qTrZ0GY9iZP0 jSQw== X-Gm-Message-State: AOAM530L2JCsRQ72OAHnVjh3H6HX1LzoqGOFSGcB+OQbEw/xp/GZpK7m p9vESYA1XVS84G/wNidd4ow+fg== X-Google-Smtp-Source: ABdhPJxNBn+b+8NMpw/uISJXyRhMl5PvyVgEOJmzBKKXXb6VbRJmkEax2imsSf0VtP3wfRGzA1qkDg== X-Received: by 2002:adf:e74e:: with SMTP id c14mr28404490wrn.143.1593611820650; Wed, 01 Jul 2020 06:57:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 11/40] tests/vm: change scripts to use self._config Date: Wed, 1 Jul 2020 14:56:23 +0100 Message-Id: <20200701135652.1366-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley This change converts existing scripts to using for example self.ROOT_PASS, to self._config['root_pass']. We made similar changes for GUEST_USER, and GUEST_PASS. This allows us also to remove the change in basevm.py, which adds __getattr__ for backwards compatibility. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200601211421.1277-8-robert.foley@linaro.org> --- tests/vm/basevm.py | 11 ++--------- tests/vm/fedora | 17 +++++++++-------- tests/vm/freebsd | 16 ++++++++-------- tests/vm/netbsd | 19 ++++++++++--------- tests/vm/openbsd | 17 +++++++++-------- 5 files changed, 38 insertions(+), 42 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5fd66f6b26a..f716798b405 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -183,13 +183,6 @@ class BaseVM(object): self.console_init(timeout=3Dtimeout) self.console_wait(wait_string) =20 - def __getattr__(self, name): - # Support direct access to config by key. - # for example, access self._config['cpu'] by self.cpu - if name.lower() in self._config.keys(): - return self._config[name.lower()] - return object.__getattribute__(self, name) - def _download_with_cache(self, url, sha256sum=3DNone, sha512sum=3DNone= ): def check_sha256sum(fname): if not sha256sum: @@ -239,13 +232,13 @@ class BaseVM(object): return r =20 def ssh(self, *cmd): - return self._ssh_do(self.GUEST_USER, cmd, False) + return self._ssh_do(self._config["guest_user"], cmd, False) =20 def ssh_root(self, *cmd): return self._ssh_do("root", cmd, False) =20 def ssh_check(self, *cmd): - self._ssh_do(self.GUEST_USER, cmd, True) + self._ssh_do(self._config["guest_user"], cmd, True) =20 def ssh_root_check(self, *cmd): self._ssh_do("root", cmd, True) diff --git a/tests/vm/fedora b/tests/vm/fedora index a9195670f4b..b2b478fdbca 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -108,20 +108,20 @@ class FedoraVM(basevm.BaseVM): =20 self.console_wait_send("7) [!] Root password", "7\n") self.console_wait("Password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("Password (confirm):") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) =20 self.console_wait_send("8) [ ] User creation", "8\n") self.console_wait_send("1) [ ] Create user", "1\n") self.console_wait_send("3) User name", "3\n") - self.console_wait_send("ENTER:", "%s\n" % self.GUEST_USER) + self.console_wait_send("ENTER:", "%s\n" % self._config["guest_user= "]) self.console_wait_send("4) [ ] Use password", "4\n") self.console_wait_send("5) Password", "5\n") self.console_wait("Password:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("Password (confirm):") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait_send("7) Groups", "c\n") =20 while True: @@ -139,7 +139,7 @@ class FedoraVM(basevm.BaseVM): if good: break time.sleep(10) - self.console_send("r\n" % self.GUEST_PASS) + self.console_send("r\n" % self._config["guest_pass"]) =20 self.console_wait_send("'b' to begin install", "b\n") =20 @@ -150,12 +150,13 @@ class FedoraVM(basevm.BaseVM): =20 # setup qemu user prompt =3D " ~]$" - self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_ssh_init(prompt, self._config["guest_user"], + self._config["guest_pass"]) self.console_wait_send(prompt, "exit\n") =20 # setup root user prompt =3D " ~]#" - self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_ssh_init(prompt, "root", self._config["root_pass"]) self.console_sshd_config(prompt) =20 # setup virtio-blk #1 (tarfile) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index f87db2b126e..29252fa4a64 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -113,9 +113,9 @@ class FreeBSDVM(basevm.BaseVM): =20 # post-install configuration self.console_wait("New Password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("Retype New Password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) =20 self.console_wait_send("Network Configuration", "\n") self.console_wait_send("IPv4", "y") @@ -134,9 +134,9 @@ class FreeBSDVM(basevm.BaseVM): # qemu user self.console_wait_send("Add User Accounts", "y") self.console_wait("Username") - self.console_send("%s\n" % self.GUEST_USER) + self.console_send("%s\n" % self._config["guest_user"]) self.console_wait("Full name") - self.console_send("%s\n" % self.GUEST_USER) + self.console_send("%s\n" % self._config["guest_user"]) self.console_wait_send("Uid", "\n") self.console_wait_send("Login group", "\n") self.console_wait_send("Login group", "\n") @@ -148,9 +148,9 @@ class FreeBSDVM(basevm.BaseVM): self.console_wait_send("Use an empty password", "\n") self.console_wait_send("Use a random password", "\n") self.console_wait("Enter password:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("Enter password again:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait_send("Lock out", "\n") self.console_wait_send("OK", "yes\n") self.console_wait_send("Add another user", "no\n") @@ -164,12 +164,12 @@ class FreeBSDVM(basevm.BaseVM): =20 # setup qemu user prompt =3D "$" - self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_ssh_init(prompt, self._config["guest_user"], self._co= nfig["guest_pass"]) self.console_wait_send(prompt, "exit\n") =20 # setup root user prompt =3D "root@freebsd:~ #" - self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_ssh_init(prompt, "root", self._config["root_pass"]) self.console_sshd_config(prompt) =20 # setup serial console diff --git a/tests/vm/netbsd b/tests/vm/netbsd index cdac502dad8..dc0e45c1d45 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -120,24 +120,24 @@ class NetBSDVM(basevm.BaseVM): self.console_wait_send("d: Change root password", "d\n") self.console_wait_send("a: Yes", "a\n") self.console_wait("New password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("New password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("Retype new password:") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) =20 self.console_wait_send("o: Add a user", "o\n") self.console_wait("username") - self.console_send("%s\n" % self.GUEST_USER) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("to group wheel") self.console_wait_send("a: Yes", "a\n") self.console_wait_send("a: /bin/sh", "a\n") self.console_wait("New password:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("New password:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("Retype new password:") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) =20 self.console_wait_send("a: Configure network", "a\n") self.console_wait_send("a: vioif0", "a\n") @@ -170,12 +170,13 @@ class NetBSDVM(basevm.BaseVM): =20 # setup qemu user prompt =3D "localhost$" - self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_ssh_init(prompt, self._config["guest_user"], + self._config["guest_pass"]) self.console_wait_send(prompt, "exit\n") =20 # setup root user prompt =3D "localhost#" - self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_ssh_init(prompt, "root", self._config["root_pass"]) self.console_sshd_config(prompt) =20 # setup virtio-blk #1 (tarfile) diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 13e7f9a6d56..dfe633e4532 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -98,9 +98,9 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait_send("Which network interface", "done\n") self.console_wait_send("DNS domain name", "localnet\n") self.console_wait("Password for root account") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait("Password for root account") - self.console_send("%s\n" % self.ROOT_PASS) + self.console_send("%s\n" % self._config["root_pass"]) self.console_wait_send("Start sshd(8)", "yes\n") self.console_wait_send("X Window System", "\n") self.console_wait_send("xenodm", "\n") @@ -108,13 +108,13 @@ class OpenBSDVM(basevm.BaseVM): self.console_wait_send("Which speed", "\n") =20 self.console_wait("Setup a user") - self.console_send("%s\n" % self.GUEST_USER) + self.console_send("%s\n" % self._config["guest_user"]) self.console_wait("Full name") - self.console_send("%s\n" % self.GUEST_USER) + self.console_send("%s\n" % self._config["guest_user"]) self.console_wait("Password") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) self.console_wait("Password") - self.console_send("%s\n" % self.GUEST_PASS) + self.console_send("%s\n" % self._config["guest_pass"]) =20 self.console_wait_send("Allow root ssh login", "yes\n") self.console_wait_send("timezone", "UTC\n") @@ -135,12 +135,13 @@ class OpenBSDVM(basevm.BaseVM): =20 # setup qemu user prompt =3D "$" - self.console_ssh_init(prompt, self.GUEST_USER, self.GUEST_PASS) + self.console_ssh_init(prompt, self._config["guest_user"], + self._config["guest_pass"]) self.console_wait_send(prompt, "exit\n") =20 # setup root user prompt =3D "openbsd#" - self.console_ssh_init(prompt, "root", self.ROOT_PASS) + self.console_ssh_init(prompt, "root", self._config["root_pass"]) self.console_sshd_config(prompt) =20 # setup virtio-blk #1 (tarfile) --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593611929; cv=none; d=zohomail.com; s=zohoarc; b=NZJ+MLsOG9DkJSBQ705x9zkoCVb0rafdgqLnACkOqNYRWfX3werW25vK1RHbPVaQnFW5E4JrFnjQR4fYr9byZV5K6MLHWywbSKWvf+t7RAbHu3OEb6tMln7aamnWzcVojNy5zvCzCFZzppyb8HDuGWMgehdoBj1+1cxDxd3IR3k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593611929; 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=SfCKKjXRpSzktD2zHuCdVYnzBzWod3odSIiX8dUA3RA=; b=Ejbn3f71blrI50c3qTj1M4MFxi+f+aH4iYfAOloag7DrdxUrFFLs6PutnYRD/BVwqVhAvx+HgqWxM/wKEpUu7yu/guduH8/ZslyudVbLsdlowzRwuOOnHle6l6rZS8iGz0h/tHqoPpG2FCpEj+unm4FFZJ9cjIt6rPDKQKXSx5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15936119297321008.8836771322968; Wed, 1 Jul 2020 06:58:49 -0700 (PDT) Received: from localhost ([::1]:59430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdGC-0004DS-1U for importer@patchew.org; Wed, 01 Jul 2020 09:58:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEW-0002GO-9M for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:04 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEU-0005qf-1O for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:03 -0400 Received: by mail-wr1-x429.google.com with SMTP id f18so15894173wrs.0 for ; Wed, 01 Jul 2020 06:57:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m10sm7591235wru.4.2020.07.01.06.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 120261FF9B; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfCKKjXRpSzktD2zHuCdVYnzBzWod3odSIiX8dUA3RA=; b=i294gKmZN5zM7PdcVVtjoT8BgbgU+sITZj9GRH188Haxc44gPR8swMvV3ZFu37tJf3 rXl8rtKvoi8jpwQyfUMaWx77y57ZGw000LGfUNoyyEIH2B6/fRrJ1jNxklLzKUQWQsju nfm/1IcfX4LjmB3ZRZ+swt24BL2jOzHdjK0oAazcMZmgxRUsqLZOZSre260VIkATgkFl uCUlYDs0gzSBmcEqAUWTqAeEiRrs4JXBx/8yp3Thft46CPHG9WhBoFSLC8TxI1ESOXE6 wFaZOxJWaCUqFd1/bJ6WS/8LkV0Rz+nyxum5q90d4NgjRNlvp38z6DHeKjqjzV/iATO2 PETQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SfCKKjXRpSzktD2zHuCdVYnzBzWod3odSIiX8dUA3RA=; b=oTVsErJ2X5H9h2MoHhC5hz+WqxJ4vVwdllyO2LVuDxetamDHwlA2mU52fN92Tnb6kn w5wk+5fC0xKh69d8XYro/1otZ4Rv7X9yUZlfPGziIaPfeFlIw09UT75ziv5lUYAqmDiR 2gbYgTnGCStzOpi19L0j5heHxp/DoRRgy759QaF/U2Axwkgu/jH/BxWBYINo8VySw1C8 B7F+EPKgWemDl1Mh21pRwkYlPdPhtOL8yhWtKOId3xG6kofahM8Y63e/iEtrH3OvYkMX Zr7jdkoyM3W52lW7e3jjuvr5AB727LbB8GzhSqtLYkl5YRFJFouCSxCTG7ATU3L9LoV6 8L2A== X-Gm-Message-State: AOAM532XoR0/OEfqSPOYESBNDIP/t1zDDPBNAFwo/+qP5szqNUWhZna6 7oJeijWy6x/TXZHiZZiYBDaEGA== X-Google-Smtp-Source: ABdhPJxUe0Bo3A8SG/w0WyQRp64W5da9vG/YhhdplMJhzv1Fdc58h1LAAa4fqkqDVrLBpdl1dWUMSA== X-Received: by 2002:a5d:6b08:: with SMTP id v8mr28106613wrw.2.1593611820670; Wed, 01 Jul 2020 06:57:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 12/40] python/qemu: Add ConsoleSocket for optional use in QEMUMachine Date: Wed, 1 Jul 2020 14:56:24 +0100 Message-Id: <20200701135652.1366-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Cleber Rosa , Peter Puhov , aurelien@aurel32.net, Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley We add the ConsoleSocket object, which has a socket interface and which will consume all arriving characters on the socket, placing them into an in memory buffer. This will also provide those chars via recv() as would a regular socket. ConsoleSocket also has the option of dumping the console bytes to a log file. We also give QEMUMachine the option of using ConsoleSocket to drain and to use for logging console to a file. By default QEMUMachine does not use ConsoleSocket. This is added in preparation for use by basevm.py in a later commit. This is a workaround we found was needed for basevm.py since there is a known issue where QEMU will hang waiting for console characters to be consumed. Cc: Eduardo Habkost Cc: Cleber Rosa Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Acked-by: Alex Benn=C3=A9e Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-9-robert.foley@linaro.org> --- python/qemu/console_socket.py | 110 ++++++++++++++++++++++++++++++++++ python/qemu/machine.py | 23 +++++-- 2 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 python/qemu/console_socket.py diff --git a/python/qemu/console_socket.py b/python/qemu/console_socket.py new file mode 100644 index 00000000000..830cb7c6282 --- /dev/null +++ b/python/qemu/console_socket.py @@ -0,0 +1,110 @@ +#!/usr/bin/env python3 +# +# This python module implements a ConsoleSocket object which is +# designed always drain the socket itself, and place +# the bytes into a in memory buffer for later processing. +# +# Optionally a file path can be passed in and we will also +# dump the characters to this file for debug. +# +# Copyright 2020 Linaro +# +# Authors: +# Robert Foley +# +# This code is licensed under the GPL version 2 or later. See +# the COPYING file in the top-level directory. +# +import asyncore +import socket +import threading +import io +import os +import sys +from collections import deque +import time +import traceback + +class ConsoleSocket(asyncore.dispatcher): + + def __init__(self, address, file=3DNone): + self._recv_timeout_sec =3D 300 + self._buffer =3D deque() + self._asyncore_thread =3D None + self._sock =3D socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self._sock.connect(address) + self._logfile =3D None + if file: + self._logfile =3D open(file, "w") + asyncore.dispatcher.__init__(self, sock=3Dself._sock) + self._open =3D True + self._thread_start() + + def _thread_start(self): + """Kick off a thread to wait on the asyncore.loop""" + if self._asyncore_thread is not None: + return + self._asyncore_thread =3D threading.Thread(target=3Dasyncore.loop, + kwargs=3D{'timeout':1}) + self._asyncore_thread.daemon =3D True + self._asyncore_thread.start() + + def handle_close(self): + """redirect close to base class""" + # Call the base class close, but not self.close() since + # handle_close() occurs in the context of the thread which + # self.close() attempts to join. + asyncore.dispatcher.close(self) + + def close(self): + """Close the base object and wait for the thread to terminate""" + if self._open: + self._open =3D False + asyncore.dispatcher.close(self) + if self._asyncore_thread is not None: + thread, self._asyncore_thread =3D self._asyncore_thread, N= one + thread.join() + if self._logfile: + self._logfile.close() + self._logfile =3D None + + def handle_read(self): + """process arriving characters into in memory _buffer""" + try: + data =3D asyncore.dispatcher.recv(self, 1) + # latin1 is needed since there are some chars + # we are receiving that cannot be encoded to utf-8 + # such as 0xe2, 0x80, 0xA6. + string =3D data.decode("latin1") + except: + print("Exception seen.") + traceback.print_exc() + return + if self._logfile: + self._logfile.write("{}".format(string)) + self._logfile.flush() + for c in string: + self._buffer.extend(c) + + def recv(self, n=3D1, sleep_delay_s=3D0.1): + """Return chars from in memory buffer""" + start_time =3D time.time() + while len(self._buffer) < n: + time.sleep(sleep_delay_s) + elapsed_sec =3D time.time() - start_time + if elapsed_sec > self._recv_timeout_sec: + raise socket.timeout + chars =3D ''.join([self._buffer.popleft() for i in range(n)]) + # We choose to use latin1 to remain consistent with + # handle_read() and give back the same data as the user would + # receive if they were reading directly from the + # socket w/o our intervention. + return chars.encode("latin1") + + def set_blocking(self): + """Maintain compatibility with socket API""" + pass + + def settimeout(self, seconds): + """Set current timeout on recv""" + self._recv_timeout_sec =3D seconds diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 041c615052e..c25f0b42cf6 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -26,6 +26,7 @@ import socket import tempfile from typing import Optional, Type from types import TracebackType +from qemu.console_socket import ConsoleSocket =20 from . import qmp =20 @@ -75,7 +76,8 @@ class QEMUMachine: =20 def __init__(self, binary, args=3DNone, wrapper=3DNone, name=3DNone, test_dir=3D"/var/tmp", monitor_address=3DNone, - socket_scm_helper=3DNone, sock_dir=3DNone): + socket_scm_helper=3DNone, sock_dir=3DNone, + drain_console=3DFalse, console_log=3DNone): ''' Initialize a QEMUMachine =20 @@ -86,6 +88,9 @@ class QEMUMachine: @param test_dir: where to create socket and log file @param monitor_address: address for QMP monitor @param socket_scm_helper: helper program, required for send_fd_scm= () + @param sock_dir: where to create socket (overrides test_dir for so= ck) + @param console_log: (optional) path to console log file + @param drain_console: (optional) True to drain console socket to b= uffer @note: Qemu process is not started until launch() is used. ''' if args is None: @@ -122,6 +127,12 @@ class QEMUMachine: self._console_address =3D None self._console_socket =3D None self._remove_files =3D [] + self._console_log_path =3D console_log + if self._console_log_path: + # In order to log the console, buffering needs to be enabled. + self._drain_console =3D True + else: + self._drain_console =3D drain_console =20 def __enter__(self): return self @@ -580,7 +591,11 @@ class QEMUMachine: Returns a socket connected to the console """ if self._console_socket is None: - self._console_socket =3D socket.socket(socket.AF_UNIX, - socket.SOCK_STREAM) - self._console_socket.connect(self._console_address) + if self._drain_console: + self._console_socket =3D ConsoleSocket(self._console_addre= ss, + file=3Dself._console_l= og_path) + else: + self._console_socket =3D socket.socket(socket.AF_UNIX, + socket.SOCK_STREAM) + self._console_socket.connect(self._console_address) return self._console_socket --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613194; cv=none; d=zohomail.com; s=zohoarc; b=WFLtq4CcFiHt+1l/sIQfrBlSHWkBGdbExD/1jEgLJhGjq5Y3WA5gD+cXtHCH2haZ0VkbAcF3C5IF6wwnhDMOGZYCmNm2fbesiLht8RhNTgQhG8KwcUinVOPAV+THRXJaxuFEWQXq9ZFWi1cAXGbp5w68Z5TyIpv5K43D9GIgYrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613194; 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=5xSn2L6kzBKcKjTR8zPwxbT757SBhdGuGZ/3k/jBdz8=; b=h5LAMmUdtddvCkckbrVOdp9vDfYyKb6409FolN4V47GupDex8LEryY8cW4ifqPx1hrGIBb71pUtwoxHbRyzdZkQgPuX1mFmt7W+M+B/2eo6FuVbR4dX6RKKjZGaR0ABtJSz+EMev64Bx2RoAxg7iquncy0iZztSt/vjE8TBGl/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613194817253.6977994902519; Wed, 1 Jul 2020 07:19:54 -0700 (PDT) Received: from localhost ([::1]:32924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdab-000733-IK for importer@patchew.org; Wed, 01 Jul 2020 10:19:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdUX-0006b5-Vb for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:39 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdUR-0000AA-Os for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:37 -0400 Received: by mail-wm1-x342.google.com with SMTP id o2so23435261wmh.2 for ; Wed, 01 Jul 2020 07:13:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v18sm7970236wrv.49.2020.07.01.07.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2861B1FF9C; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5xSn2L6kzBKcKjTR8zPwxbT757SBhdGuGZ/3k/jBdz8=; b=UN8QvevyH/p/8t8XtM/ztNOtUU3yvM11c97zCjUg/T+qF3R+XahA9xINEahWxGfKTn 2fo/xkoJircuU80TDTxqdTWXroOc84NbdyVU14j1G1T3MjLFw1ksoTxj3C8tmbBElj2T ehlawyCU+18TcyghrtxeRF+S2UVh8gU6xK0rCQw74BHBsGFDJbapPGSOSg16hjdVORzC ZY/aksN6Hto6ZOfTkpSU6sxgD1hRIbCdPe77JoPwDmsutc5PSp2rt2k5SroDVJqNgXxS C+0mA/xIIDBWDBJNedNrJCEihzKh1bz3RXGnRKF9k0cgZ7ZfFtB/Tl/GnCCrF+31x5Vw SkbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5xSn2L6kzBKcKjTR8zPwxbT757SBhdGuGZ/3k/jBdz8=; b=TshUlb9H7JI+8SPjqycRUvW4KmN5adW8RjdXomnjRTgBDfz6G0N9TcVyR5Del+kTQ8 CB0Cj0+Scnv+1xh7bqlG/Ip5GMIewr/ZZ6ckERLhKdfEpFNcrUk/R9tKX3HilhQDydz5 id1YUWz8Yjw54gS1lQBPSS0rlU4aDFP/f55vVkRHlrq36vVE0ZYRPRsg1w/B3t0Jmu6r Ei8xDBUeFmvVjoXjo2QPK4+u6ied/EhdqoBOM48J8HBODvOxFSxaqVkwACF2J0B4Gtd6 WnFiamPHTse7EUQR3lMisjdA4AjbTgYsZIctRruvlLmtGTs5HJOfPLMO4BTCUkhOpgVZ 92RA== X-Gm-Message-State: AOAM531mm7nTrZSSCRliCeTov65NBgFkWWI0JpxRW2eS0G9omi/tpXFn vmOKpeWRHLM/ZHgKLgR/i19/5w== X-Google-Smtp-Source: ABdhPJxeeVJQMO2eV9jCcKNdMn5Srnc6b0RY38pGiY6zh/Vm6dNqnrkpM8+pHs/LiDJouhODbqpSWQ== X-Received: by 2002:a1c:7306:: with SMTP id d6mr18276656wmb.113.1593612810092; Wed, 01 Jul 2020 07:13:30 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 13/40] tests/vm: Add workaround to consume console Date: Wed, 1 Jul 2020 14:56:25 +0100 Message-Id: <20200701135652.1366-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Peter Puhov , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Robert Foley This adds support to basevm.py so that we always drain the console chars. This makes use of support added in an earlier commit that allows QEMUMachine to use the ConsoleSocket. This is a workaround we found was needed since there is a known issue where QEMU will hang waiting for console characters to be consumed. We also added the option of logging the console to a file. LOG_CONSOLE=3D1 will now log the output to a file. Signed-off-by: Robert Foley Reviewed-by: Peter Puhov Acked-by: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200601211421.1277-10-robert.foley@linaro.org> --- tests/vm/Makefile.include | 4 ++++ tests/vm/basevm.py | 21 +++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 39f918a430a..f21948c46a5 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -49,6 +49,7 @@ endif @echo ' EXTRA_CONFIGURE_OPTS=3D"..."' @echo " J=3D[0..9]* - Override the -jN parameter for make= commands" @echo " DEBUG=3D1 - Enable verbose output on host and i= nteractive debugging" + @echo " LOG_CONSOLE=3D1 - Log console to file in: ~/.cache/qe= mu-vm " @echo " V=3D1 - Enable verbose ouput on host and guest commands" @echo " QEMU_LOCAL=3D1 - Use QEMU binary local to this= build." @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" @@ -75,6 +76,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(if $(GENISOIMAGE),--genisoimage $(GENISOIMAGE)) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ + $(if $(LOG_CONSOLE),--log-console) \ --image "$@" \ --force \ --build-image $@, \ @@ -91,6 +93,7 @@ vm-build-%: $(IMAGES_DIR)/%.img $(if $(V),--verbose) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ + $(if $(LOG_CONSOLE),--log-console) \ --image "$<" \ $(if $(BUILD_TARGET),--build-target $(BUILD_TARGET)) \ --snapshot \ @@ -114,6 +117,7 @@ vm-boot-ssh-%: $(IMAGES_DIR)/%.img $(if $(V)$(DEBUG), --debug) \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ + $(if $(LOG_CONSOLE),--log-console) \ --image "$<" \ --interactive \ false, \ diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index f716798b405..04d083409a5 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -117,6 +117,11 @@ class BaseVM(object): "w").write(self._config['ssh_pub_key']) =20 self.debug =3D args.debug + self._console_log_path =3D None + if args.log_console: + self._console_log_path =3D \ + os.path.join(os.path.expanduser("~/.cache/qemu-vm= "), + "{}.install.log".format(self.name)) self._stderr =3D sys.stderr self._devnull =3D open(os.devnull, "w") if self.debug: @@ -271,7 +276,13 @@ class BaseVM(object): args +=3D self._data_args + extra_args + self._config['extra_args'] logging.debug("QEMU args: %s", " ".join(args)) qemu_path =3D get_qemu_path(self.arch, self._build_path) - guest =3D QEMUMachine(binary=3Dqemu_path, args=3Dargs) + + # Since console_log_path is only set when the user provides the + # log_console option, we will set drain_console=3DTrue so the + # console is always drained. + guest =3D QEMUMachine(binary=3Dqemu_path, args=3Dargs, + console_log=3Dself._console_log_path, + drain_console=3DTrue) guest.set_machine(self._config['machine']) guest.set_console() try: @@ -285,6 +296,8 @@ class BaseVM(object): raise atexit.register(self.shutdown) self._guest =3D guest + # Init console so we can start consuming the chars. + self.console_init() usernet_info =3D guest.qmp("human-monitor-command", command_line=3D"info usernet") self.ssh_port =3D None @@ -296,7 +309,9 @@ class BaseVM(object): raise Exception("Cannot find ssh port from 'info usernet':\n%s= " % \ usernet_info) =20 - def console_init(self, timeout =3D 120): + def console_init(self, timeout =3D None): + if timeout =3D=3D None: + timeout =3D self.socket_timeout vm =3D self._guest vm.console_socket.settimeout(timeout) self.console_raw_path =3D os.path.join(vm._temp_dir, @@ -578,6 +593,8 @@ def parse_args(vmcls): parser.add_option("--efi-aarch64", default=3D"/usr/share/qemu-efi-aarch64/QEMU_EFI.fd", help=3D"Path to efi image for aarch64 VMs.") + parser.add_option("--log-console", action=3D"store_true", + help=3D"Log console to file.") parser.disable_interspersed_args() return parser.parse_args() =20 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612884; cv=none; d=zohomail.com; s=zohoarc; b=fZSBrBuAnfUDKxaApZdF8OQ+gPDO1s0tRqpnWE5iiJyXS6sX/SdJgCW08q/RnwQFuA1pBro9N0cnooEZAxQaIu9hKvoWI/uWprr0nOmO8Pt5EDykOt7T4ZyfR/EL6cD+p4XeuGcIZU9qdeoGwXoLOOhvlxp6fRVsJ94a1CVyKPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612884; 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=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=XGlrNfbkvOcqG+CVlUK4zOXuqCyqNWwD9UaWvUrtP1fY4GR0L0JJ+49WkDBQ4dZ/MsDv6Q022qhXHOlsJHiWxMMBWbTAUg3HAfGOaxvM89+VRsk12e6vnuZ/6+Qib5v19ZUbnavivzU0zn5UnUFaqkYxeEUrhVHWX2gJTc+0i4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612884913425.27758896517776; Wed, 1 Jul 2020 07:14:44 -0700 (PDT) Received: from localhost ([::1]:42742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdVb-0007fG-Gw for importer@patchew.org; Wed, 01 Jul 2020 10:14:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKs-0004r1-HR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:38 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33293) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKq-0006pU-8k for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:38 -0400 Received: by mail-wr1-x441.google.com with SMTP id f18so15926434wrs.0 for ; Wed, 01 Jul 2020 07:03:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g195sm7530342wme.38.2020.07.01.07.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FA641FF9D; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=hEJKumSL8s1zcrxYe9HpeFavd7BSWgdHT+xUxjaQPDp+YEHfPGS5bTXzUBJ2K1Ai4d kwLS9hGuTxeY9lEdifXJFBK6PSgswQ/AABLcsVwRIAwUlzaw6wRhoX7LNSuR0DDzbJSj YyeDVBeMtqIxYubyoQQDyxmtKdJ2TbU6lzudjWtzG1wJh2OeAXuecIUVfdrcQDTTzPdq uTlfqyMrFM2+nJinEdWkkpIa20wbRu9wNeIm30rqIv9lLpmPd9wPfhRaaRhp/AF4HQXu 9rJLtvBfPY+p0oGr+DZqUcKsNaMx64EMkUNOAtCr2ByKxDVIjSLZeIkIGoWbpT4AiXMs jLRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sygc/Hw6fwtICc5dsEJZsfgG0asRPmeTFs6oktvnw3o=; b=SxcZ+rFgTPPDOKgdCPvqR7S4+O8F77UvYXFWF1WUOgkDlBcd1sz7XzX6yPqpM0vDxm HZkB2saadJT22lR/c1av/qjG/GxeD9uOfMgHx/8M1a5kjJjYp72qIFxM6td2BcgcqH/Q OTgPYUUw0aek9kAQuiilBsEdYkYvyZny70qRmLlnYWt2XNcIwLhL7pvYctpKW0gFqY9G VzHuzSzUnNTSVtpp9D9GMgcrD3brDMC2wd+jQOeYIRjm0h+kDJpJP9cwjYTCy1gTzmSQ dqMcwKnO0lbkFfSe4rfksalGLYuB9iV2Dvx/I7ec4zhhpfNYEg0UAH0rUl9o86G2HLcM j4hQ== X-Gm-Message-State: AOAM530Q54Qbw5IWNCToJYja8jJuzr1ye6Q8wXW6S2HL8+CSkLzAc0KG eCorZYxN9/0HXwL7JXQc/pXu5g== X-Google-Smtp-Source: ABdhPJwKeXDxzbk6kiP/VesS1WR+iX7bxdGgi5yOwgWneWr9/PZpadwaEwZ7q+0PUSWLOQwTqXbKyQ== X-Received: by 2002:a5d:444e:: with SMTP id x14mr25745822wrr.279.1593612214789; Wed, 01 Jul 2020 07:03:34 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 14/40] tests/vm: switch from optsparse to argparse Date: Wed, 1 Jul 2020 14:56:26 +0100 Message-Id: <20200701135652.1366-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) optparse has been deprecated since version 3.2 and argparse is the blessed replacement. Take the opportunity to enhance our help output showing defaults when called. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Robert Foley --- v2 - add explicit parser.add_argument("commands", nargs=3D"*") v4 - fixup call to parse_args in aarch64vm.py --- tests/vm/aarch64vm.py | 2 +- tests/vm/basevm.py | 93 ++++++++++++++++++++++--------------------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/tests/vm/aarch64vm.py b/tests/vm/aarch64vm.py index bb04cb19c91..d70ab843b6b 100644 --- a/tests/vm/aarch64vm.py +++ b/tests/vm/aarch64vm.py @@ -46,7 +46,7 @@ def get_config_defaults(vmcls, default_config): def aarch_get_config_defaults(vmcls): """Set the defaults for current version of QEMU.""" config =3D CURRENT_CONFIG - args, argv =3D basevm.parse_args(vmcls) + args =3D basevm.parse_args(vmcls) qemu_path =3D basevm.get_qemu_path(vmcls.arch, args.build_path) qemu_version =3D basevm.get_qemu_version(qemu_path) if qemu_version < QEMU_AARCH64_MIN_VERSION: diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 04d083409a5..890bbc5549a 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -23,7 +23,7 @@ from qemu.accel import kvm_available from qemu.machine import QEMUMachine import subprocess import hashlib -import optparse +import argparse import atexit import tempfile import shutil @@ -556,54 +556,57 @@ def parse_args(vmcls): else: return 1 =20 - parser =3D optparse.OptionParser( - description=3D"VM test utility. Exit codes: " - "0 =3D success, " - "1 =3D command line error, " - "2 =3D environment initialization failed, " - "3 =3D test command failed") - parser.add_option("--debug", "-D", action=3D"store_true", - help=3D"enable debug output") - parser.add_option("--image", "-i", default=3D"%s.img" % vmcls.name, - help=3D"image file name") - parser.add_option("--force", "-f", action=3D"store_true", - help=3D"force build image even if image exists") - parser.add_option("--jobs", type=3Dint, default=3Dget_default_jobs(), - help=3D"number of virtual CPUs") - parser.add_option("--verbose", "-V", action=3D"store_true", - help=3D"Pass V=3D1 to builds within the guest") - parser.add_option("--build-image", "-b", action=3D"store_true", - help=3D"build image") - parser.add_option("--build-qemu", - help=3D"build QEMU from source in guest") - parser.add_option("--build-target", - help=3D"QEMU build target", default=3D"check") - parser.add_option("--build-path", default=3DNone, - help=3D"Path of build directory, "\ - "for using build tree QEMU binary. ") - parser.add_option("--interactive", "-I", action=3D"store_true", - help=3D"Interactively run command") - parser.add_option("--snapshot", "-s", action=3D"store_true", - help=3D"run tests with a snapshot") - parser.add_option("--genisoimage", default=3D"genisoimage", - help=3D"iso imaging tool") - parser.add_option("--config", "-c", default=3DNone, - help=3D"Provide config yaml for configuration. "\ - "See config_example.yaml for example.") - parser.add_option("--efi-aarch64", - default=3D"/usr/share/qemu-efi-aarch64/QEMU_EFI.fd", - help=3D"Path to efi image for aarch64 VMs.") - parser.add_option("--log-console", action=3D"store_true", - help=3D"Log console to file.") - parser.disable_interspersed_args() + parser =3D argparse.ArgumentParser( + formatter_class=3Dargparse.ArgumentDefaultsHelpFormatter, + description=3D"Utility for provisioning VMs and running builds", + epilog=3D"""Remaining arguments are passed to the command. + Exit codes: 0 =3D success, 1 =3D command line error, + 2 =3D environment initialization failed, + 3 =3D test command failed""") + parser.add_argument("--debug", "-D", action=3D"store_true", + help=3D"enable debug output") + parser.add_argument("--image", "-i", default=3D"%s.img" % vmcls.name, + help=3D"image file name") + parser.add_argument("--force", "-f", action=3D"store_true", + help=3D"force build image even if image exists") + parser.add_argument("--jobs", type=3Dint, default=3Dget_default_jobs(), + help=3D"number of virtual CPUs") + parser.add_argument("--verbose", "-V", action=3D"store_true", + help=3D"Pass V=3D1 to builds within the guest") + parser.add_argument("--build-image", "-b", action=3D"store_true", + help=3D"build image") + parser.add_argument("--build-qemu", + help=3D"build QEMU from source in guest") + parser.add_argument("--build-target", + help=3D"QEMU build target", default=3D"check") + parser.add_argument("--build-path", default=3DNone, + help=3D"Path of build directory, "\ + "for using build tree QEMU binary. ") + parser.add_argument("--interactive", "-I", action=3D"store_true", + help=3D"Interactively run command") + parser.add_argument("--snapshot", "-s", action=3D"store_true", + help=3D"run tests with a snapshot") + parser.add_argument("--genisoimage", default=3D"genisoimage", + help=3D"iso imaging tool") + parser.add_argument("--config", "-c", default=3DNone, + help=3D"Provide config yaml for configuration. "\ + "See config_example.yaml for example.") + parser.add_argument("--efi-aarch64", + default=3D"/usr/share/qemu-efi-aarch64/QEMU_EFI.fd= ", + help=3D"Path to efi image for aarch64 VMs.") + parser.add_argument("--log-console", action=3D"store_true", + help=3D"Log console to file.") + parser.add_argument("commands", nargs=3D"*", help=3D"""Remaining + commands after -- are passed to command inside the VM""") + return parser.parse_args() =20 def main(vmcls, config=3DNone): try: if config =3D=3D None: config =3D {} - args, argv =3D parse_args(vmcls) - if not argv and not args.build_qemu and not args.build_image: + args =3D parse_args(vmcls) + if not args.commands and not args.build_qemu and not args.build_im= age: print("Nothing to do?") return 1 config =3D parse_config(config, args) @@ -619,12 +622,12 @@ def main(vmcls, config=3DNone): if args.build_qemu: vm.add_source_dir(args.build_qemu) cmd =3D [vm.BUILD_SCRIPT.format( - configure_opts =3D " ".join(argv), + configure_opts =3D " ".join(args.commands), jobs=3Dint(args.jobs), target=3Dargs.build_target, verbose =3D "V=3D1" if args.verbose else "")] else: - cmd =3D argv + cmd =3D args.commands img =3D args.image if args.snapshot: img +=3D ",snapshot=3Don" --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612440; cv=none; d=zohomail.com; s=zohoarc; b=HbNFjN3KVkAqnGzOfgJJsVmkz4Wzb6iMBiuDWUdKbkxnyjqUO6Okti1RB/Sbm82Wnx8Ky7JGe+IlK1HRv7L5Sx79mPyYQYTGBoCFKdhf2QI1m2FpB0/wg8V9ditMm560CLE3yJSEXIuJHrI0Xco3+DjhVlLOxml9pnU3R3Tr6bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612440; 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=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=lESAb/NbzuaQuyRnnLFUwwWWpjiwVcgZPrzfk3giYk/WDowh1lutfyoTWqJWelc/g7Rr7+P1zwggW3zraTuxftKxjzui1ySPhDlGkbbRi3OXfDy1L2RD+MTxZX+OsqzH+kjAUg5jVJz3m85kBQqUTSanIb+HtqyXRJy9O/72Dbk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612440163688.9128595719087; Wed, 1 Jul 2020 07:07:20 -0700 (PDT) Received: from localhost ([::1]:38548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdOQ-0002W6-TG for importer@patchew.org; Wed, 01 Jul 2020 10:07:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKl-0004ay-TA for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:40174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKk-0006og-4F for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: by mail-wr1-x442.google.com with SMTP id h5so23977259wrc.7 for ; Wed, 01 Jul 2020 07:03:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u20sm7006588wmc.44.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 54CCD1FF9E; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=Ad46nvnVhRJa7GOwUF6AnPDsT5GSEkYL0Xv32G6ZbRoqanH2T5w+tMFHjZm24ISEl2 zkD3Nwp5TcS/+d5bK3IPlpGcjW++hW1STGIGqDM1WavtxNrcbCIC/fFi3CcT+S64Ir9x RDk2gL+he4GlclDc9PqsdxJxZYGF7Ztwd598Z5g8Lfs+bwe9hAp+BgvmMavy9iwjq2/Y QYDdsWpNwZvjyuZlKKymW70JIFidsUBXN8y0zBAMzLjkEF1GLGt263qGGqaTfUIgnONu 5mpaM8h5v7yDcC2n3ylirnCjCqMTWW3FjZVvECxHGZ77DSjVrp8u0AthxU0CPasp0cOj ArDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=tZa55pEocEWkrb45gemwN/rymCqU4EAfrKAwugQyou6WgmOhX5E7P3bjZr4d0LQD2s aHrnm8RlUs4psmKbret1PkcBUQpT26pc0PHwan78GmHolqCECDOYnUV/OFhyojhOfaKG 2/hHuXjv0uladNatnlRTrRunuZBekJpo5TKuWZs1PnZAU2u6+YwLchwu/o79xzDLI6h1 wpTF4dl8Ox8dWletPMFsTTo339DYUngwL2GGvjOw/9GriY/D/IrxvwYyZ8/CYAbx3TzL lEAXPIv7ZkwiXUuBJiEhzsJp9NwwsYNxAgWK+ghwoQ+TVKwGQNAC9E9uz1Jo/TXlf2nj LX2w== X-Gm-Message-State: AOAM531MjHhoXLv/rZe9wsCRKdJuhU1D4Yr8ncEjxm5PfjGWdIL07VbG OnPsb5lgGgHoDsrVZFWMm3sr2A== X-Google-Smtp-Source: ABdhPJyyRBn/+bXYOWoZ8tSNW0GzHH3CYxlSRMXQ1krjJ4BoAwweRoCdAbqse0t2Eplgw385WDC9CA== X-Received: by 2002:adf:f34e:: with SMTP id e14mr26740295wrp.299.1593612208754; Wed, 01 Jul 2020 07:03:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 15/40] tests/vm: allow us to take advantage of MTTCG Date: Wed, 1 Jul 2020 14:56:27 +0100 Message-Id: <20200701135652.1366-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We currently limit TCG guests to -smp 1 but now we have added some aarch64 guests we can do better when running on x86_64 hardware. Raise the limit for TCG guests when it is safe to do so. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Robert Foley Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v4 - only attempt compute a bigger default_jobs is multiprocessing.cpu_count > 1 --- tests/vm/basevm.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 890bbc5549a..21f46d1957d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -551,8 +551,15 @@ def parse_config(config, args): def parse_args(vmcls): =20 def get_default_jobs(): - if kvm_available(vmcls.arch): - return multiprocessing.cpu_count() // 2 + if multiprocessing.cpu_count() > 1: + if kvm_available(vmcls.arch): + return multiprocessing.cpu_count() // 2 + elif os.uname().machine =3D=3D "x86_64" and \ + vmcls.arch in ["aarch64", "x86_64", "i386"]: + # MTTCG is available on these arches and we can allow + # more cores. but only up to a reasonable limit. User + # can always override these limits with --jobs. + return min(multiprocessing.cpu_count() // 2, 8) else: return 1 =20 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612639; cv=none; d=zohomail.com; s=zohoarc; b=Jg+vNEzWHF38/x0ab7idfDTiJG6eqBXMhlJnMngpzFM/QG0qlFECz+oOqjWKivxuATzz1bJSLrgA9+gPBaqjIodF/ivPAed/+Qx9GaxYN5lUjLGvl77afOLRQ6sjffL0xUaWHAuURRqgu2l1K5MO3OZJyi2e/I62RFyEoIggcnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612639; 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=Hc/GcVPMTlu7EGTBmWJqWp3KNZYqt74iySDJhQWwxVM=; b=MHQUZIkazsxpw8H/7YwGBpwkItM5lSGN0eKCdCFCQYC21Psw5M4InC8xzEabDocnX+nAkL2pvHaURoLnfYpznYgvhl41pqIJgIMf14i2eqm8dbSn82yUeSqvBaIqBQU03zeFN+sFFrBCW2ffswnaMJeKRXtSSwlx1O2e+YVOSkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612639263333.1418494733623; Wed, 1 Jul 2020 07:10:39 -0700 (PDT) Received: from localhost ([::1]:54070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdRe-0000cE-40 for importer@patchew.org; Wed, 01 Jul 2020 10:10:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKq-0004kG-1O for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:36 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKo-0006pA-6b for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:35 -0400 Received: by mail-wr1-x443.google.com with SMTP id z13so23991212wrw.5 for ; Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x124sm2330081wmx.16.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6A18D1FF9F; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hc/GcVPMTlu7EGTBmWJqWp3KNZYqt74iySDJhQWwxVM=; b=doiSvS/AcGDxLuuGZbW4HrBh69t+uEpuunpn0adkYBYU3cuD9QSvswtVFIqEzZQzk8 Wc6dBgSZop6cCVG457kKNNSbKxNSqxM9elxj01O+pWq8RP4ytXRjPlKXxkJ+t3PK+eQs iKSx3Ns9Pr9LoSdJVVe6hg7tQvHiiMI4eIxRPNpADdJ72ZZUMDudyWSO1u0hbWUV46wi 26l0UFlRxpLV8m8aLsDWppbjU/ixyRpIIzdfWbhtmEn4y/JoFtoUmzX4LH/9+iCjVKLj EUhP/Il+urPHW/zZxtjx0AnwMiNprMS+hUNVHgCKTcH+sieORX97OVTOVRiTs8lkuj6i mNPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hc/GcVPMTlu7EGTBmWJqWp3KNZYqt74iySDJhQWwxVM=; b=kUXCvvgTAuw6Bc8yo7/IQsIDZTH9giAojqCm3Bxbv8HHrEZ3NKgVk5MO4X76fIm64f pSS6ExEIyFafqPHd1e84VVwX0q8TlMwTBZZexlG50hWlEZaNddbDNa39+LnpRjaKMBh2 R6NMgPwPDnInp5klpq/rOaxYCkqraTBAkwSV0ZCRnqCSEtwYfp3q5oQ5+hVEpLe5Iv8g YJWzmt89TlcS2kGVoO4OSnBlQjQSoFvK3RjBaObHCEF6GyNTeyvilJ8dunXMQCYNiTZo C82emCySFFhI93Pn+lKJm6uOCArhFtaPxxwoXlMuu4DHGmwfBa+NPOFjFGVLyAckDvV6 RHRQ== X-Gm-Message-State: AOAM5320eK1mL8DaBLPvGKGnZOFAaKUK8AfAlwKNSU6N1d0yctaosxsT Pw65j409ykXQfO7kg+qau8JprA== X-Google-Smtp-Source: ABdhPJx3nv0s8wCCqx/mV79f0gztcKbe55azUMHXXuxtJMumNe2Gh+13Hajcjz7MGZA83nWAjQkAMw== X-Received: by 2002:adf:e484:: with SMTP id i4mr27695045wrm.246.1593612212715; Wed, 01 Jul 2020 07:03:32 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 16/40] tests/docker: check for an parameters not empty string Date: Wed, 1 Jul 2020 14:56:28 +0100 Message-Id: <20200701135652.1366-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Peter Maydell , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Suggested-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v4 - if [ $# =3D=3D 0 ]; then -> if [ $# =3D 0 ]; then --- tests/docker/common.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/common.rc b/tests/docker/common.rc index 02cd67a8c5e..ebc5b97ecf9 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -47,7 +47,7 @@ build_qemu() check_qemu() { # default to make check unless the caller specifies - if test -z "$@"; then + if [ $# =3D 0 ]; then INVOCATION=3D"check" else INVOCATION=3D"$@" --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613122; cv=none; d=zohomail.com; s=zohoarc; b=Ej+0TfMX4kfwctyTSJ6PY+6IpjB9+HIkobikjAt4qunZ45eKreI1dBT48oL6H7RYjDP7VUBF67rih6vj3tT8kzpFvfxKQH69p4iJy5/Nl7zS2MWQRev+KqWUx+aTfIB9bYhbWWN5cZi7T3XjjYeGqFBlwD6RzuLcYYJOVFWEZs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613122; 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=FuCHGM7iRPlVOeoJ1tjdyPktkHWpC0K3uPbBotufS80=; b=Kz4jaBFsqn3GDem8O7U4WGExAterD7fBefrgO7TnRtoo3i9e8WJ0Mva4SiPhYk2wwZ4zOh9Dl9jMwqtMDElh83x21XNI8A8yUv3aqCXwyvaOs1W7+9qZ9qu8sO4ZjRvr9AqQRMpjcgMxCgF1ftJC9NhoCpaogkRQDzrJrr64MHw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613122048488.4396068647437; Wed, 1 Jul 2020 07:18:42 -0700 (PDT) Received: from localhost ([::1]:57768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdZQ-0005bJ-HU for importer@patchew.org; Wed, 01 Jul 2020 10:18:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdL6-0005Mk-9C for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:52 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdL3-0006ry-EB for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:51 -0400 Received: by mail-wr1-x42e.google.com with SMTP id h5so23978899wrc.7 for ; Wed, 01 Jul 2020 07:03:48 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 65sm7992176wma.48.2020.07.01.07.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B06ED1FFA5; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FuCHGM7iRPlVOeoJ1tjdyPktkHWpC0K3uPbBotufS80=; b=MlZqqqm9G6O9sqstXhGYxF/OkJndDqcWI//lBY5GYZ5bDUD88A1bXIMjJHdEhRR/zY tZ6mnZ5GuYKDdQ8wjagb4Gzrr+nV04IckwXIO3KXxKBWlAwlrOEmUW78G0uh8AJfx0cO Wwa7VanNuR7m9tLHV5sLm0mM71pTDdDYtdylD2UuQqra/b2lnTV3pPpQ55+B9SpCD5x4 3hmqwGNYgBHr8nT+7yMfhPB+heRUm9ofDti+z3A6iKDc5ZNMtfz1Co+lAOAobEAWbEYR XM+ImJWQqZITaJ9e3R83KGmgaJ0ME07wjoPou1HHvMKYpym2NUi+Zhp7AyLhP3IbYKn7 gMEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FuCHGM7iRPlVOeoJ1tjdyPktkHWpC0K3uPbBotufS80=; b=ah9Er5Q26XEULEvhohNA4ZzHukBi9JiDJdjK+YgvHFYXZnjYgYmMSrxrDIxKAtm2B5 tQ5K0L/OBhm5OEJdhX5flZD5PSAIZOv40egKiZ4Ked9o7V6xAxEHVA9aSCX3dU9txKjR l8C7vpxgrAGnjNKdHezBVCrBCirvOdl2TmbTPP5uHKrMvozc9xpvgIxtGBV3CcSVeqwG cnr96/7qvi7ImEqQ9MFPechrZnS8EmzAF2oVu4rjNEvrLBIU53htBLNxueVx0GjSOPbo 3/h09XzgXi8bfhFuqbtpZ+5eCdKf3CLM7lHxQaXe0iAtYc4OyIj1EbQ+mAcQ/TZInczj TnwQ== X-Gm-Message-State: AOAM530KQ/4VDyqA8D3/Yldq2k16CVnQt6bjO0QbWK3SbmSC4xBcPGcW LIeNuiJbz6/QLoSmK2rDBsvYug== X-Google-Smtp-Source: ABdhPJwroKDqIL6VY/Tc4zRXtX5w0KvviCFBF/YjvGf6wf9WFRuZfpRlXnYtA/5FqgWV2PrPxAHgMg== X-Received: by 2002:adf:f504:: with SMTP id q4mr26575847wro.163.1593612227606; Wed, 01 Jul 2020 07:03:47 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 17/40] tests/docker: change tag naming scheme of our images Date: Wed, 1 Jul 2020 14:56:29 +0100 Message-Id: <20200701135652.1366-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We've been misusing the tag naming scheme for some time by overloading the post : section with the image type. Really it should be saved for the revision of that particular build. Move the details to the other side so we have: qemu/image-name with the implied :latest version added by the tooling. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2 - fix RUN invocation as well - don't include :latest tag for debian-arm64-cross (implied) v4 - fix up check and compile cases as well - also tweak shippable references --- .shippable.yml | 4 ++-- tests/docker/Makefile.include | 10 +++++----- tests/docker/docker.py | 2 +- tests/docker/dockerfiles/debian-alpha-cross.docker | 2 +- tests/docker/dockerfiles/debian-amd64-cross.docker | 2 +- tests/docker/dockerfiles/debian-amd64.docker | 2 +- tests/docker/dockerfiles/debian-arm64-cross.docker | 2 +- .../docker/dockerfiles/debian-arm64-test-cross.docker | 2 +- tests/docker/dockerfiles/debian-armel-cross.docker | 2 +- tests/docker/dockerfiles/debian-armhf-cross.docker | 2 +- tests/docker/dockerfiles/debian-hppa-cross.docker | 2 +- tests/docker/dockerfiles/debian-m68k-cross.docker | 2 +- tests/docker/dockerfiles/debian-mips-cross.docker | 2 +- tests/docker/dockerfiles/debian-mips64-cross.docker | 2 +- tests/docker/dockerfiles/debian-mips64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-mipsel-cross.docker | 2 +- tests/docker/dockerfiles/debian-powerpc-cross.docker | 2 +- tests/docker/dockerfiles/debian-ppc64-cross.docker | 2 +- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 +- tests/docker/dockerfiles/debian-riscv64-cross.docker | 2 +- tests/docker/dockerfiles/debian-s390x-cross.docker | 2 +- tests/docker/dockerfiles/debian-sh4-cross.docker | 2 +- tests/docker/dockerfiles/debian-sparc64-cross.docker | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 2 +- tests/docker/dockerfiles/debian-win32-cross.docker | 2 +- tests/docker/dockerfiles/debian-win64-cross.docker | 2 +- tests/docker/dockerfiles/debian9-mxe.docker | 2 +- tests/tcg/Makefile.qemu | 4 ++-- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 2cce7b56890..81905727d14 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -29,8 +29,8 @@ build: pre_ci: - make docker-image-${IMAGE} V=3D1 pre_ci_boot: - image_name: qemu - image_tag: ${IMAGE} + image_name: qemu/${IMAGE} + image_tag: latest pull: false options: "-e HOME=3D/root" ci: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3e3617816ec..e23b4af20ea 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -50,12 +50,12 @@ docker-image: ${DOCKER_TARGETS} ifdef SKIP_DOCKER_BUILD docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu:$* $<, \ + $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \ "CHECK", "$*") else docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ - $(DOCKER_SCRIPT) build -t qemu:$* -f $< \ + $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ @@ -75,14 +75,14 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debia= n-bootstrap.docker DEB_ARCH=3D$(DEB_ARCH) \ DEB_TYPE=3D$(DEB_TYPE) \ $(if $(DEB_URL),DEB_URL=3D$(DEB_URL),) \ - $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(DOCKER_SCRIPT) build qemu/debian-$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)) \ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)), \ "BUILD","binfmt debian-$* (debootstrapped)"), \ $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu:debian-$* $< || \ + $(DOCKER_SCRIPT) check --quiet qemu/debian-$* $< || \ { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 @@ -258,7 +258,7 @@ docker-run: docker-qemu-src docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\= (.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\2/') docker-run-%: - @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu:$(IMAGE) + @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu/$(IMAGE) =20 docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index e630aae1089..cc6f76caa60 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -204,7 +204,7 @@ def _dockerfile_preprocess(df): for l in df.splitlines(): if len(l.strip()) =3D=3D 0 or l.startswith("#"): continue - from_pref =3D "FROM qemu:" + from_pref =3D "FROM qemu/" if l.startswith(from_pref): # TODO: Alternatively we could replace this line with "FROM $I= D" # where $ID is the image's hex id obtained with diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/doc= ker/dockerfiles/debian-alpha-cross.docker index 74bcabfdb12..10fe30df0dd 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 5d890419251..870109ef6af 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -4,7 +4,7 @@ # This docker target is used on non-x86_64 machines which need the # x86_64 cross compilers installed. # -FROM qemu:debian10 +FROM qemu/debian10 MAINTAINER Alex Benn=C3=A9e =20 # Add the foreign architecture we want and install dependencies diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index 957f0bc2e79..8fdfd6a6b04 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -4,7 +4,7 @@ # This docker target builds on the debian Stretch base image. Further # libraries which are not widely available are installed by hand. # -FROM qemu:debian10 +FROM qemu/debian10 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 RUN apt update && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 09ca0a1ba79..166e24df138 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-arm64-test-cross.docker b/test= s/docker/dockerfiles/debian-arm64-test-cross.docker index a44e76d9421..53a9012beb8 100644 --- a/tests/docker/dockerfiles/debian-arm64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-test-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Bullseye base image. # -FROM qemu:debian11 +FROM qemu/debian11 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index e3794a61c95..b7b1a3585f8 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian10 +FROM qemu/debian10 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 # Add the foreign architecture we want and install dependencies diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index e163b8b9569..25d76188337 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture armhf diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/dock= er/dockerfiles/debian-hppa-cross.docker index 5c68b2d3304..3d6c65a3efc 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/dock= er/dockerfiles/debian-m68k-cross.docker index 25edc80e9a3..fcb10e35347 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/dock= er/dockerfiles/debian-mips-cross.docker index 08a8e1c29cc..26c154014db 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/do= cker/dockerfiles/debian-mips64-cross.docker index 1a79505d696..09c2ba584e5 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 453b53ef72c..c990b683b7a 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -4,7 +4,7 @@ # This docker target builds on the debian Stretch base image. # =20 -FROM qemu:debian10 +FROM qemu/debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 3b6e975c686..0e5dd42d3c4 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/d= ocker/dockerfiles/debian-powerpc-cross.docker index 89dd4fbf870..07e1789650b 100644 --- a/tests/docker/dockerfiles/debian-powerpc-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-ppc64-cross.docker b/tests/doc= ker/dockerfiles/debian-ppc64-cross.docker index 4bf88ab02dd..8efe68874ed 100644 --- a/tests/docker/dockerfiles/debian-ppc64-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64-cross.docker @@ -2,7 +2,7 @@ # Docker ppc64 cross-compiler target # # This docker target builds on the debian Buster base image. -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index cd386f01d93..1146a06be62 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture ppc64el && \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index 5e2d6ddb600..2bbff19772a 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 43fe59836f2..9f2ab51eb09 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 # Add the s390x architecture RUN dpkg --add-architecture s390x diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docke= r/dockerfiles/debian-sh4-cross.docker index 9d7663764e4..fd3af895759 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/d= ocker/dockerfiles/debian-sparc64-cross.docker index 31fd34f120b..f4bb9b561cf 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Buster base image. # -FROM qemu:debian10 +FROM qemu/debian10 =20 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index 4a0f7706a39..769d95c77bb 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -7,7 +7,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu:debian9 +FROM qemu/debian9 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/doc= ker/dockerfiles/debian-win32-cross.docker index d16d6431bc8..b045e821b91 100644 --- a/tests/docker/dockerfiles/debian-win32-cross.docker +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian9-mxe +FROM qemu/debian9-mxe =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/doc= ker/dockerfiles/debian-win64-cross.docker index b0bc960445b..2fc9cfcbc66 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch MXE base image. # -FROM qemu:debian9-mxe +FROM qemu/debian9-mxe =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian9-mxe.docker b/tests/docker/doc= kerfiles/debian9-mxe.docker index 62ff1cecf2d..ae2c222a6f0 100644 --- a/tests/docker/dockerfiles/debian9-mxe.docker +++ b/tests/docker/dockerfiles/debian9-mxe.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu/debian9 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 9c23aeaa2a6..f8ad4c47be6 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -47,7 +47,7 @@ ifneq ($(DOCKER_IMAGE),) =20 DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc \ --cc $(DOCKER_CROSS_CC_GUEST) \ - -i qemu:$(DOCKER_IMAGE) \ + -i qemu/$(DOCKER_IMAGE) \ -s $(SRC_PATH) -- " =20 .PHONY: docker-build-guest-tests @@ -57,7 +57,7 @@ docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D$(DOCKER_COMPILE_CMD)= \ SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3Dy \ EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ - "BUILD","$(TARGET) guest-tests with docker qemu:$(DOCKER_IMAGE)") + "BUILD","$(TARGET) guest-tests with docker qemu/$(DOCKER_IMAGE)") =20 GUEST_BUILD=3Ddocker-build-guest-tests =20 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613164; cv=none; d=zohomail.com; s=zohoarc; b=iY+/fOeX8P6r1ygnu/gXFUpu2Fp9IYCmoGus6BKBiZC/oxJWED/uAHsTlWt+9/RgOLRoxbvwOUsPj+fjHyk+ogDq1hK6Du/gYfzWOU7WvSyqC4zbetyWO9yosIlMGo43MB6dJJq6DxT6u9UkXZTHVBzOcXd20H8DhnDCt+QEbao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613164; 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=/gJeXHauplrna/VI3tbE6Xj0DnjeaDUq+DWasMhuRYI=; b=B4Lc8b6TInw+Ap9rZyPkmK1KFhKbZMnGSAvWSEKEe737lKNfgDFEObLJjpY5Id9MkbK07MIDgHbbeVv4e9ztFRmyNUCD00Bka7d763vvBm6QMnwDPmdmxa2P5FEy2+7lmqO/IlcZTvPfX2KyZOSxVPDkPyyzEyjDbUDjSzzaqG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613164874385.74855443560193; Wed, 1 Jul 2020 07:19:24 -0700 (PDT) Received: from localhost ([::1]:59664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqda7-0006Pw-Nq for importer@patchew.org; Wed, 01 Jul 2020 10:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdL2-0005EV-HX for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:48 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdL0-0006rc-FP for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:48 -0400 Received: by mail-wr1-x444.google.com with SMTP id h5so23978658wrc.7 for ; Wed, 01 Jul 2020 07:03:46 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h14sm7805319wrt.36.2020.07.01.07.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C4CC41FFA6; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/gJeXHauplrna/VI3tbE6Xj0DnjeaDUq+DWasMhuRYI=; b=mjXFmiNJuIrD339dJL3JR3q+25xfgxvOvhMjzHD8OylTSoNtwpQ3Bp6FJqyN3syuK7 V9HhLGeNRPNBmwiJ3sLOAhwEHetuCMX1LfRuLrAw7RN1m/NcMBLslsp7raydeEpm79bA +AUKpSp07jDAaXiYKphqqJdAndAYF7mT27/h60Bz+4s46XNcc/O5osePuNWQww7IXke9 xcCKEXEuIpPVQJp1xOKf/GJnuOk2aJZi3F6dJTSYHbFlGnFC+Z/q3iCpUcv2yLWW6Td2 gAjePhPN7wRs9TeIIMgTr6YyAgzV/WpeHzb0w0rOghg8XXou3gaFnUjF6dJl0aTax25/ akxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/gJeXHauplrna/VI3tbE6Xj0DnjeaDUq+DWasMhuRYI=; b=tfN9z/9J1BYMiYjPyGeslFgtc7GxPQlrQT6NvrFGYSFlyMv7RaQcPzG+UIwituXMJU O2LBJ9d1OedtOkxiqenz5y0V85snVEhRIe5l2DbnJ0vU9kBNsUfv/oACmbKUUSBmDQ5M d9sIXoGxbK0PUzJ2X4kyu1aXe6i874gQONRwPJgZR49IjzY5L2anulfq8WVwKnDrOmZl WfZCQlU7IPpvC8VNz9DupHbPU8bpqLgMEngJNIWNRNTL1zE1yWUKSFX2dcF/Oqsar0U6 qKrshHn4GeV5CZPFcKbTEp1biusGCPn5lNs8A/LFTtwr/n50iul2cFeEkeqMMCSgpJkB 2U0g== X-Gm-Message-State: AOAM531NJckMxSBxTROcIhvKxmp3lkCLSYJBnbrzM0Y3008Ihi6BieAR glIOHNsBImu5QVd/9gL2CmhyKA== X-Google-Smtp-Source: ABdhPJzpehlm16qbePZ7dOMrG31Ui8NdNOgpqRpytESW4YyFZh/LzDBG/ZiNz/aUiThLUE5HQwM59A== X-Received: by 2002:adf:f889:: with SMTP id u9mr29569062wrp.149.1593612225169; Wed, 01 Jul 2020 07:03:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 18/40] .gitignore: un-ignore .gitlab-ci.d Date: Wed, 1 Jul 2020 14:56:30 +0100 Message-Id: <20200701135652.1366-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The sooner we deprecate in-tree builds the sooner this mess of regexes can be thrown away. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2 - just use explicit !/.gitlab-ci.d --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 90acb4347d4..2992d15931a 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ *.tp *.vr *.d +!/.gitlab-ci.d !/scripts/qemu-guest-agent/fsfreeze-hook.d *.o .sdk --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612350; cv=none; d=zohomail.com; s=zohoarc; b=iQWGUFNk0+uyp+yLAoSl0E0c0V1WOKoIx0/OqkfoqrGCBKLL+MckKFNG1kRhCNaGYLVoBKwmC/FahtjwFtjPDvjQ76hA6W4WN/7tXciLZrNGE0ZTljLMUZTS66hVf59iil6STt1185n8GuNxkicQ/khhwrxl7J4YCnCgtjtz3tI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612350; 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=09WbvjBl4qGw2wSB47ZVCDVMGKqWTzjkB82c4wAU+mc=; b=Zdya5i24RxNWYo4Eze/1ELjZTqIpVOQ9n5O6NGCNQVS+dXw8O2kIN2eIGvJT6HAF5VksOCaTThk1tfRs4GUoMndO7stdjgIz4AV7e/LS6fbFtr/nHmfmOYvNGojrNcfPrmpTZWeo39pzLlBr5fTihMaDy2vp/XVAqVD0WDDLLp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612350647668.7624438155326; Wed, 1 Jul 2020 07:05:50 -0700 (PDT) Received: from localhost ([::1]:59648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdMz-0007xl-CY for importer@patchew.org; Wed, 01 Jul 2020 10:05:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEe-0002Vv-3U for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:12 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:38134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEb-0005s8-1P for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:11 -0400 Received: by mail-wm1-x32d.google.com with SMTP id f18so23375135wml.3 for ; Wed, 01 Jul 2020 06:57:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x18sm7365977wrq.13.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DC32E1FFA9; Wed, 1 Jul 2020 14:56:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=09WbvjBl4qGw2wSB47ZVCDVMGKqWTzjkB82c4wAU+mc=; b=ju8BDo3NwSVr5TNwlr3bIE5iIuJiGD1DU6lFRP27OV+UMq/EeHODsa6/LuMMhcc+i9 qjV67Q0UJg+q9oAc6d1QOofLLLh9ik+DTheqk993Spzg7JrWib/iaISr0rRItv9uzCfe w2HEUeSEUIITTreMX5Z3wTXSzNt9XJZsVgzXf8hy9+NFPCpZvk8AjysGIcIuz2lPilJY gPaGVZNBpnDHJp1oHaz5uodLXTEnJGzVY+vbhgKcGCWOgcVuO7qawx/qp3KiyvFuXgaV AfkDynAyuJJlUeejXvq9qyVszIZPaJj1bs9qLFAdHT0XBoU8/GQ+YmWWYamy9bthMfvh HmbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=09WbvjBl4qGw2wSB47ZVCDVMGKqWTzjkB82c4wAU+mc=; b=klsR4CLy7foHgm5ZOvBzkdrZy9zviF/8NyrXhIlVCnV0w1Lfp7aZuSfmrylepoQK8w Ne5BxMqCJ2lvINZubxWFOMsfCj0NZyAcyg/lloZgx8NJcG8qi0SQgJsTBArPd5iC30dk jZAzufXI+UvKL3dVSIkykx4j9MaH41fA/SXvDfd3NskcyxRyANKauD6L+xRa6C2pKMbJ /Wvs+Cey6tsHBeDpeGj2hjRs5bNdwGbqKXYLRk5r8S5D+x1CVxjvELgD6f5Pff0rPmqt khDKoQaAc35/NdaixAR23nI+w/npda6+OvGURPYn+bgtOjA6X1GUsmffGdQ3sJ/1LBBT DzGQ== X-Gm-Message-State: AOAM532n6zu9YVoChnn4DchsQlflTdb1W5w7FIr7APccm8xhe5PlZ76K oFs/biNEG5mkbCeQAenq060hMA== X-Google-Smtp-Source: ABdhPJyBBAqeehgEf6sWoCuXYoEcKVAD2LX5kIFSIbGdciNHERPWYYHAvaoNdXMp53glAPfFDfOpOA== X-Received: by 2002:a1c:790c:: with SMTP id l12mr26309698wme.50.1593611827633; Wed, 01 Jul 2020 06:57:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 19/40] gitlab-ci: Fix the change rules after moving the YML files Date: Wed, 1 Jul 2020 14:56:31 +0100 Message-Id: <20200701135652.1366-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , richard.henderson@linaro.org, f4bug@amsat.org, Laszlo Ersek , =?UTF-8?q?Alex=20Benn=C3=A9e?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth The edk2.yml and opensbi.yml files have recently been moved/renamed, but the change has not been reflected in the rules in the YML files yet. Fixes: 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder= ") Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20200625151627.24986-1-thuth@redhat.com> --- .gitlab-ci.d/edk2.yml | 2 +- .gitlab-ci.d/opensbi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 088ba4b43a3..a9990b71475 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -2,7 +2,7 @@ docker-edk2: stage: build rules: # Only run this job when the Dockerfile is modified - changes: - - .gitlab-ci-edk2.yml + - .gitlab-ci.d/edk2.yml - .gitlab-ci.d/edk2/Dockerfile when: always image: docker:19.03.1 diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index dd051c01245..6a1750784ac 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -2,7 +2,7 @@ docker-opensbi: stage: build rules: # Only run this job when the Dockerfile is modified - changes: - - .gitlab-ci-opensbi.yml + - .gitlab-ci.d/opensbi.yml - .gitlab-ci.d/opensbi/Dockerfile when: always image: docker:19.03.1 --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612410; cv=none; d=zohomail.com; s=zohoarc; b=XTkPeoSMC5FhR8wyoFJRARLoQXBcWEoNsf81S+kpSKG2YGDd8rfqhlvnJUd7W32XyNSRI5b2v+K+LEIVwxreZLhEOSYXgZlQY9MqEE/yFbdzL7/qzfoxpMLTRK649e4ctAcXcnHvqMfSgrVhxdtpALs7231Stfi1Qvrd11zt8PM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612410; 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=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=YNdZfCq627ojKViZTrNmnbxNALprs5afn7nHecNqO3m9xdCpX2j3YEMMJ7gggpsVS5o99SrzUeliKCYsHepHB96ea1PiD5q/QPLjcF9WfjvNslpnh9sUBqX8EnWZ9vKJZgRYSIEyGk/5neB/BYFUhIiiOZGbqoDXCQc5XG3QjL4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612410200703.3619064881512; Wed, 1 Jul 2020 07:06:50 -0700 (PDT) Received: from localhost ([::1]:36348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdNw-0001cA-4J for importer@patchew.org; Wed, 01 Jul 2020 10:06:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEl-0002aL-HX for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33982) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEh-0005tK-Cm for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:19 -0400 Received: by mail-wr1-x429.google.com with SMTP id f7so20948049wrw.1 for ; Wed, 01 Jul 2020 06:57:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l18sm7652562wrm.52.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0044E1FF7E; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=F2tvzyJxzTOX8RooDOMbR6ll3Sok+dGHUyuqXmS+rFb56WUlYQsvmM/MvY835znBIu TOoUomkchoLwwO8bYwigwd+fm4GgDKD5ULawWnlOcda7Le4VADRc2Nw51zg9m9OAeVg3 bv1bBfZ/nVduT/eYFq8EFPcKxGV3iCjIiKlkov1/eUccBcyZL0rxYBED9DHPYgVrkRnn n8v+mffyQUyLthAkEs/U1dreM/JmiUYWihAEs7CiKjo7ZcfHZm4IbrfjKnKM0XqX7JjK D2jilt9Ox8lkzFtdCxEDCbBqzG3x0yeTimAK4i+tJKsABP3yEZnz4/ri8Y4PbDeVsGjp ssNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BoQbWA8pgX9GC2xijlmIAV/4o0rgmcM2g2psEePuq2U=; b=p5CnmqH7PRTuvBqW/R6j8wk7zm7EU+BsbJKEbMQoe8brSUldnEEDECFHhcaY64UQeM C4tQkNS70ADHgEYEzQrapLZhxoPyOrLy1JURNul0KjfmwIybOrtgyuCwMkDxf22yeG9+ 3Bfh84o0kpQCy+LPqJ77G7pd48CN4jVbuiUs75xBfFuFc3I37Z+/PoFO/90+UalyaN+d RypnkmrTc8TBMgNI3Kn+kKUuZjHykCBWG2usAD7DUvsq1XnIbz2vkBqGBZpuQoPhJ/2n wruyZ2DGLqbBdBsGaoxIU3uiXBTxMwaxt9F3eagTfxF1fCoHXBXqcukDOxkbtqA1L2lD 3qSg== X-Gm-Message-State: AOAM532196ZhmoKaxipH2dN3lC5EOuowXfSqE3y1D/S4/4h2L8fGqP67 b3wli2zGo7KMCpU8G5AOlQPNMQ== X-Google-Smtp-Source: ABdhPJzmWLphWr3E4fytA51a4YDqkEeNmI2cEdWuHk6UJQPGPqlQthGaqewXdC0q13b/EXVT8yQx/Q== X-Received: by 2002:adf:de0a:: with SMTP id b10mr26277109wrm.72.1593611834037; Wed, 01 Jul 2020 06:57:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 20/40] gitlab: introduce explicit "container" and "build" stages Date: Wed, 1 Jul 2020 14:56:32 +0100 Message-Id: <20200701135652.1366-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, Laszlo Ersek , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 If no stage is listed, jobs get put in an implicit "test" stage. Some jobs which create container images to be used by later stages are currently listed as in a "build" stages. Signed-off-by: Daniel P. Berrang=C3=A9 Acked-by: Laszlo Ersek Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200622153318.751107-2-berrange@redhat.com> --- .gitlab-ci.d/edk2.yml | 3 ++- .gitlab-ci.d/opensbi.yml | 3 ++- .gitlab-ci.yml | 11 +++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index a9990b71475..e1e04524166 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -1,5 +1,5 @@ docker-edk2: - stage: build + stage: containers rules: # Only run this job when the Dockerfile is modified - changes: - .gitlab-ci.d/edk2.yml @@ -24,6 +24,7 @@ docker-edk2: - docker push $IMAGE_TAG =20 build-edk2: + stage: build rules: # Only run this job when ... - changes: # ... roms/edk2/ is modified (submodule updated) - roms/edk2/* diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 6a1750784ac..62088ec5ec1 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -1,5 +1,5 @@ docker-opensbi: - stage: build + stage: containers rules: # Only run this job when the Dockerfile is modified - changes: - .gitlab-ci.d/opensbi.yml @@ -24,6 +24,7 @@ docker-opensbi: - docker push $IMAGE_TAG =20 build-opensbi: + stage: build rules: # Only run this job when ... - changes: # ... roms/opensbi/ is modified (submodule updated) - roms/opensbi/* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 349c77aa580..9fdc752ea63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +stages: + - containers + - build + include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' @@ -17,6 +21,7 @@ include: - JOBS=3D$(expr $(nproc) + 1) =20 build-system1: + stage: build image: ubuntu:19.10 <<: *before_script_apt script: @@ -31,6 +36,7 @@ build-system1: - make -j"$JOBS" check =20 build-system2: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -46,6 +52,7 @@ build-system2: - make -j"$JOBS" check =20 build-disabled: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -62,6 +69,7 @@ build-disabled: - make -j"$JOBS" check-qtest SPEED=3Dslow =20 build-tcg-disabled: + stage: build image: centos:8 <<: *before_script_dnf script: @@ -82,6 +90,7 @@ build-tcg-disabled: 260 261 262 263 264 270 272 273 277 279 =20 build-user: + stage: build <<: *before_script_apt script: - mkdir build @@ -92,6 +101,7 @@ build-user: - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user =20 build-clang: + stage: build image: fedora:latest <<: *before_script_dnf script: @@ -106,6 +116,7 @@ build-clang: - make -j"$JOBS" check =20 build-tci: + stage: build image: centos:8 <<: *before_script_dnf script: --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612566; cv=none; d=zohomail.com; s=zohoarc; b=KD8j7rqXDP6BAGsLWu/4Tu5DfPJCmXb5ao+3kqH9ya1TZgx+INRIDV3ZZB+hn3londNrpgXMf8uN9dC00hv9mXaWIXV9LQkgvYAEEjoLMbMAJK8EpzBbBqcZOUEU+/Lgc0tvUbufq1/DJiWA4sD4TExMmTkobAZEl4BtQsSpZSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612566; 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=XtbfSpBB9DtnKKoqK1hU0Y2RrtR1UeM6mQbJKmTSrNs=; b=IMm0wFZQjRWpWtP2muQjfI+Ygy53toOWg4bKGLWth5S60hZZev+GhqnnTjfk4I1mkHd7vrgjUKlgY2xAEd9tjmsA547oxtYDWfU/zLZ83MpbdnemyIhrk+IoeN/CqsDXI8c2uv3TbzhgIF9ZBfCZNO+FtrRWclEejjn8+7kTQoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159361256667437.51956669678873; Wed, 1 Jul 2020 07:09:26 -0700 (PDT) Received: from localhost ([::1]:48430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdQT-0006ej-AJ for importer@patchew.org; Wed, 01 Jul 2020 10:09:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEh-0002Xn-Kh for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:17 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:39335) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEe-0005sm-62 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:15 -0400 Received: by mail-wm1-x330.google.com with SMTP id w3so10905906wmi.4 for ; Wed, 01 Jul 2020 06:57:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f12sm7501283wrw.53.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 198061FFAA; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XtbfSpBB9DtnKKoqK1hU0Y2RrtR1UeM6mQbJKmTSrNs=; b=IdFcX18BKqKlZRkc7+UIXoRZ+Zm7BZT00PJk5OvQxpHUSuURiZQCv2hlQTUDNcHcGS ynQSnRfAUUUB6WWc0xTCzSmXRgMGxehlXuw1guhlMbcEL9BCqFBb6wYSWEhxepECmdXW Vt5J/Bew/4bdgixynydeIkEnLbCETlauflU+Lxi446lR2cJhGy11uSodydr75ROSVNnl ddQDSnFjdHnHsGzwhxrfMXoiXr87BCJczxRTtlK6mMEMv+inPPNrEcjQbZ8jtYNksPst YNjYUqozwbW58a4Uy7riVwRSLtJcq6Bz76f7faa0GR1h628kdG095NUd/2lfitXVAsfo i55g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XtbfSpBB9DtnKKoqK1hU0Y2RrtR1UeM6mQbJKmTSrNs=; b=JhQHuu+tREb1BO61sfW2rx0nhvef1iXEpeKr3iSaPy9yc9dkSkqLvbEaAHoncjrabp d8XhPdIwrc91Itg5cnNEMb0uCD2tsIrO7Sns/7zQBGVf+jiKN5vkX29mEdaor/WZWDpU E40cdx1kgl5RROXz5BxvZiI/gslwnG/mVCJxaloDM27M4LqvorAMuqlNFobC1D1RHLtZ tStojHFldmDJ4RLS65p30uHmo+Qdd3uOqxPY66m0lnNDnlfPvvcf17poEI370RAKZfzz wf+aLKcuomwz1AR3y4DQZrkdyGYXqPiC6T3eV4Fgh8JZlDRCbuljvdHSl8AlDxXQsy4I MRWw== X-Gm-Message-State: AOAM5320CxJ9hGPaxOy8Ddd+7qEkd8paM3jbD+lIr7V8nmlaj/5lOIYx HEmRCWzA1tLJacWTL7PnwfRZBQ== X-Google-Smtp-Source: ABdhPJyszFoH7T9fk2mNkMDGaTkAe8s75RGE/8ZQ8ZauNgCxjl4KiphMhipR5svppQV1mQAfaRZ1Gg== X-Received: by 2002:a7b:c84d:: with SMTP id c13mr26769260wml.170.1593611830666; Wed, 01 Jul 2020 06:57:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 21/40] gitlab: build all container images during CI Date: Wed, 1 Jul 2020 14:56:33 +0100 Message-Id: <20200701135652.1366-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 We have a number of container images in tests/docker/dockerfiles that are intended to provide well defined environments for doing test builds. We want our CI system to use these containers too. This introduces builds of all of them as the first stage in the CI, so that the built containers are available for later build jobs. The containers are setup to use the GitLab container registry as the cache, so we only pay the penalty of the full build when the dockerfiles change. The main qemu-project/qemu repo is used as a second cache, so that users forking QEMU will see a fast turnaround time on their CI jobs. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20200622153318.751107-3-berrange@redhat.com> [AJB: tweak the tag format] Signed-off-by: Alex Benn=C3=A9e Acked-by: Thomas Huth --- v4 - rm leading and trailing ws --- .gitlab-ci.d/containers.yml | 245 ++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 3 + 2 files changed, 248 insertions(+) create mode 100644 .gitlab-ci.d/containers.yml diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml new file mode 100644 index 00000000000..2afd01f1d17 --- /dev/null +++ b/.gitlab-ci.d/containers.yml @@ -0,0 +1,245 @@ +.container_job_template: &container_job_definition + image: docker:stable + stage: containers + services: + - docker:dind + before_script: + - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - docker info + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" + script: + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true + - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker= /dockerfiles/$NAME.docker + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles + - docker push "$TAG" + after_script: + - docker logout + +amd64-centos7-container: + <<: *container_job_definition + variables: + NAME: centos7 + +amd64-centos8-container: + <<: *container_job_definition + variables: + NAME: centos8 + +amd64-debian10-container: + <<: *container_job_definition + variables: + NAME: debian10 + +amd64-debian11-container: + <<: *container_job_definition + variables: + NAME: debian11 + +amd64-debian9-container: + <<: *container_job_definition + variables: + NAME: debian9 + +amd64-debian9-mxe-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian9-container'] + variables: + NAME: debian9-mxe + +alpha-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-alpha-cross + +amd64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-amd64-cross + +amd64-debian-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-amd64 + +arm64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-arm64-cross + +arm64-test-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian11-container'] + variables: + NAME: debian-arm64-test-cross + +armel-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-armel-cross + +armhf-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-armhf-cross + +hppa-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-hppa-cross + +m68k-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-m68k-cross + +mips64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64-cross + +mips64el-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips64el-cross + +mips-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mips-cross + +mipsel-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-mipsel-cross + +powerpc-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-powerpc-cross + +ppc64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-ppc64-cross + +ppc64el-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-ppc64el-cross + +riscv64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-riscv64-cross + +s390x-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-s390x-cross + +sh4-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sh4-cross + +sparc64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-sparc64-cross + +tricore-debian-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian9-container'] + variables: + NAME: debian-tricore-cross + +win32-debian-cross-container: + <<: *container_job_definition + stage: containers-layer3 + needs: ['amd64-debian9-mxe-container'] + variables: + NAME: debian-win32-cross + +win64-debian-cross-container: + <<: *container_job_definition + stage: containers-layer3 + needs: ['amd64-debian9-mxe-container'] + variables: + NAME: debian-win64-cross + +xtensa-debian-cross-container: + <<: *container_job_definition + variables: + NAME: debian-xtensa-cross + +cris-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-cris-cross + +amd64-fedora-container: + <<: *container_job_definition + variables: + NAME: fedora + +i386-fedora-cross-container: + <<: *container_job_definition + variables: + NAME: fedora-i386-cross + +amd64-ubuntu1804-container: + <<: *container_job_definition + variables: + NAME: ubuntu1804 + +amd64-ubuntu2004-container: + <<: *container_job_definition + variables: + NAME: ubuntu2004 + +amd64-ubuntu-container: + <<: *container_job_definition + variables: + NAME: ubuntu diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fdc752ea63..72d688875fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,13 @@ stages: - containers + - containers-layer2 + - containers-layer3 - build =20 include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' + - local: '/.gitlab-ci.d/containers.yml' =20 .update_apt_template: &before_script_apt before_script: --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612693; cv=none; d=zohomail.com; s=zohoarc; b=NMo5FvpQ/H3nfmqXYCE9ecPa5RSxxY6Ji+4j+as5Krs04cGWNjnops/i4Pp6RnhwPo8YrQy9c50hhUt1wtPzITEvBVVDiGoR7HJIwzsowfymx3o9Mt4h8QRddR2jV7AQOLMXvr52UBtjOAF9ZnE7gL2Sy0wbJe21uetxT+9jodQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612693; 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=Kb5Xt/DZWMuTCfEQdYSBCmTIyBxrejxoMxcdaJ+ZGQ4=; b=J+PfVnkh656aNqkRjC1YNTRhXddunXIKquONgwT/xL2aBfI3YvRxi1iTW6BaHzouVZ5xrky3DxBKuJtleRiIiuO3NXfKYvsgzjTJ4R9jBBvkc0EL9Ib+I9PkBC7RcQ7U4G1gkPD/asiAwHmmU163oZmmhfdGwxTEwSl3yu8N4VA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612693314641.0423274422665; Wed, 1 Jul 2020 07:11:33 -0700 (PDT) Received: from localhost ([::1]:56954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdSW-0001oW-2H for importer@patchew.org; Wed, 01 Jul 2020 10:11:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEo-0002ae-Pf for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:37765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEf-0005t1-H7 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:20 -0400 Received: by mail-wr1-x432.google.com with SMTP id a6so23962239wrm.4 for ; Wed, 01 Jul 2020 06:57:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r3sm8384735wrg.70.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 31CEE1FFAB; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kb5Xt/DZWMuTCfEQdYSBCmTIyBxrejxoMxcdaJ+ZGQ4=; b=wRPh621dQO+17zfaPmheqmLxotbDMbYOmXo/wV9u3H974kzXildt1BdoTcFOewtVCT Orl3mzwi3Xszc6EW12hp2ThG8ciRcnGYxrgWy0Nlj5Qn2djCZtnB3pKi6jacQr8R0d62 Fd6pfcTqA4OFsjdQUhmOVOgsklQeCLHmK4SHCufuDlq2CXpD5Ex4yxHgTqwBtJRK4hx+ L4zKfLSSRVIQTpH0FKehMZoSATTWJC6vpY18Pu/1IHnrU2zPCaoeuSXPeOcRF3xNWthj hP9dxC4f0AZCs935hpDIZa4iZ9Fw1qwLqTBNeGpemCb0pSNzzl/aUuVNMUym6B14tpYk 6mhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kb5Xt/DZWMuTCfEQdYSBCmTIyBxrejxoMxcdaJ+ZGQ4=; b=g4ShaWyi/gqwwbkOmyV4HHAim5SBkADkQC8IpwLgA2epxdY3KzuJ9XGyRL1Y1c1xZQ yO/LDBLGDW/2pE0gGVsIwqBSb7rkKpSplUrRQ/0mDpRIabH7ivuSXu+/1O0AAZbf66tm IX0ZJwa+NO/4onnmNmOguSDWpJOEgK5kk3cO4mCTOgZJRtrVfVthAEEZBg8MkT8O+BUX zi/s3W8aMk9+j5R8dH/NzWfY0FG0upntV2ww/IXKhYxE4/KH5m7DaKF282ZALPPE1hpp wQ8XQgbwFjSxffUuQ1avwyQb3v4pMpn03/6w1pnY6jfoDqSySfYZkWKMH+R7ClpBIE1D HJmQ== X-Gm-Message-State: AOAM531ePr7NXVu2kt7wfTGwKh14w71eS7spWMzwr7GCDhTph8jGQkig LjWXcf9pyQUqthrnS8Pj9gOd+g== X-Google-Smtp-Source: ABdhPJwSVZhKFzpmg6aK3hBH6vKn6JDn9DR/OP+EN8D9NuoHYs8qgpRtOnjUzo8eIQ/8M1qm+uQCug== X-Received: by 2002:adf:f14c:: with SMTP id y12mr26463431wro.30.1593611831855; Wed, 01 Jul 2020 06:57:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 22/40] gitlab: convert jobs to use custom built containers Date: Wed, 1 Jul 2020 14:56:34 +0100 Message-Id: <20200701135652.1366-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 Now that we're building standard container images from dockerfiles in tests/docker/dockerfiles, we can convert the build jobs to use them. The key benefit of this is that a contributor can now more easily replicate the CI environment on their local machine. The container images are cached too, so we are not spending time waiting for the apt-get/dnf package installs to complete. Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20200622153318.751107-4-berrange@redhat.com> [AJB: tweak naming convention] Signed-off-by: Alex Benn=C3=A9e Acked-by: Thomas Huth --- .gitlab-ci.yml | 187 +++++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 106 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72d688875fd..a7abc55a5c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,133 +9,108 @@ include: - local: '/.gitlab-ci.d/opensbi.yml' - local: '/.gitlab-ci.d/containers.yml' =20 -.update_apt_template: &before_script_apt - before_script: - - apt-get update -qq - - apt-get install -y -qq git gcc libglib2.0-dev libpixman-1-dev make - genisoimage - - JOBS=3D$(expr $(nproc) + 1) - -.update_dnf_template: &before_script_dnf - before_script: - - dnf update -y - - dnf install -y bzip2 diffutils gcc git genisoimage findutils glib2-dev= el - make python3 perl-podlators perl-Test-Harness pixman-devel zlib-de= vel - - JOBS=3D$(expr $(nproc) + 1) +.native_build_job_template: &native_build_job_definition + stage: build + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + before_script: + - JOBS=3D$(expr $(nproc) + 1) + script: + - mkdir build + - cd build + - if test -n "$TARGETS"; + then + ../configure --enable-werror $CONFIGURE_ARGS --target-list=3D"$TAR= GETS" ; + else + ../configure --enable-werror $CONFIGURE_ARGS ; + fi + - make -j"$JOBS" + - make -j"$JOBS" $MAKE_CHECK_ARGS =20 build-system1: - stage: build - image: ubuntu:19.10 - <<: *before_script_apt - script: - - apt-get install -y -qq libgtk-3-dev libvte-dev nettle-dev libcacard-dev - libusb-dev libvde-dev libspice-protocol-dev libgl1-mesa-dev libvdepl= ug-dev - - mkdir build - - cd build - - ../configure --enable-werror --target-list=3D"aarch64-softmmu alpha-sof= tmmu - cris-softmmu hppa-softmmu lm32-softmmu moxie-softmmu microblazeel-so= ftmmu - mips64el-softmmu m68k-softmmu ppc-softmmu riscv64-softmmu sparc-soft= mmu" - - make -j"$JOBS" - - make -j"$JOBS" check + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu lm32-= softmmu + moxie-softmmu microblazeel-softmmu mips64el-softmmu m68k-softmmu ppc= -softmmu + riscv64-softmmu sparc-softmmu + MAKE_CHECK_ARGS: check =20 build-system2: - stage: build - image: fedora:latest - <<: *before_script_dnf - script: - - yum install -y SDL2-devel libgcrypt-devel brlapi-devel libaio-devel - libfdt-devel lzo-devel librdmacm-devel libibverbs-devel libibumad-d= evel - libzstd-devel - - mkdir build - - cd build - - ../configure --enable-werror --target-list=3D"tricore-softmmu unicore32= -softmmu - microblaze-softmmu mips-softmmu riscv32-softmmu s390x-softmmu sh4-so= ftmmu - sparc64-softmmu x86_64-softmmu xtensa-softmmu nios2-softmmu or1k-sof= tmmu" - - make -j"$JOBS" - - make -j"$JOBS" check + <<: *native_build_job_definition + variables: + IMAGE: fedora + TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-sof= tmmu + riscv32-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu x86_64-sof= tmmu + xtensa-softmmu nios2-softmmu or1k-softmmu + MAKE_CHECK_ARGS: check =20 build-disabled: - stage: build - image: fedora:latest - <<: *before_script_dnf - script: - - mkdir build - - cd build - - ../configure --enable-werror --disable-rdma --disable-slirp --disable-c= url + <<: *native_build_job_definition + variables: + IMAGE: fedora + CONFIGURE_ARGS: --disable-rdma --disable-slirp --disable-curl --disable-capstone --disable-live-block-migration --disable-glusterfs --disable-replication --disable-coroutine-pool --disable-smartcard --disable-guest-agent --disable-curses --disable-libxml2 --disable-t= pm --disable-qom-cast-debug --disable-spice --disable-vhost-vsock --disable-vhost-net --disable-vhost-crypto --disable-vhost-user - --target-list=3D"i386-softmmu ppc64-softmmu mips64-softmmu i386-linu= x-user" - - make -j"$JOBS" - - make -j"$JOBS" check-qtest SPEED=3Dslow + TARGETS: i386-softmmu ppc64-softmmu mips64-softmmu i386-linux-user + MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow =20 build-tcg-disabled: - stage: build - image: centos:8 - <<: *before_script_dnf - script: - - dnf install -y clang gtk3-devel libusbx-devel libgcrypt-devel - - mkdir build - - cd build - - ../configure --cc=3Dclang --enable-werror --disable-tcg --audio-drv-lis= t=3D"" - - make -j"$JOBS" - - make check-unit - - make check-qapi-schema - - cd tests/qemu-iotests/ - - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 + <<: *native_build_job_definition + variables: + IMAGE: centos8 + script: + - mkdir build + - cd build + - ../configure --disable-tcg --audio-drv-list=3D"" + - make -j"$JOBS" + - make check-unit + - make check-qapi-schema + - cd tests/qemu-iotests/ + - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033= 048 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 - - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 = 122 + - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 1= 02 122 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 260 261 262 263 264 270 272 273 277 279 =20 build-user: - stage: build - <<: *before_script_apt - script: - - mkdir build - - cd build - - ../configure --enable-werror --disable-system --disable-guest-agent - --disable-capstone --disable-slirp --disable-fdt - - make -j"$JOBS" - - make run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-linux-user + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --disable-system --disable-guest-agent + --disable-capstone --disable-slirp --disable-fdt + MAKE_CHECK_ARGS: run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-l= inux-user =20 build-clang: - stage: build - image: fedora:latest - <<: *before_script_dnf - script: - - yum install -y clang SDL2-devel libattr-devel libcap-ng-devel xfsprogs-= devel - libiscsi-devel libnfs-devel libseccomp-devel gnutls-devel librbd-de= vel - - mkdir build - - cd build - - ../configure --cc=3Dclang --cxx=3Dclang++ --enable-werror - --target-list=3D"alpha-softmmu arm-softmmu m68k-softmmu mips64-softm= mu - ppc-softmmu s390x-softmmu x86_64-softmmu arm-linux-us= er" - - make -j"$JOBS" - - make -j"$JOBS" check + <<: *native_build_job_definition + variables: + IMAGE: fedora + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ + TARGETS: alpha-softmmu arm-softmmu m68k-softmmu mips64-softmmu + ppc-softmmu s390x-softmmu x86_64-softmmu arm-linux-user + MAKE_CHECK_ARGS: check =20 build-tci: - stage: build - image: centos:8 - <<: *before_script_dnf - script: - - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86= _64" - - mkdir build - - cd build - - ../configure --enable-tcg-interpreter - --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; = done)" - - make -j"$JOBS" - - make run-tcg-tests-x86_64-softmmu - - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/px= e-test - - for tg in $TARGETS ; do - export QTEST_QEMU_BINARY=3D"${tg}-softmmu/qemu-system-${tg}" ; - ./tests/qtest/boot-serial-test || exit 1 ; - ./tests/qtest/cdrom-test || exit 1 ; - done - - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/qtest/p= xe-test - - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" - ./tests/qtest/pxe-test -m slow + <<: *native_build_job_definition + variables: + IMAGE: fedora + script: + - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x = x86_64" + - mkdir build + - cd build + - ../configure --enable-tcg-interpreter + --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '= ; done)" + - make -j"$JOBS" + - make run-tcg-tests-x86_64-softmmu + - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest= /pxe-test + - for tg in $TARGETS ; do + export QTEST_QEMU_BINARY=3D"${tg}-softmmu/qemu-system-${tg}" ; + ./tests/qtest/boot-serial-test || exit 1 ; + ./tests/qtest/cdrom-test || exit 1 ; + done + - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/qtes= t/pxe-test + - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" ./tests/qtest/= pxe-test -m slow --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612792; cv=none; d=zohomail.com; s=zohoarc; b=ii3xB52XSI3vLRM92A2FW16tWFF2SA7YtePOLOTnh6ttkJvdXwH1PMbIbIeP+PGs4ZfFfLZlD3qVXZqbHvg8WlT1Ba4Z3FPwz98hg7K1t3ACkDjELuWDfDcNpwogxlIYBmp4vU5b+HjEQi4IzFnhMvBUJIAbQdDPyy83bec+QKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612792; 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=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=UeuOff1TyGPikqV4vb5gDlaSVHnriPz3D4eoGIQdWNz8S/7O1AdMXx3+zIwC2ii+uDZ5YRLoQTuHP6Ap0WCGLazkN1+UrZaLVXiKIuwnk9GogtlbfAPjjWGlMacUvm/UUiOPvH8t8Q3utN0E8XykJLYCN/hWMGMBhqATDknjNC4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612792846151.82670192644923; Wed, 1 Jul 2020 07:13:12 -0700 (PDT) Received: from localhost ([::1]:37210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdU7-0005OK-It for importer@patchew.org; Wed, 01 Jul 2020 10:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEo-0002af-Qg for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34376) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEh-0005tA-8q for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: by mail-wm1-x343.google.com with SMTP id g10so6888266wmc.1 for ; Wed, 01 Jul 2020 06:57:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 1sm7109422wmf.21.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 46B371FFAC; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=wxl4gecImMJT4THqkLYBACUbfKIZwB++ODONQkyqLDLENty9DzcVnMc4zxOo2CCPxn aJc14UHBUYQE8DVUPkzSrcTr2TMvfh+ysCqkBYgVPTthLELR84WzvrKtVWO5pkOE9Vot q8E744gVxYZdKsldP47c8lL5seuP8L7VGJvjzJpf3wrFd0jUK+uacvetIy0ZynmHz8Ie pqEO2UATz9jeUNhAd6GEbkkzdOkpSefXin5r2gne8VJbkuN6Pzn5URNTX6cCBAwnafC3 zF1TSNYiPjsDxhdeCmZf2yNcuIb+nzMmrQqvhW0Zddj/PdO49B8cLi6a5wx8sC0woqMe CdrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TNPsrLyF7lXSFi67XMppVcIlDb8Jop3OMsLkQ8Zh/L0=; b=eV46P/iYZ7bdg57MrcnS60zYo6XY96ZEaUwaG/BHWZAOf83wXADzOGqqziFNGGM7X3 bfRtERRgn3x+FWYeeurIrqsAHo2Qj7Ma3MvM6vzcpZafrAnZuDyFMR+jq+eXBaOTC7Jq HIFiVWS0VH+pw10ORT5UiF3FmWaaneY+QXQAMQw3yjVNeoJzyCzpO1P8zRa/+w5/0H1U wqx/M0vuixP6//BzwciYm08HbKkW6fg9ExHHqYzcmUEMcJUpYc44QdHMrwG9XH7olJh7 WMqCGMgWI5WNR3RI2SJ/TE91lBB4LiRlQMezYoQCfg6REMbv/2+w1ew3Wxe0HIgiFSAS xKIQ== X-Gm-Message-State: AOAM5336D8aAL+lfphXslOlv4uVB5p6lw9aA0MZzyTklEEddO3tj3e8W Zy05QmuVpEdKjknqRSH9QWpSfw== X-Google-Smtp-Source: ABdhPJz3Oe2JIUslinJf5GsWtAgOroJ0Trtcy+zO9BiT4TBtOJUDHEavxM30woe6ZRuvfQiv42SiCA== X-Received: by 2002:a1c:f616:: with SMTP id w22mr27898939wmc.155.1593611833023; Wed, 01 Jul 2020 06:57:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 23/40] gitlab: build containers with buildkit and metadata Date: Wed, 1 Jul 2020 14:56:35 +0100 Message-Id: <20200701135652.1366-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) According to the documentation to be able to use --cache-from for remote registries you need to enable both buildkit and inline the metadata. We want to do this to support pulling from gitlab when users build their local docker images. Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/containers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 2afd01f1d17..f353359fd8b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -11,7 +11,9 @@ script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker= /dockerfiles/$NAME.docker - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles + - DOCKER_BUILDKIT=3D1 docker build --cache-from "$TAG" --cache-from "$= COMMON_TAG" --tag "$TAG" + --build-arg BUILDKIT_INLINE_CACHE=3D1 + -f "tests/docker/dockerfiles/$NAME.do= cker" tests/docker/dockerfiles - docker push "$TAG" after_script: - docker logout --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612456; cv=none; d=zohomail.com; s=zohoarc; b=Z67VulXZDEogpzFNF0sIOtlt+t3kup4JUxO7TTlzW+N9oRu5W0iOyJpTvkNhsc2IeYbDeOuEKrmfWS/pYhWFJ7/D7NpM+ybYeECIICBoMO458KdolyS7aqGtFW1fFjCShnLCEvd6A3EESwI75UCxsutiY/wMzqFJujwKwj7v+1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612456; 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=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=Ut2HAOQwql+QMj7/dVcSA4I/oJhE9rbI+42GtLBIfA55bKM0A/rEeZIaj8m3VLqUrEfkAvguF8h8u6r8DaGFDsF3y88/Bsp8VWilf6FrNwlONUxC9UczgTs/8L5ThTKCx4Fx4Oyu28XTUHGilkjLMSIlk7elkc2cCJwRKlSSkck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612456745974.6773744971098; Wed, 1 Jul 2020 07:07:36 -0700 (PDT) Received: from localhost ([::1]:39932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdOh-00038g-Gy for importer@patchew.org; Wed, 01 Jul 2020 10:07:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEf-0002Wu-RR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEb-0005sN-VL for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:13 -0400 Received: by mail-wr1-x443.google.com with SMTP id o11so23963673wrv.9 for ; Wed, 01 Jul 2020 06:57:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm7285076wmi.34.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5CFEB1FFAE; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=QV9lfwcPg8Ttws8CsGNaD1CPyYpwfk+XUjlDyReZPoF9eZo0F4/F/8DvpURdMKCLci 1rDiqEbCpKFgMKAjfmPCCw/r5SHqeiGbFYWBI03AA3zI4qup9+aabS6qoovj0UChcP0U HCOuWUErC8QxVOWUYXbSXDVKAK1MKg0rQ5SiQ11FB42E3lBfHPP5qJsJwL33K434TFc4 u6ZB6K3WeTmDK+98niCm3P1Usd4Xr6czgUgW5NHrGBs3OPWRXTNQaKcnW44h4J9bMsI6 Lsdbu4+D/qq+jCPGE4PmdCBP35r0oNjHrn69XjLG/BYYyBwQScl8c+rxrbOIIj0AucOk BolQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=exK2T2MdWS6aFBy21shNs5k4lOpcVBAsMoKKdhNxF9a3cj3/5f7B9aOzanPwG/HtWs QIZ92bNIJ3HVyohVrHSbQRWbPiasTJwgV9S4+5l3MmjFlhESWOygmGR42QSdU8k7mOkr aHQFFkfpivQaV7tfQQrcm8UV5pitoRSFTZxGD+53bgjnk+gy+bUkvd9DmzRnVg48oa7M iee8oELghmd4lHgpdnFfoU5roRd5847v5DmorVg8l5K7Jz8lC8umT059ifXVHSxPmkir IhhUdSVV45M2Rpnvt8SyHE4TBN02kMPSpBfP8uMdI5IAqjeFMLJZccGdm/z0OFD37XYP WuIg== X-Gm-Message-State: AOAM530Au7MmRUBIxpcYWsaACh9HeORlW74xHo7+0uGrBvVDacqoUYkS jFGyrIkGEI/e5IvX5LVwUB9Gvw== X-Google-Smtp-Source: ABdhPJyg0RYEDdR5r1t7uGXKZgPWS8Fj8q6k8tIl0NVFnN2qNCeDD+ZlE0LvWpsSeH95TNMX0mLrkQ== X-Received: by 2002:adf:f311:: with SMTP id i17mr28013335wro.237.1593611828585; Wed, 01 Jul 2020 06:57:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 24/40] tests/docker: add --registry support to tooling Date: Wed, 1 Jul 2020 14:56:36 +0100 Message-Id: <20200701135652.1366-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This allows us to point the tools towards a registry from which they can grab pre-built layers instead of doing everything from scratch each time. To enable this we need to be using the DOCKER_BUILDKIT engine. [AJB: note registry.gitlab.com/stsquad/qemu is for my testing, the final version will see DOCKER_REGISTRY default to registry.gitlab.com/qemu-= project/qemu] Signed-off-by: Alex Benn=C3=A9e --- v2 - add a pull stage to pull images from the registry - enable BUILDKIT and BUILDKIT_INLINE_CACHE - don't invoke BUILDKIT on Travis v4 - Don't pass --registry in the NOCACHE case - precalc checksum before doing any replace steps --- tests/docker/Makefile.include | 6 ++++- tests/docker/docker.py | 44 ++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e23b4af20ea..977d8ff6e40 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -13,6 +13,7 @@ DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard = $(DOCKER_FILES_DIR)/*.doc DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache +DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/stsq= uad/qemu) =20 DOCKER_TESTS :=3D $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) @@ -56,7 +57,9 @@ else docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $V,,--quiet) \ + $(if $(NOCACHE),--no-cache, \ + $(if $(DOCKER_REGISTRY),--registry $(DOCKER_REGISTRY))) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)),\ @@ -213,6 +216,7 @@ endif @echo ' Include extra files in image.' @echo ' ENGINE=3Dauto/docker/podman' @echo ' Specify which container engine to run.' + @echo ' REGISTRY=3Durl Cache builds from registry (default:$(D= OCKER_REGISTRY))' =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make diff --git a/tests/docker/docker.py b/tests/docker/docker.py index cc6f76caa60..9684f07bdeb 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -221,6 +221,13 @@ class Docker(object): """ Running Docker commands """ def __init__(self): self._command =3D _guess_engine_command() + + if "docker" in self._command and "TRAVIS" not in os.environ: + os.environ["DOCKER_BUILDKIT"] =3D "1" + self._buildkit =3D True + else: + self._buildkit =3D False + self._instance =3D None atexit.register(self._kill_instances) signal.signal(signal.SIGTERM, self._kill_instances) @@ -289,10 +296,24 @@ class Docker(object): return labels.get("com.qemu.dockerfile-checksum", "") =20 def build_image(self, tag, docker_dir, dockerfile, - quiet=3DTrue, user=3DFalse, argv=3DNone, extra_files_c= ksum=3D[]): + quiet=3DTrue, user=3DFalse, argv=3DNone, registry=3DNo= ne, + extra_files_cksum=3D[]): if argv is None: argv =3D [] =20 + # pre-calculate the docker checksum before any + # substitutions we make for caching + checksum =3D _text_checksum(_dockerfile_preprocess(dockerfile)) + + if registry is not None: + dockerfile =3D dockerfile.replace("FROM qemu/", + "FROM %s/qemu/" % + (registry)) + # see if we can fetch a cache copy, may fail... + pull_args =3D ["pull", "%s/%s" % (registry, tag)] + self._do(pull_args, quiet=3Dquiet) + + tmp_df =3D tempfile.NamedTemporaryFile(mode=3D"w+t", encoding=3D'utf-8', dir=3Ddocker_dir, suffix=3D".= docker") @@ -306,15 +327,23 @@ class Docker(object): (uname, uid, uname)) =20 tmp_df.write("\n") - tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s" % - _text_checksum(_dockerfile_preprocess(dockerfile))) + tmp_df.write("LABEL com.qemu.dockerfile-checksum=3D%s" % (checksum= )) for f, c in extra_files_cksum: tmp_df.write("LABEL com.qemu.%s-checksum=3D%s" % (f, c)) =20 tmp_df.flush() =20 - self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + - [docker_dir], + build_args =3D ["build", "-t", tag, "-f", tmp_df.name] + if self._buildkit: + build_args +=3D ["--build-arg", "BUILDKIT_INLINE_CACHE=3D1"] + + if registry is not None: + cache =3D "%s/%s" % (registry, tag) + build_args +=3D ["--cache-from", cache] + build_args +=3D argv + build_args +=3D [docker_dir] + + self._do_check(build_args, quiet=3Dquiet) =20 def update_image(self, tag, tarball, quiet=3DTrue): @@ -403,6 +432,8 @@ class BuildCommand(SubCommand): parser.add_argument("--add-current-user", "-u", dest=3D"user", action=3D"store_true", help=3D"Add the current user to image's passwd= ") + parser.add_argument("--registry", "-r", + help=3D"cache from docker registry") parser.add_argument("-t", dest=3D"tag", help=3D"Image Tag") parser.add_argument("-f", dest=3D"dockerfile", @@ -458,7 +489,8 @@ class BuildCommand(SubCommand): for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, - quiet=3Dargs.quiet, user=3Dargs.user, argv=3Da= rgv, + quiet=3Dargs.quiet, user=3Dargs.user, + argv=3Dargv, registry=3Dargs.registry, extra_files_cksum=3Dcksum) =20 rmtree(docker_dir) --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612301; cv=none; d=zohomail.com; s=zohoarc; b=liB9KO8RrHRTkWZgZl64jpp7vzRsHxNK/aaloGAStfLeLcZ3CXyEtJD7jIdyrEiRCxnY79FusTkNSQpWn1MglL/tz3lHBEfCrKTlePt6ObX12JvjukhqfWDpG+hPJBxT3MJirf4ciuWg1T7cDvidJVLAkLguLZgLGGY57XcEYEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612301; 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=L8UfFOdn0PEpfIwJNpttfVutTAGLSZl2+EE67E2O1dE=; b=Cot1Zd1KV+vuFhPrKvPQB+fKh6Pu4bwEK32Y02oAJnhtSFJ7emtKQWjVW9fM8FCH50tojB37BKIJXCNeL2D8LbFQg1HIGnuBmC0wrTFhIQRSC/rC+hzCFXRogMczgg6D7FsyannQ4ixN37xgjfi3QkPB0OK0k1vF02QCwfBdsuA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612301393641.8392780750681; Wed, 1 Jul 2020 07:05:01 -0700 (PDT) Received: from localhost ([::1]:55748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdMC-0006Le-1l for importer@patchew.org; Wed, 01 Jul 2020 10:05:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEc-0002VK-2r for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:11 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:42727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEa-0005s0-5V for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:09 -0400 Received: by mail-wr1-x432.google.com with SMTP id o11so23963513wrv.9 for ; Wed, 01 Jul 2020 06:57:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c65sm7158037wme.8.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 73CAF1FFAF; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L8UfFOdn0PEpfIwJNpttfVutTAGLSZl2+EE67E2O1dE=; b=ECf6hMdnZSxiSvyASALYKL8QtN0yvYibTwrCRMVphCpoOSQkwGa9xHsW4qZblU4/7e F+jDv4EF+Iqkz3073JBo52kCk+/yxtN2OGc9MvuPA/piZxAsDzdKxbhVAQA45ouCY0FO L4V7mIQl+wl6WCh9peaa6vnG0JzUd8nXJ3czSTUlIJYnKm3nvjd/TkCL6VT5iZw/zJt/ edGIjGIsFBBMlKLDtHPpfsptnhAVWMlT11zWvoRYTc6eih/gj3rbGoO/MkgJSIzE0ffP aeHxSrafSlYIV10eDNsf1ioY1XGOLTlXRL1HpWya1gk6rifZhu9QgBAVlXZK15jsHl1T Hahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L8UfFOdn0PEpfIwJNpttfVutTAGLSZl2+EE67E2O1dE=; b=kGjeXGQZAHTF4mvzEeU8WhZVcqgh3oQIHlkiHIGmxOuINK/lRAiLr/v2tcGBJbQqNs tCuHEV+MGq2oxDsnsnLDRIIjLWEeXnEaRGAdju3gILUz+Xc+QMHHhYE9O8ZwVGPM5FFS m4WsuioPePTviawfmmg/YNiZNA/2yK+L6drqUORI27Av3EflnoAP/Uad1KqIJomDEN+r qCF8OUIOqygaZ7AAU8gwmBR2hhjpXufxzg35nXO9yOcDX8wEgaZjre5Xkxc8ncBnc6Xc ZZbQO7Bj5FQMa0/HWMPsJdBVbKoEWTzd3fcb5qJHXQepnucZ3NELzZDzeRRgITlPejHY 7XLQ== X-Gm-Message-State: AOAM5331cwh41Hcl0ECa/YRolVy9CcG9ry8DEgCfTcp8fRft3ZQpAd1h TwhJ630sCApE1mojpe0tyKisTQ== X-Google-Smtp-Source: ABdhPJwmLxu3rdFhcap5RrAIzAV7AHizoxqQmQLhhLq5Jr5MMZYntecCSkmAqsLDyIRTVYDtFbud9Q== X-Received: by 2002:a5d:43d2:: with SMTP id v18mr26461379wrr.196.1593611826657; Wed, 01 Jul 2020 06:57:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 25/40] tests/docker: add packages needed for check-acceptance Date: Wed, 1 Jul 2020 14:56:37 +0100 Message-Id: <20200701135652.1366-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We need additional python packages to run check-acceptance. Add them to the docker images we will be using later. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- tests/docker/dockerfiles/fedora.docker | 7 +++++++ tests/docker/dockerfiles/ubuntu2004.docker | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 798ddd2c3e0..70b6186bd3e 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -80,7 +80,12 @@ ENV PACKAGES \ pixman-devel \ python3 \ python3-PyYAML \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ python3-sphinx \ + python3-virtualenv \ rdma-core-devel \ SDL2-devel \ snappy-devel \ @@ -89,6 +94,8 @@ ENV PACKAGES \ systemd-devel \ systemtap-sdt-devel \ tar \ + tesseract \ + tesseract-langpack-eng \ texinfo \ usbredir-devel \ virglrenderer-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 6050ce7e8a8..f7aac840bf8 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -46,9 +46,17 @@ ENV PACKAGES flex bison \ libxen-dev \ libzstd-dev \ make \ - python3-yaml \ + python3-numpy \ + python3-opencv \ + python3-pil \ + python3-pip \ python3-sphinx \ + python3-venv \ + python3-yaml \ + rpm2cpio \ sparse \ + tesseract-ocr \ + tesseract-ocr-eng \ texinfo \ xfslibs-dev\ vim --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612516; cv=none; d=zohomail.com; s=zohoarc; b=LQUPm6sliMvIUqOJCQQj4Mq5GsgxGcnOrWpXL9KPQiqJSIWUtX9qSFczK37RM/3/DXJMUY/XlCMFBNng264aTJ9v2CrZVK2qBH636U90Xe+G0zJesf+paGDrbqatB9jrYAc07xKQh+kKrMaVsaUivdcAscEguchVVGcvjwEZIJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612516; 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=CRf3v0aaaaR+c9GY3Mn+3wHhPs/9iLnwOOfyb/6spX0=; b=fw0HPHBgWvIzoOS3ldTCbYfulHnN9sodKDHcS75ROEw0BEGMFY2tVM8UT1pucJdbdgF6Z4qPRUm9khqP94MFBgPuPjJX73iMBeyb/l2NZNO3VAvGSKnxqA4duyxr8Dyo+FLHk1Pldr/aWEZ5L75C8m1/gc641L96pnCDKfQJfkE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612516835975.5938991105455; Wed, 1 Jul 2020 07:08:36 -0700 (PDT) Received: from localhost ([::1]:44760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdPf-000591-EE for importer@patchew.org; Wed, 01 Jul 2020 10:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEl-0002aS-T5 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:22 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEd-0005sZ-O4 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:19 -0400 Received: by mail-wr1-x441.google.com with SMTP id h5so23946823wrc.7 for ; Wed, 01 Jul 2020 06:57:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f12sm7656081wrj.48.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88B051FFB1; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CRf3v0aaaaR+c9GY3Mn+3wHhPs/9iLnwOOfyb/6spX0=; b=MnGkTs62GIjDUDCSW2mDMS1rzy4p/9jBi89tjeATcisAQ1ujXbRPaXrPocKYRXHTVY Lw5kl5QjotHF7SY4l4GhNcJNCYahPie+16tGklWcVZZp+qIXM0YQHpjhWOg2uKXtJYMe Glq3GBO/1g4JRCFxrucaLYqn5/rzbGvfssFwvBrHyeGPdCTyHbLlXD5bXCFSi0wwBIbF MhDojqT8BdQdS9nC6huEZox42yrGyzDOVe+TgiFkFcICMMP+ThzhapXtC3BSCZ1Ry+d3 ZgljM+3LVEWHKBptLTbX9sx+7Zvbjns5Khgo+gslN54VFWJ+Uw7qhfMm41w9sztRfMgB HuTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CRf3v0aaaaR+c9GY3Mn+3wHhPs/9iLnwOOfyb/6spX0=; b=H91Gi3qiSk4grg3etdK6K2l7gDyf5rHAwY/Q+vaFywJO8BjDcvsQTXpWlB+vYkCQPS zueD278sJJ1FE6P360STcZdrlZOUIU33UBQcFaaCwdvlLs72+NcauUbIIEoS0Kj+uRPG /gCT8FAVY64ihdATlPUCcWX5BL1N7O+vgIL9RgJTdDSaSf4wGW1yxrfRmeqANDKOLBMx O4jEvrxmIJKX7NeqTzT8Ac0U61MntxGthncs5DvXlu3iHHYl8Ks1nc/UwB1Rt8YQnX1o hVyPATdKGtu8HZBCP8skF4QqrmkUTmwEQvi4nEX9ZkkEI+5Pa73hmOvbTaHs5eDf9Dbg /6BA== X-Gm-Message-State: AOAM531gs4jgBLcYigLKoRl8/jTB5GaVBZnhBeRd/JvqCamoXsEm6M1r 7pTk/KazMAQK4mvlSQbIATYFiw== X-Google-Smtp-Source: ABdhPJxBt3KFGN2tOV18EukzPGM9QJhlDQwC7//Rdgrd3PG7+gzcO9MZiPTc1Vv7EJf6q7CLrx+gIQ== X-Received: by 2002:adf:f842:: with SMTP id d2mr29114629wrq.55.1593611829478; Wed, 01 Jul 2020 06:57:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 26/40] tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab Date: Wed, 1 Jul 2020 14:56:38 +0100 Message-Id: <20200701135652.1366-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cornelia Huck , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:S390 general arch..." , cota@braap.org, Cleber Rosa , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Currently the test takes more the 900 seconds on GitLab and then times out. Running on Travis seems to be OK. Signed-off-by: Alex Benn=C3=A9e --- tests/acceptance/boot_linux.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 3aa57e88b0b..0055dc7cee7 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -20,6 +20,7 @@ from avocado.utils import network from avocado.utils import vmimage from avocado.utils import datadrainer from avocado.utils.path import find_command +from avocado import skipIf =20 ACCEL_NOT_AVAILABLE_FMT =3D "%s accelerator does not seem to be available" KVM_NOT_AVAILABLE =3D ACCEL_NOT_AVAILABLE_FMT % "KVM" @@ -220,6 +221,7 @@ class BootLinuxS390X(BootLinux): =20 chksum =3D '4caaab5a434fd4d1079149a072fdc7891e354f834d355069ca982fdcaf= 5a122d' =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self): """ :avocado: tags=3Dmachine:s390-ccw-virtio --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612760; cv=none; d=zohomail.com; s=zohoarc; b=lI//krjnZvCofhG0MR/953M41RGt3YyNbzVlkWASH0daTUAHUy00fhgjNj33hrUUh3UnZifhASiowH22HjYz+rq+KkXz4Z7Haf0tBuJUkHH0E+7O8MEGG/hL9aNxzbSP74QK/R4stWZEUGTVA7aXayWheOVNUg1wTa/UoclB4WE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612760; 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=pcMZ/obXnz3i4V6AJOF1d+E1lr/wSxwpDkghVxLQofU=; b=ieWN6ktU9sYEPyPCGcqhfdCjMXowZwksAtwGkTlnV1Dh5+PvvAztWByrfT4oOq2JP/x7+UGyhUDYcMKCzmqoVj1EIMjWL0g4m+kiJ16XDIA94Pop2JNTFA4KTS07lPEN17SMplZp1+5mUWci/kCCVEjTgfTTuyIKZDISZXlHIto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159361276033317.603930422875692; Wed, 1 Jul 2020 07:12:40 -0700 (PDT) Received: from localhost ([::1]:34292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdTb-0004Cs-1v for importer@patchew.org; Wed, 01 Jul 2020 10:12:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKr-0004nU-H5 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:37 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKl-0006om-Sz for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:37 -0400 Received: by mail-wm1-x341.google.com with SMTP id o2so23396855wmh.2 for ; Wed, 01 Jul 2020 07:03:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u2sm6878069wml.16.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9FF731FFB3; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pcMZ/obXnz3i4V6AJOF1d+E1lr/wSxwpDkghVxLQofU=; b=ne7BbYYUPGqQ4gOO2pqVyltzSPxSk5g3bbKAs0ix0pW/vg9x0GoLC775o5s61wPYCm 3FnADJ4CIg265fOYvP5XBHO8e1Gp3jh8o59WnhRD5cdatWhd4DOkVuLiL/r+7XuTz00N OVqG2acLbGWq2N9EqTCfkG3Cffr/YcnZHhLZLvrdOSSUWRkG0AsNiQlepRWVhQupEKLs Xf2jwOprYTAyrwF8VTM/+NPmRIiQbliz8wfyjIS5fQn7GeiryTmBt7RxEHOFuJv5Hi+J +PGfnnxQTIsCkqJZdBX2zbWpfi1ySxk01UyjXXSTu6SDtBey5H9BV0FwrdjHR66kACiN Y3zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pcMZ/obXnz3i4V6AJOF1d+E1lr/wSxwpDkghVxLQofU=; b=MTLKXQn9ZioXiHPTWao8j3FdFmhQID1hZmfNBbvb9Qc7eQN+7kE5Xq6S/Vg2s6TPfv o/5aEN3GGGic138ZjgSzSHfKc2Wd/FFSfqvaIP+VrQeeU6qtH9wy45V5BD/+6HAbzF9d hJYVqInCEx9ZniU+uK1xfgANmi0CVJBWJsni5SQTtrO/qIu5of7v1gSjpSm7k4Qfco5l fOiAFmds2qJ5hOD3xxD0imx9Hu7OOZFkIpHcmBfx3OIcRcTB1DI5UhyohXPOOAi/dmCD b20EF0NhhTGMWVidQRRwKFz3bEDiwZ2lAxK4Tpo2bWAilVgHR+HVROg2XojHPd7rVgNf QOgw== X-Gm-Message-State: AOAM533k/4tJeSB14vn399P3Wf/Xwh119nuyu2pwgrrZCySwSMNcu1Ed /L9NK/pm4CAPEF/4xp7R8wASWQ== X-Google-Smtp-Source: ABdhPJx4K/Xk1QxnzMQQ9ReB8d4wistJ4M5aLjQjBNtZgI0VgVK+Uj/YJ4xB2J8Ob6QKQbUBP/kC7Q== X-Received: by 2002:a1c:6308:: with SMTP id x8mr28001926wmb.92.1593612210468; Wed, 01 Jul 2020 07:03:30 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 27/40] tests/acceptance: fix dtb path for machine_rx_gdbsim Date: Wed, 1 Jul 2020 14:56:39 +0100 Message-Id: <20200701135652.1366-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, Yoshinori Sato , =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Cleber Rosa , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The old path doesn't exist but the rx-virt.dtb file has the same checksum so lets use that. Signed-off-by: Alex Benn=C3=A9e Acked-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_rx_gdbsim.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/machine_rx_gdbsim.py b/tests/acceptance/machi= ne_rx_gdbsim.py index a44f2c87da0..bff63e421d5 100644 --- a/tests/acceptance/machine_rx_gdbsim.py +++ b/tests/acceptance/machine_rx_gdbsim.py @@ -50,7 +50,7 @@ class RxGdbSimMachine(Test): :avocado: tags=3Dmachine:gdbsim-r5f562n7 :avocado: tags=3Dendian:little """ - dtb_url =3D ('https://acc.dl.osdn.jp/users/23/23887/rx-qemu.dtb') + dtb_url =3D ('https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb') dtb_hash =3D '7b4e4e2c71905da44e86ce47adee2210b026ac18' dtb_path =3D self.fetch_asset(dtb_url, asset_hash=3Ddtb_hash) kernel_url =3D ('http://acc.dl.osdn.jp/users/23/23845/zImage') --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613014; cv=none; d=zohomail.com; s=zohoarc; b=lzn0Abeg3eiqAluH2QCQcPZ7WEwAF0M/Cy2Ka/LvS28qHknvcyZqFIABzOttAg8obM7fLYJ5UOgdN1jrR6EsRRKIDfhjo0tdheXi+FbyK5sKkovC+VpfroiPMEsMwx5ARwb/8aQrIKgZTazy69QiqFldaQkftpZJsRwHG/8DbmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613014; 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=1wb2ncrOo7CGsE7dWRGEM3akfUu5tO0R9Fr5WIVAS98=; b=Js2v+sPCsvF3PaVudZhGflxuneQEVBQcHIGmeQo0gYrtQ30A8ty5jCOYEyN2mv75F6IAwHyWfb5OZhzFu7+DNq551HXYiLqnDSNjuv8epbDKyVCbhY3diGCNvJpXxo8mNWwXVcrjGZ4tbBFk9L6n2VhBWdfgaD8z3VeAWRI3AtE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613014117575.5536602104705; Wed, 1 Jul 2020 07:16:54 -0700 (PDT) Received: from localhost ([::1]:51216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdXg-0002rZ-NR for importer@patchew.org; Wed, 01 Jul 2020 10:16:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdL1-0005B7-5J for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:47 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKz-0006r2-8p for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:46 -0400 Received: by mail-wr1-x435.google.com with SMTP id k6so24005188wrn.3 for ; Wed, 01 Jul 2020 07:03:44 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l132sm7504530wmf.6.2020.07.01.07.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B85A91FFB4; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1wb2ncrOo7CGsE7dWRGEM3akfUu5tO0R9Fr5WIVAS98=; b=Nxl6d1nyOgVwpHdrLCNWKsP8PXAXIFBdgvSu7rQ3azXHfDlLo3j89/DC6/R5v3i00o QAqA2XM7DL9jsa6gzAMipm65qR6WPmnn/t3mqoyFxO6AYt55wSb5VIEkLVmflfSQzBzv C10pJODqSa9oStqUj/K8/Q5Fp8lJ79P+2Bf9okdse/A2ZZVHZUZ6rJDVS/h3yrPNiOUw kiztgE8fS93mmWVUiDznYWPFQJPz8Mp2dc1mGmt+Jh5b1eTSWSWY6llFtH1ujLLanU+W 4SEh8jV8fis5sOLBBKjket5qblmdqqI2qYqtOQvznpLzibiYH5jsOFG17UYQyoSZ+9Lc rVvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1wb2ncrOo7CGsE7dWRGEM3akfUu5tO0R9Fr5WIVAS98=; b=i9UrniUg/Xg1zMM/gEjnavBFoxBCgZk4Knytf5PC4i45CabT2TnfohVES2j7gNUo2O 7IZY1HeoTRX8g5lFAjH0/VYPwhBQ2kZY8vlyIgl13EsQHayuWw+rUTkMzbKGVo4dYzA+ Z7MpbFXRiz7NlKy1UvJ3JNf8fyhDlxcp8jjpAtZcJMD6Oj4wBzLxMnUKhpgmIsyu/lQm JAmO8bcu7Tyl2BJ3kjPX2S7dn4wNoygTSbVz+WRZJSXgwZUQIP12yu8k/RcXTdKHxeGN lcRLWYiODhmGGwoqi+pa1dCKmd3lhnUy51FbPXt51l7Ss1KtILLvEwCAsZgQ1v6jtwTG VYgw== X-Gm-Message-State: AOAM5315EsgcOnXupgawGURAGMcL6bBa9HqlhBpfD4bvcH/XIW7DMYml BqpsMjIx94JZ1NbYbxJgnxkYCw== X-Google-Smtp-Source: ABdhPJwAzeBVGmdKv+xxL68CVKsI+hXbDeaO/+WJ5/8trRIG5Lxvh/lpt45mlGMpGbYIZiNizjaW0Q== X-Received: by 2002:a05:6000:1283:: with SMTP id f3mr27272527wrx.106.1593612223846; Wed, 01 Jul 2020 07:03:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 28/40] tests/acceptance: skip multicore mips_malta tests on GitLab Date: Wed, 1 Jul 2020 14:56:40 +0100 Message-Id: <20200701135652.1366-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Aleksandar Rikalo , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , cota@braap.org, Cleber Rosa , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) For some reason these tests fail all the time on GitLab. I can re-create the hang around 3% of the time locally but it doesn't seem to be MTTCG related. For now skipIf on GITLAB_CI. Signed-off-by: Alex Benn=C3=A9e Cc: Aleksandar Markovic Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/machine_mips_malta.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/mach= ine_mips_malta.py index 92b4f28a112..7c9a4ee4d2d 100644 --- a/tests/acceptance/machine_mips_malta.py +++ b/tests/acceptance/machine_mips_malta.py @@ -15,6 +15,7 @@ from avocado import skipUnless from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern from avocado.utils import archive +from avocado import skipIf =20 =20 NUMPY_AVAILABLE =3D True @@ -99,6 +100,7 @@ class MaltaMachineFramebuffer(Test): """ self.do_test_i6400_framebuffer_logo(1) =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_mips_malta_i6400_framebuffer_logo_7cores(self): """ :avocado: tags=3Darch:mips64el @@ -108,6 +110,7 @@ class MaltaMachineFramebuffer(Test): """ self.do_test_i6400_framebuffer_logo(7) =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_mips_malta_i6400_framebuffer_logo_8cores(self): """ :avocado: tags=3Darch:mips64el --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612663; cv=none; d=zohomail.com; s=zohoarc; b=dnB6aXYZx8GqUBGAkeySAPRL3M3lbe1dqSUTd2ZscK/6VWmYF2BPrLOZGSo95k3lryP7SO3F0p4pVdG3thngPy3N5Lyg/Ib5z5d9zQOaG5p+efO/llCsfHMW5s9iXVtM/1A9MslfBJJULk67Mdjru6bpXBTYo/+RsWUmFjVkvtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612663; 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=WZkO+vj6G284wXUPR2Uuf7/6SV8a7gabQd5K0j8iabU=; b=exFCB/uX1TD/lNQaPhGy9WaKdu+bVVLXRU77ZlaftaigGAVZrJsqjFOzE/4sUopHsKFwbGe4l+2TAnwFhQx3nnsUGYvL4C59TF7DwhxAPscvh09YWeox/j9Rfcgp49tB/vtv7D4pJiHSdIb/4msyGGaNbq2ZeUprmvAnPUYLhMM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15936126632011017.5843528051136; Wed, 1 Jul 2020 07:11:03 -0700 (PDT) Received: from localhost ([::1]:55374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdS1-00019z-VQ for importer@patchew.org; Wed, 01 Jul 2020 10:11:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKx-00052k-Hc for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:43 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36791) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKv-0006qY-NR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:43 -0400 Received: by mail-wr1-x443.google.com with SMTP id k6so24004882wrn.3 for ; Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l8sm7567341wrq.15.2020.07.01.07.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D00E31FFB5; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WZkO+vj6G284wXUPR2Uuf7/6SV8a7gabQd5K0j8iabU=; b=f6SmoSSP/+Plb8g+qJIpf64xBm0FZd6601GR8Lo9mxD+8bM0k0MoP6f0jAovJOvlVQ ek6oqvmA9iLqJkLQkHJHe9ec6LQGC0rxEWG5IneDkMTCjPjqcbEjdT1u42DXe3V6c8iS F9DS4UnlDZLaL/HTedFiOUVvaZin48B4xuoFf0mZmqsqgEVH7Q2mEBsls1KqlGOD/dQC +5+3sQHj+9vxyayGEJMTIZhQVYdRd2bQycldZqqK+MOB+HP1AKcBKIQkYTPZkaNF2VPu Th4N0s+U8cCUxAqW7kpUuxGZBHtzQJFU21b+pAa20wjY2/aKnM0vhBCHwhsUx558X3AO Mcpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WZkO+vj6G284wXUPR2Uuf7/6SV8a7gabQd5K0j8iabU=; b=iJbf0navUfixputkkME4D+h7guGvDga9jQNJxcKrPr8HXhDZfVVF1bhOPWnRNpNxhc eGF8kjwMr3YjrmCJ0D5uA71HVe3feRpJEUjWO/176Rv5TKdxSCPfrAGoOfIqeQ0PcAXO FXI5mn1sHgR6dMNUdKKXELOLNSu92gaU6xjs+jR0VkVELGpjQbl4hlSLuw8lsMK7fLtN BP9ty/QEgiNCaEuX2/f3xz8+iIUiu6TgS9g6Zzd15FXFyxPgNzzuarWWDwUNhkrBcRi8 qLqooy5Em+Hrs6AJzwd1LZqj6jz+CfB+6U2DdDXV3vZ+eJkY6aIBBLZswnToAPM8fLcH 5bCg== X-Gm-Message-State: AOAM533MirQveqmg8LjwkKZhrQ2cxBj11zibcUElFvHmkXUZq3g0+e5L AWOcLrXCmMYK4QQufd4eaJAywA== X-Google-Smtp-Source: ABdhPJzk8xYLq2c1Yg2m7ygfxcJ7bMtzsmtA86xRgargc9yOtoPle0sMI39otzBP6SPx8cAfl9QvaQ== X-Received: by 2002:a5d:4710:: with SMTP id y16mr27846749wrq.189.1593612220396; Wed, 01 Jul 2020 07:03:40 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 29/40] tests/acceptance: skip LinuxInitrd 2gib with v4.16 on GitLab Date: Wed, 1 Jul 2020 14:56:41 +0100 Message-Id: <20200701135652.1366-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, Cleber Rosa , aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This fails on GitLab but not when run locally on the same container image. It's very confusing. Signed-off-by: Alex Benn=C3=A9e Acked-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/linux_initrd.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/acceptance/linux_initrd.py b/tests/acceptance/linux_init= rd.py index a3e54d3fc91..a249e2f14a2 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/acceptance/linux_initrd.py @@ -8,10 +8,12 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 +import os import logging import tempfile =20 from avocado_qemu import Test +from avocado import skipIf =20 =20 class LinuxInitrd(Test): @@ -51,6 +53,7 @@ class LinuxInitrd(Test): max_size + 1) self.assertRegex(self.vm.get_log(), expected_msg) =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_with_2gib_file_should_work_with_linux_v4_16(self): """ QEMU has supported up to 4 GiB initrd for recent kernel --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613374; cv=none; d=zohomail.com; s=zohoarc; b=PbEqf8agGRIxbwTCJQc1mJbKPYbsYE8Nwvi87kc9nDBKpZIJx2HUt2SK3ffEuuDBkeF7Etx1fA0AFpR60tkrRKD+2QfJVVlndXEztlh40IC+nXqtorwPkqjCY+R5HDoAy1+2LzwCxibKmIOrxLODWz65p4LnJ2Qlq/DEKra6zQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613374; 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=t/NgCflCaACrU2hH35R4Vs2GHYuFdBrnkv6dSybnyMQ=; b=Z1Rec084nVcR2amD921gb1zNKz8qkQAxflo9/qyHTZLRLL7Oq9ubUM9AtKroC8NUWsYZ+UW/si8cuUCBnjDRj2nJ3njcwem1ZjrIq2PCkzWhVX3YzhKTX5Qf+tV3MhNFM2WeJKTVEPAm2OtKx6L5W7C5q/YgatmGkdgdop0vKWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613374490639.7904686495496; Wed, 1 Jul 2020 07:22:54 -0700 (PDT) Received: from localhost ([::1]:46374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqddU-0004PV-G1 for importer@patchew.org; Wed, 01 Jul 2020 10:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdUc-0006fo-WC for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:43 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdUU-0000AL-49 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:42 -0400 Received: by mail-wr1-x42d.google.com with SMTP id j4so21585306wrp.10 for ; Wed, 01 Jul 2020 07:13:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 59sm7871261wrj.37.2020.07.01.07.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EAACA1FFB7; Wed, 1 Jul 2020 14:56:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t/NgCflCaACrU2hH35R4Vs2GHYuFdBrnkv6dSybnyMQ=; b=MSJJw2bLx/9i7JS5RuFfF0n43/7SO1e6waD5U2tWqIbhrzHFvcOfbIMUzucGK2vPSZ W4/X/OaAfnyI2VDiJbSnycXepzyMODc+mMRoRqM8rntDCmztWTnk1wtpBc9Mzz+dKnSU O3vXQ6Y9/+XJdfsEGfLhbAQI5wT8uGP5NtIKM0LPyZ9SlfDn01jchfB0ntwr0uR1z5Fi aLrpAkNZgneJPRuJwGxk+J9fPVew8a2XJQactegqD2tYObC9E2JdtDdQmbuz0VDnGVCM ED8bO4rHeS7EBpUYS5G9oERr+uP4ir83HawJ0FueGfRlt/PyZPryTByMGuaIdX/wZeY6 /Q+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t/NgCflCaACrU2hH35R4Vs2GHYuFdBrnkv6dSybnyMQ=; b=H6qJ/zvioa/rNKnxNaOeDHzKG5CD6pOOp4AsjXruC8TpIhRbsnZfAZzASeGmVyVK1Z IZV5eJpJ1EwBXNMSY1/jP8uMy0HZAe+HX+eLBXoCfdMcf0e+iFKdMkb+5xSE+5VoeO5P GhmGIVUP6NgvR7sr1/a7fwFxZopbUlfuaUGzYT55vCpmvlCc3I+SJFOKn+EeEYM/hE01 G71QjUqUgv7BOCFnU5iZXOmhCdz/IyuqwwCqZF5ewyxSesk/mbVbSqOwJt+w3nRu0Yxq Dy0zds1GPIUmP5bSyESJZg1IhC+lBxX/WtHo2EhdM+DLsLd0Qt30C2YLzFoxbLlR9JoD lTAQ== X-Gm-Message-State: AOAM5313yEah2nMtBed/azNmSMXsaoaowg8UqaWK2V4DRjWwlqC5+AfP FSDmyK32UJAzVxGag87lWDVsOw== X-Google-Smtp-Source: ABdhPJycEGW7OXlqkTQGgKWjYPcLOil4KhOzwX0tZFdz6Hbax0kn5LRmOhLHw4Iq0F0iQFz+MUD8jQ== X-Received: by 2002:adf:fe46:: with SMTP id m6mr25602424wrs.192.1593612811344; Wed, 01 Jul 2020 07:13:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 30/40] gitlab: add acceptance testing to system builds Date: Wed, 1 Jul 2020 14:56:42 +0100 Message-Id: <20200701135652.1366-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As part of migrating things from Travis to GitLab add the acceptance tests. To do this: - rename system1 to system-ubuntu-main - rename system2 to system-fedora-misc - split into build/check/acceptance - remove -j from check stages - use artifacts to save build stage - add post acceptance template and use Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200622143204.12921-16-alex.bennee@linaro.org> --- v2 - updated with danp's docker changes - use needs instead of dependancies - touch all the build files to prevent rebuild v4 - fix misnamed check stage - don't use : in stage names - restore *post_acceptance post_script - don't failfast on GITLAB_CI --- .gitlab-ci.yml | 69 ++++++++++++++++++++++++++++++++++++++++-- .travis.yml | 23 -------------- tests/Makefile.include | 2 +- 3 files changed, 67 insertions(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7abc55a5c6..93baf98232d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,12 @@ +# Currently we have two build stages after our containers are built: +# - build (for traditional build and test or first stage build) +# - test (for test stages, using build artefacts from a build stage) stages: - containers - containers-layer2 - containers-layer3 - build + - test =20 include: - local: '/.gitlab-ci.d/edk2.yml' @@ -24,26 +28,85 @@ include: ../configure --enable-werror $CONFIGURE_ARGS ; fi - make -j"$JOBS" - - make -j"$JOBS" $MAKE_CHECK_ARGS + - if test -n "$MAKE_CHECK_ARGS"; + then + make $MAKE_CHECK_ARGS ; + fi + +.native_test_job_template: &native_test_job_definition + stage: test + image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + script: + - cd build + - find . -type f -exec touch {} + + - make $MAKE_CHECK_ARGS + +.post_acceptance_template: &post_acceptance + after_script: + - cd build + - python3 -c 'import json; r =3D json.load(open("tests/results/latest/= results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"] no= t in ("PASS", "SKIP")]' | xargs cat + - du -chs $HOME/avocado/data/cache =20 -build-system1: +build-system-ubuntu-main: <<: *native_build_job_definition variables: IMAGE: ubuntu2004 TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu lm32-= softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu m68k-softmmu ppc= -softmmu riscv64-softmmu sparc-softmmu + artifacts: + paths: + - build + +check-system-ubuntu-main: + <<: *native_test_job_definition + needs: + - job: build-system-ubuntu-main + artifacts: true + variables: + IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check =20 -build-system2: +acceptance-system-ubuntu-main: + <<: *native_test_job_definition + needs: + - job: build-system-ubuntu-main + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check-acceptance + <<: *post_acceptance + +build-system-fedora-alt: <<: *native_build_job_definition variables: IMAGE: fedora TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-sof= tmmu riscv32-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu x86_64-sof= tmmu xtensa-softmmu nios2-softmmu or1k-softmmu + artifacts: + paths: + - build + +check-system-fedora-alt: + <<: *native_test_job_definition + needs: + - job: build-system-fedora-alt + artifacts: true + variables: + IMAGE: fedora MAKE_CHECK_ARGS: check =20 +acceptance-system-fedora-alt: + <<: *native_test_job_definition + needs: + - job: build-system-fedora-alt + artifacts: true + variables: + IMAGE: fedora + MAKE_CHECK_ARGS: check-acceptance + <<: *post_acceptance + build-disabled: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index 74158f741b1..c24dfbe377f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -289,29 +289,6 @@ jobs: python: 3.6 =20 =20 - # Acceptance (Functional) tests - - name: "GCC check-acceptance" - dist: bionic - env: - - CONFIG=3D"--enable-tools --target-list=3Daarch64-softmmu,alpha-s= oftmmu,arm-softmmu,m68k-softmmu,microblaze-softmmu,mips-softmmu,mips64el-so= ftmmu,nios2-softmmu,or1k-softmmu,ppc-softmmu,ppc64-softmmu,s390x-softmmu,sh= 4-softmmu,sparc-softmmu,x86_64-softmmu,xtensa-softmmu" - - TEST_CMD=3D"make check-acceptance" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-acceptance" - after_script: - - python3 -c 'import json; r =3D json.load(open("tests/results/lat= est/results.json")); [print(t["logfile"]) for t in r["tests"] if t["status"= ] not in ("PASS", "SKIP")]' | xargs cat - - du -chs $HOME/avocado/data/cache - addons: - apt: - packages: - - python3-pil - - python3-pip - - python3-numpy - - python3-opencv - - python3-venv - - rpm2cpio - - tesseract-ocr - - tesseract-ocr-eng - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" addons: diff --git a/tests/Makefile.include b/tests/Makefile.include index 3f4448a20bc..c316e0d6647 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -944,7 +944,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ --filter-by-tags-include-empty --filter-by-tags-include-empty-= key \ $(AVOCADO_TAGS) \ - --failfast=3Don tests/acceptance, \ + $(if $(GITLAB_CI),,--failfast=3Don) tests/acceptance, \ "AVOCADO", "tests/acceptance") =20 # Consolidated targets --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613128; cv=none; d=zohomail.com; s=zohoarc; b=eTo4SoS2YCPM1P1DvkRDv3TAFKNe5SGnHam9AJ8dnBh6eKT6N4/HDHpbNhHZYq135JvwUSdabcVIuy8PnYiqicp69+xWXwW186ghEN4z4WViOxLD2za0RBMPFBbxAhjsIiTrQsoLP69/2eutTbxd1PKi8BtkSqHC4qNaibP0nmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613128; 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=N4xihvXcT2NbzYDWewm5rzgOgSrnKR9VT35cRtylW1A=; b=YpjLl+zc6fPWsxYTW6CQOh8OcxcSCG24tVq4F55grCNqb/0MZqSg47k8LpRJ46SNDNU8CgG7EK9c2QpEMh2TF+JvmQZDYRKwZNEnl9B4d42xRjo7HbacB+IPuX+gKl4kMANfv2sjwhjvt8+tPBKoZrkeWzuTiuqYb9IWlL3cKcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613128497962.862472215094; Wed, 1 Jul 2020 07:18:48 -0700 (PDT) Received: from localhost ([::1]:58468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdZW-0005uE-Tr for importer@patchew.org; Wed, 01 Jul 2020 10:18:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKu-0004vC-Ch for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:40 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:46564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKs-0006pr-I7 for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:40 -0400 Received: by mail-wr1-x444.google.com with SMTP id r12so23922929wrj.13 for ; Wed, 01 Jul 2020 07:03:38 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k14sm7323389wrn.76.2020.07.01.07.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0E0D81FFB8; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N4xihvXcT2NbzYDWewm5rzgOgSrnKR9VT35cRtylW1A=; b=Lvnp7rCBZEi2ZVXPmakSupr3ajkJx4IwkPB3NMdJpvA7i42BUswJd8i4vyaTD/lKNA oWzx/5fSn23i3Mv0DdyOG7y0hF5zmmCcoXn5iIJlFRAjmnNN2Uc570IU1APL31h3eQhz ewtSa/6Is4V6CjlL9kcGcqwlGTJ62mLwGfNkUey/GUeHmN6+fb8A6Zf/UFXNlBKtxBth a5R6q4jjCAdSd1nPMBZvc9RCuiN2nguwgwgnNy7dLa/ngNpOxprEKub4yb+gBnqd5mm7 8EM7UIZyAT7ptN3q9SJ324ZvLyCNOMA0RK2rZPvwYAWBVWrQq+JqwBTCzin8GARLWXjN Kj+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N4xihvXcT2NbzYDWewm5rzgOgSrnKR9VT35cRtylW1A=; b=jAGM2IyUbbGVFYjZETJZTgKI3w3MmwcIk8tV7/kLfFADax0OgCWxwkTcLbijBfuhwa VXw/k5sX0wbw3pzbEYlmlV9Udrw3P6FI7YAeWQUTpojlq5I87qywX943KZgma4lcEsvQ nvv2LkV5XbnuHPrMYIlwq10t5jVtEQfUf4+7Qd7RMdRIh46bcOZz26lHVqF6MwCKdhhM dcHUo0vdRPzT8V1Sezg899Sq9OCbo9u0mkH7Od9zdVLRJVRY77apODxAFsq2jk7IDzBW 2A0Brr4odkxMAsWMLuNjoYl/MScKiYtdoz5iNH6FOcuM0MQFsvwJ3uPw+GOmekWdNvKp mb4A== X-Gm-Message-State: AOAM533D+/JV6/U6WTabLGX+NDSGSBv2CMNVm4OAsWrUYjvUNAorXNZw uo/9ffMzwphcMCjTUbBSP/ATGw== X-Google-Smtp-Source: ABdhPJy/uyiQRdWHo5dbqsWmFUE2baMjQVzvs+VT6fs0/ROophzv15G0h9IFjCMnm14pfQOtcDtkcA== X-Received: by 2002:a5d:60d1:: with SMTP id x17mr26690700wrt.293.1593612217099; Wed, 01 Jul 2020 07:03:37 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 31/40] tests/tcg: add more default compilers to configure.sh Date: Wed, 1 Jul 2020 14:56:43 +0100 Message-Id: <20200701135652.1366-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We were missing a bunch of compilers which we could use if they were locally installed. The defaults are based on Debian as they seem to be the best distro for well distributed cross-build compilers. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/configure.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 2326f978562..37e49736ca4 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -46,20 +46,29 @@ fi : ${cross_cc_aarch64=3D"aarch64-linux-gnu-gcc"} : ${cross_cc_aarch64_be=3D"$cross_cc_aarch64"} : ${cross_cc_cflags_aarch64_be=3D"-mbig-endian"} +: $(cross_cc_alpha=3D"alpha-linux-gnu-gcc") : ${cross_cc_arm=3D"arm-linux-gnueabihf-gcc"} : ${cross_cc_cflags_armeb=3D"-mbig-endian"} +: ${cross_cc_hppa=3D"hppa-linux-gnu-gcc"} : ${cross_cc_i386=3D"i386-pc-linux-gnu-gcc"} : ${cross_cc_cflags_i386=3D"-m32"} -: ${cross_cc_x86_64=3D"x86_64-pc-linux-gnu-gcc"} -: ${cross_cc_cflags_x86_64=3D"-m64"} +: ${cross_cc_m68k=3D"m68k-linux-gnu-gcc"} +: $(cross_cc_mips64el=3D"mips64el-linux-gnuabi64-gcc") +: $(cross_cc_mips64=3D"mips64-linux-gnuabi64-gcc") +: $(cross_cc_mipsel=3D"mipsel-linux-gnu-gcc") +: $(cross_cc_mips=3D"mips-linux-gnu-gcc") : ${cross_cc_ppc=3D"powerpc-linux-gnu-gcc"} : ${cross_cc_cflags_ppc=3D"-m32"} -: ${cross_cc_ppc64=3D"powerpc-linux-gnu-gcc"} -: ${cross_cc_cflags_ppc64=3D"-m64"} +: ${cross_cc_ppc64=3D"powerpc64-linux-gnu-gcc"} : ${cross_cc_ppc64le=3D"powerpc64le-linux-gnu-gcc"} -: ${cross_cc_cflags_s390x=3D"-m64"} +: $(cross_cc_riscv64=3D"riscv64-linux-gnu-gcc") +: ${cross_cc_s390x=3D"s390x-linux-gnu-gcc"} +: $(cross_cc_sh4=3D"sh4-linux-gnu-gcc") : ${cross_cc_cflags_sparc=3D"-m32 -mv8plus -mcpu=3Dultrasparc"} +: ${cross_cc_sparc64=3D"sparc64-linux-gnu-gcc"} : ${cross_cc_cflags_sparc64=3D"-m64 -mcpu=3Dultrasparc"} +: ${cross_cc_x86_64=3D"x86_64-pc-linux-gnu-gcc"} +: ${cross_cc_cflags_x86_64=3D"-m64"} =20 for target in $target_list; do arch=3D${target%%-*} --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613750; cv=none; d=zohomail.com; s=zohoarc; b=auVCU0uM03zLlkvW7PizoVr+BwjYUEPAZhzsubKE5VgJbmuyU67PxtxOCRVgn8TRCatnqYCHX0SDy5evjp9k6y5Ozg3X1td5LOrxjtZk9EUlESFDxgH8WNN7/DAUr1CF9QMcLasfKBpoxIKTVPMpoiiCNud5D6++hCoOw+HjsQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613750; 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=PJhXUCcF3c2PKDCFsCiaqFOmEKen6xlVm+g2tj8AYP8=; b=XOM1w3o6hEGoIkY1YtgcQDtptlVAqVPZC+hWzL8TLKFBJwmj0/oIJoAQuHmBHDOn+irZh6Lgmp17MA3JziGom8E91lI4oOmKHahEvUKnB6zzaSsEOr5Ai1DSXc2q9DOlVklutX6HLDk2w74QY5p1U3S3b6pMN+gc8gbShsvU4sc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593613750436898.9774588376532; Wed, 1 Jul 2020 07:29:10 -0700 (PDT) Received: from localhost ([::1]:36852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdjZ-0004yv-3R for importer@patchew.org; Wed, 01 Jul 2020 10:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdUS-0006ZI-Gz for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:32 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:51098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdUQ-0000A3-Iz for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:13:32 -0400 Received: by mail-wm1-x32a.google.com with SMTP id l17so22608870wmj.0 for ; Wed, 01 Jul 2020 07:13:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w2sm7835430wrs.77.2020.07.01.07.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:13:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 27B561FF8F; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PJhXUCcF3c2PKDCFsCiaqFOmEKen6xlVm+g2tj8AYP8=; b=WlXD7kXTRinT7Nh0YWHeQjdrlpdwKW9wzLMBsuVgwCFPxDtx1THdoOTNvTmAoW+c6m uYX2DworzFB9U7oVOrQ5bZu/kk0jTpqeRG7JBe7DE/knr06Xsrkv2A0L9ScJBO5MlI15 lGSIC6xnmIbMnPU9xnPt75lKLKFq+ZGYKLd70I7hwLVAyrh+ayuuJApL9t1NHDahY86u WS8pRCPL2nweFC9Dudd7htNV63Rqg6Wzi6rBU/KLBJHWDRB4BVH98zbWvpxe2sRUNFq7 iRPw9m9424drJk2mcxRc/Q05+vbJY5uVby4UWKglAzKnmElti4YcRCcLWi5bHCPXqRRj 2mnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PJhXUCcF3c2PKDCFsCiaqFOmEKen6xlVm+g2tj8AYP8=; b=Rczy8EKcJWQ3jfdihvPk5Gtwg3/A4CuOu6w7A0dgjH15LnTBOkhiciU2gxmffjh2dQ uodOmVSuRQ+x1whc0FroZykB2RsByh/FsOMERJISiOfqds5mG/Jf/Tjjo2xt8j9OL2Ka mjZ5zwsHdZUCKpgjXakkAN4eLwJbbOdK8R0jxMoncrlTYX5KiVsL5XROz5A1bEDtJL6w hvv+SSb/iQ83hUsqPj53JdOUVjb7rw3MBwdu7b58CbkDADREoqNo+Bs7TkIT2BN/Ustt 06lLygxMNWLMwqxULHUfvaubE0DJMtDhY9+o4KYK5hjTe2x3WSOAC4IdxZdOGoyjfDXQ RrEA== X-Gm-Message-State: AOAM533xafsfMpSs5cu5MysSi8rrItPf/QgDGExFRh+BsAO13vAFs1ag dVVLaKJwpjeQ79zRD1w9R+ynag== X-Google-Smtp-Source: ABdhPJyFeqTgxTB7qpx/e9QfQREZkFwCuxVWJNm1e0sXeL3mMBqdGOtfwzVYJABhr67ua3awDjP+9A== X-Received: by 2002:a1c:4408:: with SMTP id r8mr26979777wma.100.1593612808833; Wed, 01 Jul 2020 07:13:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 32/40] tests/docker: add a linux-user testing focused image Date: Wed, 1 Jul 2020 14:56:44 +0100 Message-Id: <20200701135652.1366-33-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We happily use all the cross images for both cross-building QEMU as well as building the linux-user tests. However calling docker from within docker seems not to work. As we can build in Debian anyway why not include an image that has all the compilers available for non-docker invocation. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/containers.yml | 7 +++ tests/docker/Makefile.include | 1 + .../dockerfiles/debian-all-test-cross.docker | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-all-test-cross.docker diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index f353359fd8b..a7621c4204c 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -64,6 +64,13 @@ amd64-debian-cross-container: variables: NAME: debian-amd64-cross =20 +amd64-debian-user-cross-container: + <<: *container_job_definition + stage: containers-layer2 + needs: ['amd64-debian10-container'] + variables: + NAME: debian-all-test-cross + amd64-debian-container: <<: *container_job_definition stage: containers-layer2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 977d8ff6e40..8406d039858 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -134,6 +134,7 @@ docker-image-travis: NOUSER=3D1 =20 # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian9 +docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-arm64-test-cross: docker-image-debian11 =20 # These images may be good enough for building tests but not for test buil= ds diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/= docker/dockerfiles/debian-all-test-cross.docker new file mode 100644 index 00000000000..dedcea58b46 --- /dev/null +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -0,0 +1,53 @@ +# +# Docker all cross-compiler target (tests only) +# +# While the normal cross builds take care to setup proper multiarch +# build environments which can cross build QEMU this just installs the +# basic compilers for as many targets as possible. We shall use this +# to build and run linux-user tests on GitLab +# +FROM qemu/debian10 + +# What we need to build QEMU itself +RUN apt update && \ + DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ + apt build-dep -yy qemu + +# Add the foreign architecture we want and install dependencies +RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ + apt install -y --no-install-recommends \ + gcc-aarch64-linux-gnu \ + libc6-dev-arm64-cross \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ + gcc-arm-linux-gnueabihf \ + libc6-dev-armhf-cross \ + gcc-hppa-linux-gnu \ + libc6-dev-hppa-cross \ + gcc-m68k-linux-gnu \ + libc6-dev-m68k-cross \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross \ + gcc-mips64-linux-gnuabi64 \ + libc6-dev-mips64-cross \ + gcc-mips64el-linux-gnuabi64 \ + libc6-dev-mips64el-cross \ + gcc-mipsel-linux-gnu \ + libc6-dev-mipsel-cross \ + gcc-powerpc-linux-gnu \ + libc6-dev-powerpc-cross \ + gcc-powerpc64-linux-gnu \ + libc6-dev-ppc64-cross \ + gcc-powerpc64le-linux-gnu \ + libc6-dev-ppc64el-cross \ + gcc-riscv64-linux-gnu \ + libc6-dev-riscv64-cross \ + gcc-s390x-linux-gnu \ + libc6-dev-s390x-cross \ + gcc-sh4-linux-gnu \ + libc6-dev-sh4-cross \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hpp= a-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-u= ser,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,p= pc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc6= 4-linux-user --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612551; cv=none; d=zohomail.com; s=zohoarc; b=VvqxypEsPY/dLTCR1bbNdq7WbuukdfFQWJhahR8RN7RgO0vPVbcGeMJ17WPN/LfDnfz0vqkFzJntfdSAGNlyt+43E6qWDbE3VtVRrPj1Lh8tIRIG2j8j3tTaTKyWeEqx3M/rKd3n2BMH5DSBNLmcyaDBRvNk3AFL0Dg/4kSUhds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612551; 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=JbHSSp+OWWoLJx/9MSaLrM42pM2ZJc5nMwUPC3QEVGo=; b=b09pRNuffeZKB16Z+EMYIidzsaV8KWT0qyBjGBN9ykmZgwEMOKyW9vPXoC5SyneqxS7p453niwJt6Um4/oX6o6tBXAYu8ykND28/udKRENL/nQQaq4W6fcWkci6IA2acvBrD0x1cejxJVnilHIzZ9ywVGGvU0w/kNQ/7DE78vB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612551740942.9319633566092; Wed, 1 Jul 2020 07:09:11 -0700 (PDT) Received: from localhost ([::1]:46876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdQE-00061B-41 for importer@patchew.org; Wed, 01 Jul 2020 10:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKt-0004sS-7x for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:39 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKr-0006pi-5g for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:38 -0400 Received: by mail-wm1-x343.google.com with SMTP id j18so22556029wmi.3 for ; Wed, 01 Jul 2020 07:03:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t2sm7243554wma.43.2020.07.01.07.03.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3EE5B1FFBA; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JbHSSp+OWWoLJx/9MSaLrM42pM2ZJc5nMwUPC3QEVGo=; b=tmWLG9Z8Nyx4I30963cbylorfLynCpuEmbskKfJHBstLR7tyDiobK0hzmaonbkljfR TfLmfJyMQ7Ds6eO4E+ae0OO+8xJaHzijIcvU/eN5hQwiC9d/buZjSb7PPqzlXX6fJnMa u7kTntpc8abytSyn1bdvgd8HUPSQmkhaEB/RZSVJ9rWghdPbOjiWnX+s5zk+w1lvLKy6 A8Sx0oua6oTp0bEgv0DO4dhAm19o5EgKkIrPpcZ434l12ZZVeVH+JKGSzoH5HjKIcKwZ dm4PRsdrht4MouRLBSoEEAc0fQzRHJzOoicr7QkSGiubvfWTcO3cWzTreH/i2DG1RgWa o+yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JbHSSp+OWWoLJx/9MSaLrM42pM2ZJc5nMwUPC3QEVGo=; b=TNBAHZS1LFjx0bGPeGlmbjijGyanQYCO9phu0UMMAxLej4/KpwQqBtLiLoNKn6ycRU SgO/RXFPuZ1oKP4m0uibtf3On6o+ymdbPesrinU22aPfUdVRoZjpRqe7HS+Z+0QVT2nC j+3SJJmjD9DEpdkS13Dx4akUvTxIv3dwAuzY8MGb8IBIpxgNYDW1MiC8RMMxUYJg5s6x 9oOXh9Tvzn7kA4StRUKHFXYQM/Hiq64UtIKy4Xw7HxBKlQkh/O99VwKxn+9GmQ00sp1I Livp5UdAKkk7nnvEWIg+LaDzSyUWtac6T2rctBaPpHgQ7zdxXJhr9IajvPzUyr7MZnxu Ro5Q== X-Gm-Message-State: AOAM531OuzCNhXB9mRVonXAJ49yxrQE1OrhKOsy4Cc4cCUV0HTYZf0Pe W6S/PZDRJ4c7OTc47tL3qr6P4A== X-Google-Smtp-Source: ABdhPJzpq2YPcXx5UiCx7YW0y5EOgZMWah4n/t/t9sexghkbsSjgG1zWvWRXqdltGKvqJiSsG+dHHQ== X-Received: by 2002:a1c:6308:: with SMTP id x8mr28002337wmb.92.1593612215706; Wed, 01 Jul 2020 07:03:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 33/40] linux-user/elfload: use MAP_FIXED_NOREPLACE in pgb_reserved_va Date: Wed, 1 Jul 2020 14:56:45 +0100 Message-Id: <20200701135652.1366-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Riku Voipio , richard.henderson@linaro.org, f4bug@amsat.org, Laurent Vivier , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Given we assert the requested address matches what we asked we should also make that clear in the mmap flags. Otherwise we see failures in the GitLab environment for some currently unknown but allowable reason. We use MAP_FIXED_NOREPLACE if we can so we don't just clobber an existing mapping. Also include the strerror string for a bit more info on failure. Signed-off-by: Alex Benn=C3=A9e --- v4 - use MAP_FIXED_NOREPLACE instead - also dump strerror --- linux-user/elfload.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b5cb21384a1..7e7f642332d 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2294,7 +2294,7 @@ static void pgb_dynamic(const char *image_name, long = align) static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr, abi_ulong guest_hiaddr, long align) { - const int flags =3D MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE; + int flags =3D MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE; void *addr, *test; =20 if (guest_hiaddr > reserved_va) { @@ -2307,15 +2307,19 @@ static void pgb_reserved_va(const char *image_name,= abi_ulong guest_loaddr, /* Widen the "image" to the entire reserved address space. */ pgb_static(image_name, 0, reserved_va, align); =20 +#ifdef MAP_FIXED_NOREPLACE + flags |=3D MAP_FIXED_NOREPLACE; +#endif + /* Reserve the memory on the host. */ assert(guest_base !=3D 0); test =3D g2h(0); addr =3D mmap(test, reserved_va, PROT_NONE, flags, -1, 0); if (addr =3D=3D MAP_FAILED) { error_report("Unable to reserve 0x%lx bytes of virtual address " - "space for use as guest address space (check your " + "space (%s) for use as guest address space (check you= r " "virtual memory ulimit setting or reserve less " - "using -R option)", reserved_va); + "using -R option)", reserved_va, strerror(errno)); exit(EXIT_FAILURE); } assert(addr =3D=3D test); --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612851; cv=none; d=zohomail.com; s=zohoarc; b=HofmVC1UFj4fDrL28ziNvXkeQey2Ab4S29qbIud5oS56KtyNY8m0/Q3MiAY/YDpDCnYcxUycxe7cf6hB2iOYHyhyo0/wB5C9MGDBwEh6mMky19Dr9Fuz/AFStg8qJCHnSsj9azYinUJlXplJ3ggdQs4s/RY6PAs66QtsCSRSIc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612851; 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=CVUuhZl1kRpSG6cEgnjsE0COEeahFDnSER/j+eEKc6g=; b=IxrFevb5NHcdGEb/CWmJ0IQjYEZ8F4qkbuymNODDFMEaKzB8mo0x5BAG0osLTGvBDl1IAM+Wve+wteoqpQD5ybpVGvpRBysJ3u3zzsPKqW6P0eehQEgAzz8iqTgHvQntJGCktHwxMyRadgNBOwOrqqWOILY4vvk0sYCoV433y/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612851381314.7982196773222; Wed, 1 Jul 2020 07:14:11 -0700 (PDT) Received: from localhost ([::1]:40838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdV4-0006sU-5X for importer@patchew.org; Wed, 01 Jul 2020 10:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKl-0004aB-JI for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKj-0006oT-8R for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: by mail-wm1-x341.google.com with SMTP id g75so22535589wme.5 for ; Wed, 01 Jul 2020 07:03:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p25sm7001372wmg.39.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 54ED41FFBB; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CVUuhZl1kRpSG6cEgnjsE0COEeahFDnSER/j+eEKc6g=; b=jCZr9xE9nR1d3zYqCBJt7t5WSy0BZ0dZCBT96JIZWT6qTeM4q+T6uyBf0cZKxPcI0c 7VHiiVd363KH+6nw58INcwVrt0Ey8i4vDVPQlNAD4bQzS4cBfYyFF1kjVhsUY0Z6k2Xn 1OC05zsHEo1IghT6cP2GENxesfnWtbwjkf2UZtZ4W3Ea1U+2LNvSzzG0rUVeO7g66YPy A6wuZDRHTkkDhnQHbA250JFJpdSgiq/ww9foF1wAuv/VKEoLbv7j3H2FF5KYgmTPkorf OyV/QOluFCT1gfWodnpN7C/AfHUEIxBCag/zxmxDkEliSOrEz1SBHjNAcTBQoy1P3u+M 32lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CVUuhZl1kRpSG6cEgnjsE0COEeahFDnSER/j+eEKc6g=; b=PRUppJD3AfOY+ZeTuhsJs+K1iEE0Sera8A+b9Er/TFwuB6Oekk+ivAnzSuGHY7+G4x 8MOr5kyRNRL6SSI9x+8+udR2z5XSqeFnnEmvIUs+KVhS7goS+tJd21iCJyi/TciRgaI+ 2D8bzBSWqMhFjRo6P2gAUcxvmaSJkcj5IFDtFonv442k98YWVq9kqqPbeyEX7eQfEmF4 gZZO4ZN0e4PdxGCXXxg8hakfTWufGDu0Ny2GfwYgoAd6+hTqqlRO4dg2t/aOgIyPpa84 IsgWhsGnl5cMK9gGn7t7VbEFK4JJ8/Xqu53IyzkhLEWfWmO9kfJmMWaZY2vahgO4S0qu 7RrA== X-Gm-Message-State: AOAM531TrLVdHzrkhLsuNfNwiTh4P+h9PvlpQXOZ0Xo+GdDzH7rNYDST B8IEQIxEGT9Ap0U4y9+AcqxkHg== X-Google-Smtp-Source: ABdhPJzotJu8tcY4xh1gB9a75LOOE903wS9ULwAr+m1xQvwvg6gHcxMv6l7zPxfrmyVdUOge6OxQgw== X-Received: by 2002:a1c:48c5:: with SMTP id v188mr25965818wma.58.1593612207587; Wed, 01 Jul 2020 07:03:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 34/40] gitlab: enable check-tcg for linux-user tests Date: Wed, 1 Jul 2020 14:56:46 +0100 Message-Id: <20200701135652.1366-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Switch to building in the new debian-all-test-cross image which has most of the cross compilers inline. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- .gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93baf98232d..257947853b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -143,10 +143,9 @@ build-tcg-disabled: build-user: <<: *native_build_job_definition variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --disable-system --disable-guest-agent - --disable-capstone --disable-slirp --disable-fdt - MAKE_CHECK_ARGS: run-tcg-tests-i386-linux-user run-tcg-tests-x86_64-l= inux-user + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-tools --disable-system + MAKE_CHECK_ARGS: check-tcg =20 build-clang: <<: *native_build_job_definition --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612989; cv=none; d=zohomail.com; s=zohoarc; b=GWAJtu6ZkjSvfgM7qoCUw10XYDrq4r+de17vOQXARGf1RvCcWijfG1kZawWbSFD3ZjlHs1dzaKpDmMH9TSgaWgp5iCKkf9NLUwj9ToluJElmCBnQIeaabdHMmt85Rdj1GG0FwmDkwojp+k5OHgLIUSqcR3x2YnjBhzH8k/EvmX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612989; 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=BKCckCRRRPz6gI/TExKS1YsAaVbiJZyRRuAn4UPdxe8=; b=M9Kka4Wt70bw6lJ3fzah3dHHd5IfWzOh6x83Dw3wjNtTFHnjWWRfcqtGbMojtFtFZPrZYXbGjG79rYCW6cjf72Xj9Hmf7ulgTn2jIkjszbrJ8jCgeAaeyXw6AUG5Uf5AvUM3GMRsMQAzG12gNbXlSIia6+jdyYKx2wSDJ+0ORIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612989952468.6138487013351; Wed, 1 Jul 2020 07:16:29 -0700 (PDT) Received: from localhost ([::1]:49984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdXI-0002K6-OK for importer@patchew.org; Wed, 01 Jul 2020 10:16:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKp-0004jp-KU for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:35 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKm-0006p0-VS for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:35 -0400 Received: by mail-wr1-x431.google.com with SMTP id b6so23958435wrs.11 for ; Wed, 01 Jul 2020 07:03:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d2sm7750124wrs.95.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6CDEC1FFBC; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BKCckCRRRPz6gI/TExKS1YsAaVbiJZyRRuAn4UPdxe8=; b=Fm92SJucfe68NHY/3M2hicaZn+Phdb/ohWjkOKmRut7aahr7HfpO/uEmr+lmRaw1YN xherJkoHDLUmb1X7vAoKI+YBXrWysxkIUet8rQgTxPPQCZIYaLdh4RqZVMHb8ZqHL7av kYuhq8K0m6UV7HTDZRnonr3STBFBe7bFK2ofjclRy12co4hl3XTF8YSK8qxnAvHyAh9r MZJns7goIALIRC2WYAk8MwEk4IuygwjwOx7dIlzawT0kcTTk/ypq5tpVfczBN7HhI3DW IOHxoF+TVTHI7qt+ru8Ml8GvabAt2lCiglyJBzJCnBkxH9l3jcvYLMspC7kxdeqjsOMI Ny6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BKCckCRRRPz6gI/TExKS1YsAaVbiJZyRRuAn4UPdxe8=; b=R7ZOS3Vqur/M2Ho0kXLKIhONPwj23aGR/IkwwYZqJNfGfYRqTyw4U683neruQWy+qP u0uljzLVN54msGZf+ob6oaYW/0euNx8OgqkvK2Acx6PdauHreKxFT1eUov2UPSfnwHUs Ddm89Ax8Bt6eUTxc6GWXuIJ6x8kjmbGvWoiMezMdb7tEVJsoVoftWhj+FyF8yLuWnIJV I3811zEexnlYB8MV1T2lPKVJCFbynGPT88PQt19Q4KYn088rITIwugYtIOQv4qYO1O1L /DfQCPKlF3bnvHY55SAjz+VOcQ/I2psDqTnEuIKxEuBtFi7ikHAoruykQTkqbTe4l3GZ fttQ== X-Gm-Message-State: AOAM530wKP1ANtA7ojTdW7PmtvvFt/45JODko5ZCGFErkmSqz7CpATjf RvfqvDCjUy6cpHoTRe4jgNahgA== X-Google-Smtp-Source: ABdhPJzdh2cg7x6AwncTtTsf9EPn5Jk/Gn5Jf8Ly9n/STmY6JMQ2mshh+fdcly/5W1HRt8i3qqDouw== X-Received: by 2002:a5d:44c7:: with SMTP id z7mr28853627wrr.226.1593612211517; Wed, 01 Jul 2020 07:03:31 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 35/40] gitlab: add avocado asset caching Date: Wed, 1 Jul 2020 14:56:47 +0100 Message-Id: <20200701135652.1366-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These can be quite big so lets cache them. I couldn't find any nots on ccache in the gitlab docs so I've just ignored it for now. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200622143204.12921-19-alex.bennee@linaro.org> --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 257947853b7..13e9531724d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,12 @@ stages: - build - test =20 +# We assume GitLab has it's own caching set up for RPM/APT repositories so= we +# just take care of avocado assets here. +cache: + paths: + - $HOME/avocado/data/cache + include: - local: '/.gitlab-ci.d/edk2.yml' - local: '/.gitlab-ci.d/opensbi.yml' --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612897; cv=none; d=zohomail.com; s=zohoarc; b=Y58eCiXKFz/bbITOKRZZ44mLwseY7FnfZwTQwzlp815/kO/8GaCXn+KHHHugWz3EXcn1xRie3ByLjbhts+bKkyjVrnHRWU/AUbRv80pZfRh1Ad4GaF6+URWUF6a7DMqloBVAFWF2+KZXNS5xfJ3ajJrc5XHz3cWqSiK/mP5BBUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612897; 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=bOvcEoh+VzOuY+elSS3lw/PZUPV6sZX2V0ial7PUh0E=; b=bSscmSaictM/R/OYhPIxNEnfkaZER1RYGh5cyVq8Klyf1cBllZed+t/EDaL1CwG7lWOh1XIObbSbt6IsmTkc0Y2cZIuJ1/hBzLXUDCKghbPISNhgmQAu7P4E8gFVlLbrHaL5hqkf9CCZYuFSMTfJ0GrFxjMCztZydSQiIEBz9mA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612897010183.15056481006354; Wed, 1 Jul 2020 07:14:57 -0700 (PDT) Received: from localhost ([::1]:43924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdVn-000898-Ge for importer@patchew.org; Wed, 01 Jul 2020 10:14:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdL3-0005Gq-JP for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:49 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:38324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdL1-0006rj-PD for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:49 -0400 Received: by mail-wr1-x42c.google.com with SMTP id z13so23992230wrw.5 for ; Wed, 01 Jul 2020 07:03:47 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z132sm7330352wmb.21.2020.07.01.07.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 818EC1FFBD; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bOvcEoh+VzOuY+elSS3lw/PZUPV6sZX2V0ial7PUh0E=; b=JLKoQ3J7EBzWdb5NlzmrWWeO78CTnNVWr4J48TDyFnHQfFxMZA1595KxZQ5TvdYkwe AF5BOrrIKv/AvkujT9R4iglkeSsBtGVDRLN9GG4SBIH2HMXR5q8R5uKyY/yljUWufzM4 KBZgw6lWw43Vjm2TO9fgVjbrHVjfct3DRXIr/WpdIK4RyaGxgaxYva8PIYV1lYwvsYN6 CJZWeVESJQMgNzQXeYZ9Lf2C8pUpMmW5C0iEro0Zk+sieCM5wPh9hHxLfCzOx8ObZxGu CKgt+lU62fcWBwc+/v0jRdAHz/F/krp+L4vNSzx6tZCSi7P+uBeDRv0EbBL5MMhfg0tH 0o6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bOvcEoh+VzOuY+elSS3lw/PZUPV6sZX2V0ial7PUh0E=; b=PXmglf1bzT8jATo2Dw69VeNWNatY1m1fm9syP8Qvhaew87Kuuf5UdEv7JQbL5ZipYo JTN8H1L/LZEDYPNGwPDySLICRIkKHYbxVXoN9ywpV1ythwUrY7YOJbYqa+fk8HneM1NT g52Um1dTAXIlrwUQaoK9Y2nB+iHIHKXOduEcol4y/8ejKVAVHyvY2o+GG7foXRZipI6I IDXMuSUahB65zVgPw12XqZtxc5vOZzF1wzcWj3KTtQ/RB0lgJfhmA7KrZiTbiXJRJmKE XFEzYqFIgijMnm1WI+FLpHltOUuTJkavLfYsJD+A5aQzRM2hPTMnueu8MKqiNueNBabc VAzg== X-Gm-Message-State: AOAM530aFn6KNbdqtzUOuFyy5CN7tMxuMq02z1DbGyto0fgGFffPQleG pAyOzdjf4AeL7F0j13tK0z37Yw== X-Google-Smtp-Source: ABdhPJxOoR/XFhgphdxyxCtusDFNe1OYvicCOfzFzhgDLu/xTpyj22tAtN1HgZSZ7OQ7w9kuk9VW0Q== X-Received: by 2002:adf:f608:: with SMTP id t8mr27476592wrp.308.1593612226358; Wed, 01 Jul 2020 07:03:46 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 36/40] gitlab: split build-disabled into two phases Date: Wed, 1 Jul 2020 14:56:48 +0100 Message-Id: <20200701135652.1366-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As we run check-qtest in "SLOW" mode this can timeout so split into two jobs. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- v4 - rename :->- --- .gitlab-ci.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13e9531724d..83e38ea19f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,7 @@ acceptance-system-fedora-alt: MAKE_CHECK_ARGS: check-acceptance <<: *post_acceptance =20 -build-disabled: +build-system-fedora-disabled: <<: *native_build_job_definition variables: IMAGE: fedora @@ -124,6 +124,17 @@ build-disabled: --disable-qom-cast-debug --disable-spice --disable-vhost-vsock --disable-vhost-net --disable-vhost-crypto --disable-vhost-user TARGETS: i386-softmmu ppc64-softmmu mips64-softmmu i386-linux-user + artifacts: + paths: + - build + +qtest-system-fedora-disabled: + <<: *native_test_job_definition + needs: + - job: build-system-fedora-disabled + artifacts: true + variables: + IMAGE: fedora MAKE_CHECK_ARGS: check-qtest SPEED=3Dslow =20 build-tcg-disabled: --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612305; cv=none; d=zohomail.com; s=zohoarc; b=SGpXhXJV593DNx0X34op5kH3CLXa2IQjKF8kva2+gle8vQzjmtqiMdO+PlaU6n8nA7xSA4IXWSIfjt2aO9Gl119vpqKHLOdGBHiKjnVcim5zY97Ag45PIWKL8fhRqwNpplOHbi3juCG5vNtNuoKj0oRt5HzpuSk87DJoaSnPyjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612305; 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=hCA6Fp1zjl/YcdAD2qr1JaESX1/DMtcBS8XPo6xk3BI=; b=PXqVKg9ZSUpenvuCFpDaHTqAd7s+PVfv73L2aR+L0D/VA73bsebHi+V9EZlOeKEzBX4Sb0yl7xnVRqL9biMTy2fWIOU/fBlNSy6eBAvAn5u5beF46obHbFCDrGOJvbBqDbFPBVwPwyUDu3xUO8E49W7HaLCq0wUb/T0MP88in4c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612305235201.8770746953677; Wed, 1 Jul 2020 07:05:05 -0700 (PDT) Received: from localhost ([::1]:56174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdMF-0006Vy-Vn for importer@patchew.org; Wed, 01 Jul 2020 10:05:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEu-0002cC-Vt for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:29 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEj-0005tW-4e for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:28 -0400 Received: by mail-wr1-x443.google.com with SMTP id h5so23947241wrc.7 for ; Wed, 01 Jul 2020 06:57:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y20sm7266415wmi.8.2020.07.01.06.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:05 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 973331FFBE; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hCA6Fp1zjl/YcdAD2qr1JaESX1/DMtcBS8XPo6xk3BI=; b=evcPGZDx6VcoAplJ+O3WTf/V0gdN7LFhhqY+tWhKnSlyof1wl3pDaslalzqlh2Dtf3 NUPMVrksla/BXss5p/QiJWzXEtzlOS997usukFS6idwW1PXEdmyPgT4c3a7PqDl0bHl/ M01tgp2ktTtRsnjkOIip6Nsm80ZaKTcy+Wzv2ZW8ve4fWbbMMBWqxq6axU7AEsV9SdUg PEoDKzZWFXYOkAa2BjbCAMoCTUm/SKAk2uhIDtP7KXQIg9ZfNOsNKjBJv2d/pIj5mHvQ K+zO0Z+WVPBC/696VzTC0KyCT5CgzKrOO2fJUpeF1b+KUmh9cVkwKtV+GOKuEZxhNQxh cFsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hCA6Fp1zjl/YcdAD2qr1JaESX1/DMtcBS8XPo6xk3BI=; b=m2+jBrbvfjpLHDN3h/qqsKqCHUmpYVcacrpLBOCqF8RPqKQxo7rb7q5sjSAFo/Gj4D bWbjVnsHXoYcP4lxcvwjVAOfTs0vVvEjb0GqCedSYUbNY0BEmB6zrH2U+/UQb8jqgfXg qZtKRzGKRCfcQi/6kNhJYCtPukFVI9Jm1GIvtYANQPmksqzYeMiVsKI2gReVuA43tnSs iqlj1GbuDGXhFGaSo/w24m6F5sd0FLtMTMNGfp/m8vMHDRRsH8AqTfI9WoQ8l1PbWSge IspLvILWWbJ/Hb3IHsaeDXjE42cena/cTNIsuSfkdM6IhpWHGeNOJEbBAKgrozggizBC rHUQ== X-Gm-Message-State: AOAM531ZxbbEgWxlYGU5e23TfhHESey+mjW2R4af6ByQgLwBJEpmECbY E6Z9sc12WOBM/JmaZI6xRGNlSw== X-Google-Smtp-Source: ABdhPJxqgGVcfXz/iXjs/wbts7Lh6N2/8Y1sAaQWeDpU1J/HgXNYgEIKNN8zJ8Z7cWUia4GkyyJ2wA== X-Received: by 2002:adf:8b5a:: with SMTP id v26mr26527074wra.165.1593611835351; Wed, 01 Jul 2020 06:57:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 37/40] gitlab: limit re-builds of the containers Date: Wed, 1 Jul 2020 14:56:49 +0100 Message-Id: <20200701135652.1366-38-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Most of the time we are just rebuilding the same things. We can skip this although currently there is no mechanism for picking up new distro releases. Rather than try to be too fine grained allow any change to trigger all the images being rebuilt. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v4 - try and include branches - use rules instead --- .gitlab-ci.d/containers.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index a7621c4204c..ea350eacff7 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -17,6 +17,12 @@ - docker push "$TAG" after_script: - docker logout + rules: + - changes: + - .gitlab-ci.d/containers.yml + - tests/docker/* + - if: '$CI_COMMIT_BRANCH =3D=3D $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_REF_NAME =3D=3D "testing/next"' =20 amd64-centos7-container: <<: *container_job_definition --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612775; cv=none; d=zohomail.com; s=zohoarc; b=FnfmnkpVZhF22aqWBfhoakTJQ67YNHvZZZ45eSsOZN32T+XuoWFXno5cSVmNtC4p/zfKYXW0jeZg3h0XpwBuXHxKCOD1pGAULkJDJYer1txcEuNqlWUV3cJzhPDSoHUXBGdVvtIhmx4Ucbo2SHT+XLO8qirjY/seAYqL+za+C5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612775; 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=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=Brz7bsPoNqBsqdabkPIYkBl9xyezJPNMvfiBsd2h3EAllI2oUPDJesWeyoyEXa8ZHtU5AWfKh8wNHwPpLhl0hQRq/+N6oRi9zTJ1jiE3WXP7L6V//r0ZGaFEuuJBxVc22Kp6eqGb3a9M4Oq1EyZ1Y2UTIfGGWSAg62VLNxcdtZM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612775792153.1920529392296; Wed, 1 Jul 2020 07:12:55 -0700 (PDT) Received: from localhost ([::1]:35566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdTq-0004is-Ht for importer@patchew.org; Wed, 01 Jul 2020 10:12:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKy-00056C-Tq for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:44 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKx-0006qf-4V for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:44 -0400 Received: by mail-wm1-x343.google.com with SMTP id f139so23386622wmf.5 for ; Wed, 01 Jul 2020 07:03:42 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m4sm7346717wmi.48.2020.07.01.07.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ABF9A1FFBF; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=QqQwjLi6YMb46gu33K/TpzYfCNGIN43MXqPRXDIsa6R/ZiLe5p7ZJ/vE/Rg4yh3uVf Cbr2pw1JMakjN0l5veMvTSXzn+ueigEJCXFYJuxCpHVfvVJBTlql2K/MjcPcCVd0XCfT YAmpJ7VzFAwJO+LUR2w9LUeSO1AcuZGrBH33b7AxyyWg7EJ8PYyudr6kponaGkxAsGVX /xhXR8Vz+CUBRDxdTeh+/diUwy82SpCRlZ9ZdRhRHDDLH1Nt32JiYjsksqsSWoUCx55V WBvKSE9OJMANPshS8ZsltJnsXVCwcoSTtIRh2xY96mFDM717lqKc9q2ob1FdNLkVSPlX nU+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=pdZosqypbE0bWMQ4+bGaCELH+o/+Qsz2T35aw4EQ4cTvizBw+wQV/ZSzq2HbzK6pTq iJV7EdBkDu3ki1t3rr9lUTodvsTL70p8d3V5jF/6MYXDA383x1j+LlkinyNLStVfhZcN fdCGd11dspSxPDvJoy4aU8BtRxS2LasI1Gy/fXI4XP4/QYaskRnpicMisY8UegC3ouae ZkW+2ZhQANvXxuI1qvCxWk5mzzfgFuUfBNi/ck1rQwp2H6eFIbS2S77MS2DuP+kxts2c L5VGFLPTD3d//GfwcCfGj7sAKlRVXtYzr0tW7sHzLvuYEHks879xn+8DroACGbKGsNYv JR4A== X-Gm-Message-State: AOAM531IGyPl7kZ8G58ghPU5u+4/jmN4w9uL7rT+6rsgIL6pOb/EdsgS mcDrW2G+Wv5AQvirPjGUGsqo4Q== X-Google-Smtp-Source: ABdhPJynAIgvGZh5lgT1dMB8QfCCj85+On1CbrvPE/MxzF0iEtzU0TFBEZLfQNsO6io9jXBsYOK7Hg== X-Received: by 2002:a1c:4408:: with SMTP id r8mr26937260wma.100.1593612221643; Wed, 01 Jul 2020 07:03:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 38/40] containers.yml: build with docker.py tooling Date: Wed, 1 Jul 2020 14:56:50 +0100 Message-Id: <20200701135652.1366-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Instead of building the docker files directly use the same docker.py scripting as we do for building locally. This should help ensure we use the exact same steps and allow us to cache properly when building locally. To get this working you have to have a fairly recent docker binary otherwise you will see the error message: =3D> ERROR importing cache manifest from registry.gitlab.... So far docker 19.03.12 works (from the docker apt repos) but 18.09.1, build 4c52b90 which is packaged in Debian Buster fails. Signed-off-by: Alex Benn=C3=A9e --- .gitlab-ci.d/containers.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index ea350eacff7..b1e39cfd9ac 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -6,14 +6,17 @@ before_script: - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - apk add python3 - docker info - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker= /dockerfiles/$NAME.docker - - DOCKER_BUILDKIT=3D1 docker build --cache-from "$TAG" --cache-from "$= COMMON_TAG" --tag "$TAG" - --build-arg BUILDKIT_INLINE_CACHE=3D1 - -f "tests/docker/dockerfiles/$NAME.do= cker" tests/docker/dockerfiles + - ./tests/docker/docker.py --engine docker build + -t "qemu:$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY_IMAGE + - docker tag "qemu:$NAME" "$TAG" - docker push "$TAG" after_script: - docker logout --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593613265; cv=none; d=zohomail.com; s=zohoarc; b=DkUa+AbqWgC5L0UTdOBXSkjJoX4g2KyVTNvlvAfXUtHhE83cqY19v6F2+DGE/3AHhJCgh0CQGGmf0uBdgU7QvVl9iK9rfzj+3w930YA5BAp9Q14xtW43+xeLOco2m2ctrW5zlT6/thwc5I3c0bf6rFotNjJEOpl+3D8Ru0Z69xI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593613265; 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=6iI9/w6QPP17yFAS2LeQCOWZjjok/LI3j4IGGgPNwkk=; b=eV96lirL28ScIHBUpMMJHaqX6dkryD3bF1ZebLfpGzP3rP2e5zyl8SppN4H80dyDmzfgzRhe9pvkQqO5vD4M/QKLe0Kq4h182SBebrJAR/Q2j5uafcbKG2+3xALFEVbvA1N7iAXnUoh3zuQ5bHxQCri9gaVExqK9O3mI4Wg5X78= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159361326516263.886471354868945; Wed, 1 Jul 2020 07:21:05 -0700 (PDT) Received: from localhost ([::1]:37962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdbj-0000r3-Rv for importer@patchew.org; Wed, 01 Jul 2020 10:21:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdL6-0005Nw-Qv for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:52 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdL4-0006s6-LO for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:52 -0400 Received: by mail-wr1-x42b.google.com with SMTP id f18so15927678wrs.0 for ; Wed, 01 Jul 2020 07:03:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q1sm7406724wro.82.2020.07.01.07.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C60E01FFC0; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6iI9/w6QPP17yFAS2LeQCOWZjjok/LI3j4IGGgPNwkk=; b=oQrjkOJZ5sjTJa4s+xN7BoTtY6doSPVbV6LoG3Sn0CaYY3ZhEGylBntFSml1Q6vWBR O173JsW/NqnAleGq+rG4qnqhp3G1UECM0/MtVbayvof2qaMJHel/MeRE0HQ3MoXE89vi bgXyMtzlI1aDJDmlQGYtZJgaGqI5EUq3zxueaY/EmoeklqCapD6xMMwWBzEsJyDkNLfH oz1Od1l16EHZoyHkX5wFqdpmc8bF7TTueEEdgOkJzR0YskrXsQUIgWJwGc6MF9oVh1kP 9NKc6cYme4ysyeoWBHfT+06yZXv+OsPTeaxXiE+qVedFZ2emJiftQOrSlfUobuApILcV TNqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6iI9/w6QPP17yFAS2LeQCOWZjjok/LI3j4IGGgPNwkk=; b=S7r/EmkfWMj1G8t3H1P3lL7pQ7uZjNAZGzVLd/9ATYVsgiDJJF4TqvaRMGQ12pa4Pu dZ97YLekuv/QLzAwSNqn+DBF3lRTRQQL4RPv3fRLSpl0U2yNXqiO1iVXBHzukC0qOZV5 cflz3Ky0OnZ+sjlWHr2b9mC0Q0DZgQpaJtxqM+pjWTqT5xNuLnYQPiLzJW8Ap1UGYsyu zETaZh7C37scEdOjzB/UfZL9s4UlpzSKjMhLF0+0htMiWbRsrlh7E8F1/JvhAgRulFV5 0oINFGRh6u+3AGUpkCxgxkNKny9igo47OGeEN6RTBS8e/a7XDEvTA9efoJxFf8g2zvH7 zjxQ== X-Gm-Message-State: AOAM532B1TcF4U/YXF9GTkvANkcIiq5FZKezrLQwijmOYVXMmBPyjh1i ggbsacgbj1MmyXqLc8rFOTeMDg== X-Google-Smtp-Source: ABdhPJzo+2E66bebCacQpLqEVRwCdFlWKPj9Viso6JbXz+iCA2+cf2yD5+q03uYqI6rItVE0xMp4fQ== X-Received: by 2002:adf:e6c8:: with SMTP id y8mr28673953wrm.40.1593612229115; Wed, 01 Jul 2020 07:03:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 39/40] testing: add check-build target Date: Wed, 1 Jul 2020 14:56:51 +0100 Message-Id: <20200701135652.1366-40-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If we want to continue to split build and check phase it seems like a good idea to allow building of the tests during our multi-threaded build phase. Signed-off-by: Alex Benn=C3=A9e Cc: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 5 ++++- tests/Makefile.include | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83e38ea19f3..b0e5417146b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ include: - make -j"$JOBS" - if test -n "$MAKE_CHECK_ARGS"; then - make $MAKE_CHECK_ARGS ; + make -j"$JOBS" $MAKE_CHECK_ARGS ; fi =20 .native_test_job_template: &native_test_job_definition @@ -60,6 +60,7 @@ build-system-ubuntu-main: TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu lm32-= softmmu moxie-softmmu microblazeel-softmmu mips64el-softmmu m68k-softmmu ppc= -softmmu riscv64-softmmu sparc-softmmu + MAKE_CHECK_ARGS: check-build artifacts: paths: - build @@ -90,6 +91,7 @@ build-system-fedora-alt: TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-sof= tmmu riscv32-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu x86_64-sof= tmmu xtensa-softmmu nios2-softmmu or1k-softmmu + MAKE_CHECK_ARGS: check-build artifacts: paths: - build @@ -124,6 +126,7 @@ build-system-fedora-disabled: --disable-qom-cast-debug --disable-spice --disable-vhost-vsock --disable-vhost-net --disable-vhost-crypto --disable-vhost-user TARGETS: i386-softmmu ppc64-softmmu mips64-softmmu i386-linux-user + MAKE_CHECK_ARGS: check-build artifacts: paths: - build diff --git a/tests/Makefile.include b/tests/Makefile.include index c316e0d6647..94b1cc8302e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -22,6 +22,8 @@ endif @echo " $(MAKE) check-venv Creates a Python venv for tests" @echo " $(MAKE) check-clean Clean the tests and related data" @echo + @echo "The following are useful for CI builds" + @echo " $(MAKE) check-build Build most test binaris" @echo " $(MAKE) get-vm-images Downloads all images used by accepta= nce tests, according to configured targets (~350 MB each, 1.5 GB max)" @echo @echo @@ -649,6 +651,10 @@ $(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-= qtest-%: %-softmmu/all $(c QTEST_QEMU_BINARY=3D$*-softmmu/qemu-system-$* \ QTEST_QEMU_IMG=3Dqemu-img$(EXESUF)) =20 +build-qtest: $(patsubst %, %-softmmu/all, $(QTEST_TARGETS)) $(check-qtest-= y) + +build-unit: $(check-unit-y) + check-unit: $(check-unit-y) $(call do_test_human, $^) =20 @@ -680,7 +686,6 @@ check-report.tap: $(patsubst %,check-report-qtest-%.tap= , $(QTEST_TARGETS)) check FP_TEST_BIN=3D$(BUILD_DIR)/tests/fp/fp-test =20 # the build dir is created by configure -.PHONY: $(FP_TEST_BIN) $(FP_TEST_BIN): config-host.h $(test-util-obj-y) $(call quiet-command, \ $(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" $(notdir $@), \ @@ -814,9 +819,10 @@ check-softfloat-ops: $(SF_MATH_RULES) =20 .PHONY: check-softfloat ifeq ($(CONFIG_TCG),y) -check-softfloat: check-softfloat-conv check-softfloat-compare check-softfl= oat-ops +build-softfloat: $(FP_TEST_BIN) +check-softfloat: build-softfloat check-softfloat-conv check-softfloat-comp= are check-softfloat-ops else -check-softfloat: +build-softfloat check-softfloat: $(call quiet-command, /bin/true, "FLOAT TEST", \ "SKIPPED for non-TCG builds") endif @@ -955,7 +961,8 @@ check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGET= S)) ifeq ($(CONFIG_TOOLS),y) check-block: $(patsubst %,check-%, $(check-block-y)) endif -check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree +check-build: build-unit build-softfloat build-qtest + check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(tar= get)-y:%=3Dtests/qtest/%$(EXESUF))) $(check-qtest-generic-y:%=3Dtests/qtest= /%$(EXESUF))) @@ -963,6 +970,8 @@ check-clean: rm -f tests/qtest/dbus-vmstate1-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 +check: check-block check-qapi-schema check-unit check-softfloat check-qtes= t check-decodetree + clean: check-clean =20 # Build the help program automatically --=20 2.20.1 From nobody Mon May 6 11:58:05 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593612974; cv=none; d=zohomail.com; s=zohoarc; b=mK/1EzKW6ISnmt1utr6WizlQJAl//0quO16alkYDT6MibW0rC1r55E0iZ/KlT0bCGA6sHx7klhC/zCkxtSCYKVW7kPYdVGJ50NiWtF1O1kMLizCEIjZbaDVHxiR5ACBMMRaoK6aZHeFU129zMkH5YxtpRnFcWM4X3YbQhvCaPKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593612974; 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=Z8+7R3MmmcndzfMXwtKjgL5/CCMc+Xc8nupS/X00rus=; b=WjSacfES98LhmJXD/v8Kc+CmZ+BSKMXYp3fgykv2c0ZMI/s8p38GxM8BWfq5tLJ4+loz6YwLh4N/9lXjEvvTLKuPTW2GUzpUjNQm34bNoHDzoBNtW5ycrtwfgPRNrEuLuYp+ftoEDkqELB6qcC7XxosKijv/BsgnxtIfLoGuNxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593612974660896.6086232081241; Wed, 1 Jul 2020 07:16:14 -0700 (PDT) Received: from localhost ([::1]:49236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdX3-0001zq-A8 for importer@patchew.org; Wed, 01 Jul 2020 10:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKw-0004zv-Cg for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:42 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:39625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKu-0006qO-Lf for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:42 -0400 Received: by mail-wr1-x42e.google.com with SMTP id q5so23978914wru.6 for ; Wed, 01 Jul 2020 07:03:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p14sm8261263wrj.14.2020.07.01.07.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DBCE31FFC1; Wed, 1 Jul 2020 14:56:56 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z8+7R3MmmcndzfMXwtKjgL5/CCMc+Xc8nupS/X00rus=; b=qcjQf1DSHf79VcNlRR59uY0ST5iwrQh3WQ6BFifR02+48pLWqNbg8erPyCVsT/LXlT k37ZGL40+YiMavb3iCMaMvSdZSbRaM1Pfd9hpnbTj5hHvyUZxaiA7cRG/A3Y3AEXR71e e2akNGhBuooZCCe87GhxAleMaa0GBhMb6ITMIdo+Z9zXcLboVWti66+mT4l1K7G+Jsh+ N0ky+g9AlWneZeHzxPs5l09jgG2WEN5ds4LdE4KIJDALsvpePamBPSJA4ppAjD29ZATN FfHyeV42A3JIvPaCnJohPy5aw7U0tBcyLy2oq1yD7dXTiSg+GMUWrTxPu4qTdGMMX/Rt bQmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z8+7R3MmmcndzfMXwtKjgL5/CCMc+Xc8nupS/X00rus=; b=PNzbw7nU3J/a/pdhPlE4jvLji/SRhy43OvFDHgVZnpwQeRMcp/wcYnL8GWWZDVHPzU IK09FLlnlVKnjYy0gP9L64XYIhILOvG0FSBk7hxwQKVz0y/r+9Xfgyf2cGbnpFJqy9cm /27yuatkidVbGvMRnQygqd3ZgPnoCXMSNwrTPDRcocNtKQz3/pxJqCPltl/8Iw1FASBr 4jR44sLEJxkNAckB0jPmCzIS8FZFXOf5ztzgh7SNng1yixpY6Ae3vsEe41v9UepIM5Ki dyo3/0S8+P9JX0H/zHC4/EYS6JC7U2qKQ2dApJASy8dpCgy8m2Cpc0tsf1aS+SUgY12h hfcQ== X-Gm-Message-State: AOAM530UAioYOA3g/5cvi974ReS7twWHglwNzWVe0G2C834Tib/1TlRC a6ClvZwXpxwQFetapZ+HOjV9YXyJFME= X-Google-Smtp-Source: ABdhPJxBBDzsOwevk0Blb7sUS5zkujXCGF6JFkm7rEZZZXY75a2rZwDz/Jg5vIJosSNhAzjEsvGbIw== X-Received: by 2002:a5d:60d0:: with SMTP id x16mr27639775wrt.5.1593612219261; Wed, 01 Jul 2020 07:03:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 40/40] shippable: pull images from registry instead of building Date: Wed, 1 Jul 2020 14:56:52 +0100 Message-Id: <20200701135652.1366-41-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Now we have a source for registry images pull from there rather than re-building every time on shippable. [AJB: change to upstream when we merge PR] Signed-off-by: Alex Benn=C3=A9e --- .shippable.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.shippable.yml b/.shippable.yml index 81905727d14..eb8b68610a2 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -26,12 +26,10 @@ env: - IMAGE=3Ddebian-ppc64el-cross TARGET_LIST=3Dppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user build: - pre_ci: - - make docker-image-${IMAGE} V=3D1 pre_ci_boot: - image_name: qemu/${IMAGE} + image_name: registry.gitlab.com/stsquad/qemu/qemu/${IMAGE} image_tag: latest - pull: false + pull: true options: "-e HOME=3D/root" ci: - unset CC --=20 2.20.1