From patchwork Tue Nov 22 09:56:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627500 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344543pvb; Tue, 22 Nov 2022 01:57:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5rrw2Y7/fXiBRH9jdf9WI7cWNbdbsvK+qeRGlS2nab6yOezriQek4Hc8gdzWGf5P49P7n+ X-Received: by 2002:a05:620a:468f:b0:6f4:fe28:a69f with SMTP id bq15-20020a05620a468f00b006f4fe28a69fmr19742737qkb.21.1669111038528; Tue, 22 Nov 2022 01:57:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111038; cv=none; d=google.com; s=arc-20160816; b=tFvLwGiiwM6KIjDzmp/5R8gq60pD9/CG9p1WS0vR4ACz2XMaiwiekW49MZByA6jed6 hEs4wYx9iUn7YF8Dp/DMWlmTUyexB29b9Hl+y2+oEpSsZBf6atSXKbAD6RZtKbygERaE KST0bGOJ6FxySU8d/eB3w8uPhKq7A4wov1JqRuVjpajGXaNikdg1OO6qwwX3f7+GwlZE spIBXRoClpquv9i7YQQym/yhJrQgvw/SPnyv+cUsaN25ATuUGBO0Y4IFoI3EAR8o0Z5B LgKvBNWU83wSrBvGQGOWb1u+66YPvElAENPG1Yxu7BGT3iDW0t9CwBplXubQ6tO0kYCH mepg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=iCcGjRp/4GsKZvWmPcNig/asdFktj14vOkU8uLqKCl89R/fRJjMTOttoDYa/+LqfW2 i6/JtAtCnC/QQAo1eoWk+0Juk8zU5IeTsSJAu/1eDEMsNqTROHYx3oCZpr5K5wXH8O38 Ahj2GsuGzxjIKBlHxHl+i2bg3dzwu0hLeDbuF0yZKBNr8XZv4QjeUD/w29pgiqS693fZ 7eShrfZHLFH4eK/NZykOTK+OgdHBC68VRSGNG6FFMee3Dbd2vwtfhAvjlOVARBXA3Pg6 zASX9E75lX8YHVO4yNXTrr6Bt1kIXP2W/VOpikIekuwXjIRKwS2rCaFVKfMY0SyI1xq/ O5+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hDBg7iMz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id pt3-20020a056214048300b004c6a638cefdsi4619764qvb.216.2022.11.22.01.57.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hDBg7iMz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0r-0002Qo-7L; Tue, 22 Nov 2022 04:56:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0l-0002I0-So for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003YL-2e for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:15 -0500 Received: by mail-wm1-x334.google.com with SMTP id l39-20020a05600c1d2700b003cf93c8156dso10869029wms.4 for ; Tue, 22 Nov 2022 01:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=hDBg7iMzHf5Bk+QKov4YTd4WalAnO2Fx3HrFwlryIOgVxsEsHh0AHWLf+daXEU7h5K 5tgO1zvDciP3IuNgB1G8snYHxfmE1DhhGUsYwf+4GWErFvnj+h7A4ClUcN8raMKeG6i7 C6u8lBA98MH/lExiIjqVsbwayAQnA4z7FF2ctVNg/tY5Ox0BJo9mWZ1rjf0A4TsYC7B3 GcWXwE0pAV96FXNQ0ZdYH/BrOxjRzgoWUqSKdYZPkQUOUs1/AJ+3L4agayQbvoLJPc3s dK6XX44+FwT2tm3te0cj4oHiAPsrRx1BNbfgujgs38LHzKKY31CAEc5aI2jhCL7Xytf8 RtlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=SbOx8mJNle6vr8dS9eYa42mBHmcoaS+iW3OoDC9G2kh20OcKneWKEqRup484rs3sko rqg4sjKkDau6rcwVE46LEIo9Lc2TKHKtUPejh/eMo7WXBq1HrHJmn8DW5BNru0iG9JJL 7ANChaoxYz189Si6B8T92tNdfHb6EHeBJPetrQ0euR4DWUJZtFj5rTr/q/EJy85UY/FG hRs+5IrwYDvmbzAxqvXB0Ps8DQbb0JZtb9iG+fg/+BSbsjNXmXU+emllt6zFM7gqBWVZ QvBIgmr1cxVEYRK5WhAeQOfW/PLn8n1d1yw79efUfJdcvjFgAO+Uvy9b1gKyiQP+inM5 nLHg== X-Gm-Message-State: ANoB5pkbefVNBJkOgdxj612fa7qgS87BUweDKOqg8Bz7RUt66fcbEorj zfxDPQO/1AsnO8CMprdm/lNteA== X-Received: by 2002:a05:600c:4f45:b0:3cf:9be3:8d26 with SMTP id m5-20020a05600c4f4500b003cf9be38d26mr7712391wmq.185.1669110971663; Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j15-20020adfe50f000000b002366d1cc198sm13464326wrm.41.2022.11.22.01.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A1DCE1FFB8; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Stefan Weil , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL v2 01/11] Run docker probe only if docker or podman are available Date: Tue, 22 Nov 2022 09:56:00 +0000 Message-Id: <20221122095610.3343175-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Stefan Weil The docker probe uses "sudo -n" which can cause an e-mail with a security warning each time when configure is run. Therefore run docker probe only if either docker or podman are available. That avoids the problematic "sudo -n" on build environments which have neither docker nor podman installed. Fixes: c4575b59155e2e00 ("configure: store container engine in config-host.mak") Signed-off-by: Stefan Weil Message-Id: <20221030083510.310584-1-sw@weilnetz.de> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221117172532.538149-2-alex.bennee@linaro.org> diff --git a/configure b/configure index 66928692b0..26c7bc5154 100755 --- a/configure +++ b/configure @@ -1780,7 +1780,7 @@ fi # functions to probe cross compilers container="no" -if test $use_containers = "yes"; then +if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; podman) container=podman ;; From patchwork Tue Nov 22 09:56:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627506 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344816pvb; Tue, 22 Nov 2022 01:57:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf5/GtMDk80pWlE0Z5CR4PFDu+YMJTgcXWAi3F0CJe0Me/AiY0ZrOHp7kR0TfroPfUeEz9SX X-Received: by 2002:a05:620a:4708:b0:6fa:ada7:e51b with SMTP id bs8-20020a05620a470800b006faada7e51bmr5358684qkb.674.1669111077881; Tue, 22 Nov 2022 01:57:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111077; cv=none; d=google.com; s=arc-20160816; b=MtuPY1x0CTs89jB3g4KRHe9A+S0PuSOvC/Jo8AeB5F0buA0zOKTRCQDFHMEWcvmJ6/ edG/GIKIED8mSvWSRTKoUtJhVmgldkYI54Qov/bzuBfIRAGHQkkoAAzwHwCGYHa6aWRT jNK7tbJqUoih9DYE4Aweh4OOwkpesKj51rjDxPRILTvmhjC71U1T5LDjwa3mL7DYPv9y k52gJ7UiJc9WfTDGCYVNUsZ4YdgxXcmL9sKiyQpLM5Q7WFGBQOdNzWxAUJnGn1aLouwD 6AdmRxGEg4sS9nyNWRmrUaiiUxcWw2OIrONMegNJJDNayaKTU46vNQHlA6pXjOuM2TmS VcPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=lfhL5PJoLwBGVyfuUplfmtuhOWFVKeFjOevRtQcTU9MH0c/9ctKl/fbA/CtCdOCbZ4 YfhURtIzQpE5rpUg3ceZ4TBgWuaKNUzVJ+GTthGXqVFh/+otOZiBW8igzIsVbWbMYD+Z 7wDHAevSiv6ejPUOfAHSSlHA5S2O6SvFin3fn7lIrWknZe9+KeEy8JC5SdObJTfziilr 1PYkHSUtDYAGyXhMxbSLPjILREdMw6AIgi5vHIDLpZXmrok3isfo8kP9JeDL8srbaao+ icnXa+QDhwgfZ9g7SDcdEiEO8ckhFaZP0hzZQdEFE3fEAtMTlW3ySvlCtIB61kU8YpRu FkpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fC97xsCf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u22-20020a05620a431600b006fba8e59b7dsi8165763qko.276.2022.11.22.01.57.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fC97xsCf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002NR-Vv; Tue, 22 Nov 2022 04:56:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I6-E6 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003dL-4y for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: by mail-wr1-x42a.google.com with SMTP id e11so10958718wru.8 for ; Tue, 22 Nov 2022 01:56:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=fC97xsCfDnEnBT+1LBZPImJdJnTN/4ddCCxoIt1f43PCUn7Nr62uEN1wf3xZZotQNs lY7rIgtkh1qadwiPu/uEfgPf5X6tETz+f7MKd9IrTSXFrI9qyIchEQLvwQB5cdwJdYIf J4z1xtBi6cqgP8s+XGQa3ysr5RUX7pZo2wW4hZzoKhAejMLv2Plh+6/BDbyDbVoJFIgn 9y+nIKhjByVta/OBHWGqEP5u4t7b+pSPYdyJgCFDiluZwwb1dosjqQcGVqjulNTHIUSp xbPPI7aYMq76VhW8LVPyN8H3nmVBfIK20zrVdZ+2F6wcLE9NcCm5+ZdaAIq1SJmDqhvP LKXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xSqW2kbzQv1qGLnYM3Z+K0PUcGFO2WEC4eYGpHtzuek=; b=p/kgzxOLQORAZ2w3NuK1016ucKpJKeR1xWeQsAY5mFDdT11dJgl+03NCWLQI5BnmHY +KyA4WX2LJZxl0g16YRaKqXhlhYZLcj+UyFlvdMJP2xrpBHgZEq8Orhu1NzKb3/whM/l 1KP3CMahlafJQ6x4WLyXq8dIWXWuWJJXyS+ldkcnmgKC2aCSIjOhJl1g5lzIENnIjFC0 WO4iBs4MF4Mf0VUUrDRy5LJmdIDHcGMDCD9vW3/kwzc+tvPC/R3MFAR6/j0bDpbdb4dR aYaztc0FJYV2oeIyuDmTPEidJzGAbWfkkl/hBAuBX73E40N1/he9R06NaogFpqF+gzsQ LH/Q== X-Gm-Message-State: ANoB5pmV3bOJCmAMs9t2Hh6ayQ8kR0m08IosMae2K1pyqPwyrgR8ll32 /bwlSipXsHFYaYq/9PwNa3N6bw== X-Received: by 2002:a5d:42d0:0:b0:241:d8e2:868d with SMTP id t16-20020a5d42d0000000b00241d8e2868dmr4960231wrr.671.1669110972339; Tue, 22 Nov 2022 01:56:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l10-20020adff48a000000b002366ded5864sm13468445wro.116.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B7C721FFBA; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 02/11] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Tue, 22 Nov 2022 09:56:01 +0000 Message-Id: <20221122095610.3343175-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Cédric Le Goater The Aspeed SDK images are based on OpenBMC which starts a lot of services. The output noise on the console can break from time to time the test waiting for the logging prompt. Change the U-Boot bootargs variable to add "quiet" to the kernel command line and reduce the output volume. This also drops the test on the CPU id which was nice to have but not essential. Signed-off-by: Cédric Le Goater Message-Id: <20221104075347.370503-1-clg@kaod.org> Signed-off-by: Alex Bennée Message-Id: <20221117172532.538149-3-alex.bennee@linaro.org> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index fba6527026..1fc385e1c8 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -12,6 +12,7 @@ from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern from avocado.utils import archive from avocado import skipIf @@ -182,6 +183,8 @@ def test_arm_ast2600_evb_buildroot(self): class AST2x00MachineSDK(QemuSystemTest): + EXTRA_BOOTARGS = ' quiet' + # FIXME: Although these tests boot a whole distro they are still # slower than comparable machine models. There may be some # optimisations which bring down the runtime. In the meantime they @@ -194,7 +197,7 @@ def wait_for_console_pattern(self, success_message, vm=None): failure_message='Kernel panic - not syncing', vm=vm) - def do_test_arm_aspeed_sdk_start(self, image, cpu_id): + def do_test_arm_aspeed_sdk_start(self, image): self.require_netdev('user') self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -202,9 +205,13 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.launch() self.wait_for_console_pattern('U-Boot 2019.04') - self.wait_for_console_pattern('## Loading kernel from FIT Image') + interrupt_interactive_console_until_pattern( + self, 'Hit any key to stop autoboot:', 'ast#') + exec_command_and_wait_for_pattern( + self, 'setenv bootargs ${bootargs}' + self.EXTRA_BOOTARGS, 'ast#') + exec_command_and_wait_for_pattern( + self, 'boot', '## Loading kernel from FIT Image') self.wait_for_console_pattern('Starting kernel ...') - self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id) @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): @@ -221,7 +228,7 @@ def test_arm_ast2500_evb_sdk(self): archive.extract(image_path, self.workdir) self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2500-default/image-bmc', '0x0') + self.workdir + '/ast2500-default/image-bmc') self.wait_for_console_pattern('ast2500-default login:') @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') @@ -243,7 +250,7 @@ def test_arm_ast2600_evb_sdk(self): self.vm.add_args('-device', 'ds1338,bus=aspeed.i2c.bus.5,address=0x32'); self.do_test_arm_aspeed_sdk_start( - self.workdir + '/ast2600-default/image-bmc', '0xf00') + self.workdir + '/ast2600-default/image-bmc') self.wait_for_console_pattern('ast2600-default login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-default:~#') From patchwork Tue Nov 22 09:56:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627507 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2345110pvb; Tue, 22 Nov 2022 01:58:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf6QRLOX44rJpEhn89zg4/kpEj37LuLgtOSHmfK50fhdvedPAQL2q6uPmXs2Os6oOip/cQzF X-Received: by 2002:a37:464b:0:b0:6fa:3431:1f2f with SMTP id t72-20020a37464b000000b006fa34311f2fmr5226921qka.81.1669111129665; Tue, 22 Nov 2022 01:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111129; cv=none; d=google.com; s=arc-20160816; b=R8TqzPZBGiGuHZDqFpF4+KVRB0Rxgr7QGpv6puL9O4993cVrvFHCiNeD4IJhZuFjT6 6hWNGpczX8jurBerEpRBYB8yjR2Lsn4ImHk+MS3Z4QdbVHtM3zpK4gdvpT10hCMIiOv0 kFOTxvG618eW/KZT9KOgyHjJH6qtOMUCJ65klUZtZuQTRIErMmQhCKadztbtyVqJ+YLL KjgtboTAH31/r8GpLemLWZ/uRb1vq2rYIeKeRwcTZldha84rzCY0tGNfsCkXa141Qq5F WQahvR97ql9W5sH3ZCta2Rmv1PeBOZnc9mAKJeHpBTdamEeVlu8b6L46U9s4PVnRCJZD 7Hng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=oSfmfpKXxM4J8qOx6TsNNObCodVj3LCYCa0U54iQMJnIsEtqtNQyxyQzD0ojzJBrpI vX2RCoeLzQogmE6wRARjjDVLYfZ0Odn8bizp31YmnLO0etcrpUtFDH8Vb78WuLZuVqVB q1dg4dYCl0LXphsg1RECsw73fAaNsroqY94ZlQ3n6TE9dwS6ctgDSKnbuJNzt76YJCUm 2lAnX1QksxvfsX2gnfB6MdyETcszOHOyvtEsfsJqDf8dLgUPh1reITyL6UBJVA62w0j4 IIBxx7SkBrFPWemJ17uXnXu/OOnR/eBPxTUad4zwvV1esxOqRaUNmOPsX61EfK3eiJy5 3KRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dmh7C+xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v21-20020a05622a131500b00397bcf554c1si8661771qtk.135.2022.11.22.01.58.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:58:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dmh7C+xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0t-0002W8-8k; Tue, 22 Nov 2022 04:56:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I5-5Y for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003eJ-4s for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:16 -0500 Received: by mail-wr1-x432.google.com with SMTP id z4so9282208wrr.3 for ; Tue, 22 Nov 2022 01:56:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=dmh7C+xyEKzTZj7NErSxo7obQw/CRuM86tg2tnJ9sGrPQe+HQIlxxLIUv1Y2tlSgKQ XJ3PZWsmRNkPozkV9tI4xJrq9PO1N3YFZ00us32SnhLR51Jz0RcJ5NrVaiyevR3VMnjl 8jENZI6CZGaMQRDR3+Nu1k06WqJmEw7Zzk2Sv7e9zqHdYpP6HlzJ5J+BGFAnl5zpzUvU i7weE4SsSqYrn1rZBrPuEImMGjYYq3wNtiIprWoEOxouOMrJmZr1SPqKyC9v+8C3lx9J R9X7pB7R4fD0pjLebI9O+YXSp7SPBMMWAwepMkUMl8FoTwZc27SkKONCtCXjpp9aTapD QTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=rhSZjfW4oXkgXALx3PJHwAjLv/lEmpXmfkLxVnMmZPuXvs5+lHbUFFTwIHzI999bME WPStyenClYQfIlvOhcQF8lKjSz+w2JL6746sQzr+/Yy+7c/Gh2n9QnxNqNFTj8KxTfa4 pKihaHFuzzYPVxI7WeCpwSzsxI5v5sE/mf0EyULMg7sIZdfW/XB5SDOcBSNiNYDJcNZl G7BPs1M6oAO51a35P37RzXvLxuyaU6i7zu3rTmLHdnrpvmJXqnJK0CxDXf5Q7OzgQzHO O4/cs0XgzHMUf1dKzlTqI9CVZEY+81u4Stxprlh8hducvZ1W+UpkT8rUYVUyd7lIJvmz 7H7Q== X-Gm-Message-State: ANoB5pmbTlVzjAfrYHfiVXBgd+HC6F/wjvCms4hosmdWL8wqZdfRWFGz xc4kv9Eqx8N5hQFxOX/RWXgUTdzfYLJVpw== X-Received: by 2002:a5d:5144:0:b0:22d:d4c:e99c with SMTP id u4-20020a5d5144000000b0022d0d4ce99cmr13363285wrt.582.1669110972658; Tue, 22 Nov 2022 01:56:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y10-20020a5d620a000000b002366dd0e030sm13604043wru.68.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFC111FFBB; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 03/11] tests/docker: allow user to override check target Date: Tue, 22 Nov 2022 09:56:02 +0000 Message-Id: <20221122095610.3343175-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is useful when trying to bisect a particular failing test behind a docker run. For example: make docker-test-clang@fedora \ TARGET_LIST=arm-softmmu \ TEST_COMMAND="meson test qtest-arm/qos-test" \ J=9 V=1 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-4-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c87f14477a..fc7a3b7e71 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -184,6 +184,7 @@ docker: @echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' Extra configure options.' + @echo ' TEST_COMMAND="..." Override the default `make check` target.' @echo ' IMAGES="a b c ..": Restrict available images to subset.' @echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @@ -230,6 +231,7 @@ docker-run: docker-qemu-src $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ + -e TEST_COMMAND="$(TEST_COMMAND)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ $(if $(NOUSER),, \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index e6f8cee0d6..9a33df2832 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -63,12 +63,12 @@ check_qemu() { # default to make check unless the caller specifies if [ $# = 0 ]; then - INVOCATION="check" + INVOCATION="${TEST_COMMAND:-make $MAKEFLAGS check}" else - INVOCATION="$@" + INVOCATION="make $MAKEFLAGS $@" fi - make $MAKEFLAGS $INVOCATION + $INVOCATION } test_fail() From patchwork Tue Nov 22 09:56:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627497 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344260pvb; Tue, 22 Nov 2022 01:56:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf7BC3Ej1TeZP3zSgW1yOncAPpsl/hHviNGm6RKBDKpDbFJ+oMsTpE5OaoCfbKmfRVa1V3kS X-Received: by 2002:a05:622a:1aa9:b0:3a5:32c8:7825 with SMTP id s41-20020a05622a1aa900b003a532c87825mr21092577qtc.486.1669110993701; Tue, 22 Nov 2022 01:56:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669110993; cv=none; d=google.com; s=arc-20160816; b=dd5eQgujpKHPQi+Ulkg9l2LQ28HskuVhq1RSdmorVF7N2udoFHR3zhxmAYRBV1znA7 6GsOpflGMfyH9B6dol/1Pin7+Fzf0JXcryvNpb81bC+P4bR242LeMJg0w9z+GsTHA5zd +XW29/nAFP8Qfp7GT/Wg8ELODb17OmNi5GuDYkaVDIH/AVqgXBm8c5fNBO+ntsf317tY H6fyb0JXmMjOm5UvbLpmCZAWSyM2LzH76IImaTp5mgRuIGJmtrqm5eYgKMRJPus9IqCH Z98Ds7XP1pdP66K98AtnkxzBN9fXkgVyNLt/YLJbG/nZv/QSa0H1gVe0B4CnnPjKXFeZ WoWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=w3oXSHmwdautTP+92zVqOXWCVdOjJ8KuBUb1XxW28Mg=; b=qlnQsPP6EIeGAUuXFxesUbPPxND1CaX8oh6540Vj3Hhls2OIoUoSmW0eMN673m8qgu MOObpB0EZP8+azfrrYZR9qiJhKdQfBZcAwdxQTbyHOcRMERlq0WSyrfgRHuDNryvHEAa 3mAEQ8iqIQmY6ZBLUfi4CmVwpQXHQecEabT08DMmWc4RalkR0r/erD7vdfPXI670KZpw jZCYAZGWlrfHWI116BTqciJNyjzDTWHCjX2/dvjq1WA5b3KFOn1npo7YkM9IidnVoFcO mMVCWDmb4whcj/cX3IL8UlMGbRRsXnAIYEFskDA3+z/hpWkKe88VzvV/lmWCgjBl3478 5N9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hncCIKap; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x27-20020a05620a01fb00b006faa81e7218si6988307qkn.143.2022.11.22.01.56.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:56:33 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hncCIKap; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002L9-3j; Tue, 22 Nov 2022 04:56:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I9-JQ for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003j0-RG for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: by mail-wr1-x432.google.com with SMTP id n3so7318685wrp.5 for ; Tue, 22 Nov 2022 01:56:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w3oXSHmwdautTP+92zVqOXWCVdOjJ8KuBUb1XxW28Mg=; b=hncCIKap49ckLc3vaZfoOUyOZM0jjF8NOIGRs9dTEzzMFggD5LPaCpgz//b+6cxAQ8 PXS9ThleJYNw+Ta+x3UfnmLQRPzcVgKLfk0/SFWm5K9TGxZ7Xf6nfqPx18llv2rsbNKW evkpd0oN39nPIObUrGgk1v+NvXCmUAzd4aH+Bp4x8laHH/S4B//dU5S5L4AqsbAPOgDe PJpmq2t+IPTTT+dU8DZjrHgSSLT+ptu6OHf2n27BrQIPGK7UeEUHg8cyrS6y36aLyTzA 6k15T6jmOHkvrBugmC/qCuW/3rRgtp7crXhwbWEzLAQFu8m+zL7gkSJlGx6zXy/SuDC3 PXjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w3oXSHmwdautTP+92zVqOXWCVdOjJ8KuBUb1XxW28Mg=; b=IB0i5uUs1N8n48qy9ulmA5tVqPjOdKRao4YjGmE9GC3hXproyl/00aK77YKu9zFxV7 sR9kAmALhvPCpZTmfj1SP8aVcrQ6DUmjTvJiAaotjK3UWQy6W/grtw+grasJwh0lCFr6 HRde2NLKrgFn7QUpHruEfzDUZ5uJnOctXiLpxjsptLCPFaoBcanRXqddgaRJ4wJyd1cO iZiqjV+s5BJVH/a5K8L+qvKQmNjYTK9SiqiB2Ca+c7ziypikWFmd7rMZstdRSgIh4ByW 6n392tLet1otsKb+osmmr0WG0ea+A3vmgUMMP/XZSmqOicmD2se46rkeMid8pdDqd7wn EGng== X-Gm-Message-State: ANoB5pno+RNErSjQo+PlfTmrxXR2ye12duf3NBnfdeUyIowO4xDOsN4w MTrpe3W2etOc7LonJRTvsIo8HQ== X-Received: by 2002:a5d:4607:0:b0:241:bfc1:4211 with SMTP id t7-20020a5d4607000000b00241bfc14211mr11653959wrq.397.1669110973454; Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id 6-20020a05600c024600b003b50428cf66sm16144018wmj.33.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F08521FFBC; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 04/11] docs/devel: add a maintainers section to development process Date: Tue, 22 Nov 2022 09:56:03 +0000 Message-Id: <20221122095610.3343175-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't currently have a clear place in the documentation to describe the roles and responsibilities of a maintainer. Lets create one so we can. I've moved a few small bits out of other files to try and keep everything in one place. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-5-alex.bennee@linaro.org> diff --git a/docs/devel/code-of-conduct.rst b/docs/devel/code-of-conduct.rst index 195444d1b4..f734ed0317 100644 --- a/docs/devel/code-of-conduct.rst +++ b/docs/devel/code-of-conduct.rst @@ -1,3 +1,5 @@ +.. _code_of_conduct: + Code of Conduct =============== diff --git a/docs/devel/index-process.rst b/docs/devel/index-process.rst index d0d7a200fd..d50dd74c3e 100644 --- a/docs/devel/index-process.rst +++ b/docs/devel/index-process.rst @@ -8,6 +8,7 @@ Notes about how to interact with the community and how and where to submit patch code-of-conduct conflict-resolution + maintainers style submitting-a-patch trivial-patches diff --git a/docs/devel/maintainers.rst b/docs/devel/maintainers.rst new file mode 100644 index 0000000000..5c907d901c --- /dev/null +++ b/docs/devel/maintainers.rst @@ -0,0 +1,107 @@ +.. _maintainers: + +The Role of Maintainers +======================= + +Maintainers are a critical part of the project's contributor ecosystem. +They come from a wide range of backgrounds from unpaid hobbyists +working in their spare time to employees who work on the project as +part of their job. Maintainer activities include: + + - reviewing patches and suggesting changes + - collecting patches and preparing pull requests + - tending to the long term health of their area + - participating in other project activities + +They are also human and subject to the same pressures as everyone else +including overload and burnout. Like everyone else they are subject +to project's :ref:`code_of_conduct` and should also be exemplars of +excellent community collaborators. + +The MAINTAINERS file +-------------------- + +The `MAINTAINERS +`__ +file contains the canonical list of who is a maintainer. The file +is machine readable so an appropriately configured git (see +:ref:`cc_the_relevant_maintainer`) can automatically Cc them on +patches that touch their area of code. + +The file also describes the status of the area of code to give an idea +of how actively that section is maintained. + +.. list-table:: Meaning of support status in MAINTAINERS + :widths: 25 75 + :header-rows: 1 + + * - Status + - Meaning + * - Supported + - Someone is actually paid to look after this. + * - Maintained + - Someone actually looks after it. + * - Odd Fixes + - It has a maintainer but they don't have time to do + much other than throw the odd patch in. + * - Orphan + - No current maintainer. + * - Obsolete + - Old obsolete code, should use something else. + +Please bear in mind that even if someone is paid to support something +it does not mean they are paid to support you. This is open source and +the code comes with no warranty and the project makes no guarantees +about dealing with bugs or features requests. + + + +Becoming a reviewer +------------------- + +Most maintainers start by becoming subsystem reviewers. While anyone +is welcome to review code on the mailing list getting added to the +MAINTAINERS file with a line like:: + + R: Random Hacker + +marks you as a 'designated reviewer' - expected to provide regular +spontaneous feedback. This will ensure that patches touching a given +subsystem will automatically be CC'd to you. + +Becoming a maintainer +--------------------- + +Maintainers are volunteers who put themselves forward or have been +asked by others to keep an eye on an area of code. They have generally +demonstrated to the community, usually via contributions and code +reviews, that they have a good understanding of the subsystem. They +are also trusted to make a positive contribution to the project and +work well with the other contributors. + +The process is simple - simply send a patch to the list that updates +the ``MAINTAINERS`` file. Sometimes this is done as part of a larger +series when a new sub-system is being added to the code base. This can +also be done by a retiring maintainer who nominates their replacement +after discussion with other contributors. + +Once the patch is reviewed and merged the only other step is to make +sure your GPG key is signed. + +.. _maintainer_keys: + +Maintainer GPG Keys +~~~~~~~~~~~~~~~~~~~ + +GPG is used to sign pull requests so they can be identified as really +coming from the maintainer. If your key is not already signed by +members of the QEMU community, you should make arrangements to attend +a `KeySigningParty `__ (for +example at KVM Forum) or make alternative arrangements to have your +key signed by an attendee. Key signing requires meeting another +community member **in person** [#]_ so please make appropriate +arrangements. + +.. [#] In recent pandemic times we have had to exercise some + flexibility here. Maintainers still need to sign their pull + requests though. diff --git a/docs/devel/submitting-a-pull-request.rst b/docs/devel/submitting-a-pull-request.rst index c9d1e8afd9..a4cd7ebbb6 100644 --- a/docs/devel/submitting-a-pull-request.rst +++ b/docs/devel/submitting-a-pull-request.rst @@ -53,14 +53,10 @@ series) and that "make check" passes before sending out the pull request. As a submaintainer you're one of QEMU's lines of defense against bad code, so double check the details. -**All pull requests must be signed**. If your key is not already signed -by members of the QEMU community, you should make arrangements to attend -a `KeySigningParty `__ (for -example at KVM Forum) or make alternative arrangements to have your key -signed by an attendee. Key signing requires meeting another community -member \*in person\* so please make appropriate arrangements. By -"signed" here we mean that the pullreq email should quote a tag which is -a GPG-signed tag (as created with 'gpg tag -s ...'). +**All pull requests must be signed**. By "signed" here we mean that +the pullreq email should quote a tag which is a GPG-signed tag (as +created with 'gpg tag -s ...'). See :ref:`maintainer_keys` for +details. **Pull requests not for master should say "not for master" and have "PULL SUBSYSTEM whatever" in the subject tag**. If your pull request is diff --git a/MAINTAINERS b/MAINTAINERS index be151f0024..366538f9e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23,7 +23,7 @@ Descriptions of section entries: W: Web-page with status/info Q: Patchwork web based patch tracking system site T: SCM tree type and location. Type is one of: git, hg, quilt, stgit. - S: Status, one of the following: + S: Status, one of the following (keep in sync with docs/devel/maintainers.rst): Supported: Someone is actually paid to look after this. Maintained: Someone actually looks after it. Odd Fixes: It has a maintainer but they don't have time to do From patchwork Tue Nov 22 09:56:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627499 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344417pvb; Tue, 22 Nov 2022 01:56:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf68emEKJCfeXm+WpQcdqw/XF5XZcaKKfFPL/GWWBWxHNoqOocPiA/EKa2EevEuRhcqyGdZY X-Received: by 2002:a37:aa41:0:b0:6fa:c90:7aa5 with SMTP id t62-20020a37aa41000000b006fa0c907aa5mr19690933qke.319.1669111017628; Tue, 22 Nov 2022 01:56:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111017; cv=none; d=google.com; s=arc-20160816; b=Z2DVGbBopCDcygP9ezNpZpp1tJLELCZwNTiyims6O7y+V9tfCnu/9JZreuJw4/+2Av uOpy+PS2AfK5mMBtq7glCwLdVMlK8bqwjHM0I4+fwDSTj2+addAmvef1jiECGXkTjr/8 XNy8AJuO21hK6WIOmIs+3pkd9LpYUgbAE6M12G67qIs5GifLeUT0WMR/RgSDf/2kaj0Y aDSm0oe7/+LIMz1iOWxg5OI07OoZlUWr9Hn8FyWnSepE3RiOACm4oZuPf4YVfrWa4WGN z8qRsM9ygTd8z7ruBKoxJXtQ7trgOCQEE2UFP3flvGxlQl2p1GvlFiuTKO/tCnt6r19U KboQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nKxwOIrXZEHyPecLBXJSR5FqRq//VNLD9ZuG0G6fm6M=; b=c8hKn3zkbUkH70XSpDfMINOM5C2DuIns81bnECuVlqQUEh7OFvrEccSwATOk2wqHEp YfwzHpHLx7vGczt4gcCWfoi8EdO5GRnz5dsZU9JPtA6Wwce2G9rWSEx67eaVlqZl/aP3 9bNzTYNCLio0FFuu4QqNeZ8UwM2IzUz7Yi/XHTR7+LPUFfxjZda39XhGIJG074RiqCEj 8Qq5tbqj4QySgVoMh90tgg9ny0HegnWgt2lrWuKei4cC/VQgA+0ZgbYvoAu3v0b+l0P/ iQA29CWy74Xmgjr8SOwuSmwd5Myh80nSw58Vs+CRXQ5cUUStyOenlvmNzD03X4K7BEEI LNhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n+Jq6/Xu"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bs24-20020ac86f18000000b00398954ef82dsi8005981qtb.113.2022.11.22.01.56.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:56:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n+Jq6/Xu"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002Kz-3H; Tue, 22 Nov 2022 04:56:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I7-Fr for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0l-0003nf-Nx for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: by mail-wr1-x429.google.com with SMTP id i12so20010103wrb.0 for ; Tue, 22 Nov 2022 01:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nKxwOIrXZEHyPecLBXJSR5FqRq//VNLD9ZuG0G6fm6M=; b=n+Jq6/XuhBjvLA6RtXBgDl4IsvQAMGV3j+1RYzlXQ8+J4l8WR4rKvqi0LV9RAYiT0l q7erT+hNknUxvSAlCrJ8DZJtj1EGS1k61XDicPpZH7ifnyWVyROVWMixjN9GHPecHxnt MReTemZIBiduK7gCiKBZzM7xZkBqORamkO8it3XOjfRoURIQv8UQpzUiy6at51fL0w94 nbQQBEsdYISdmH1mZ4NxLZaKYh+7J3SEHXTI/1hcn8KOcb5ZWbxBw31/rEEESkFPqQwp iq4rjj3o14B/mRntvt9iWP7X1/HPRJlsPEuH55oroiehBo+4RS+du9O0CNmaQjpSKIgW uPyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nKxwOIrXZEHyPecLBXJSR5FqRq//VNLD9ZuG0G6fm6M=; b=IcXKmkDmJMEY00fC9GCre2M7m8cmFBKDMnFFGPtoG3LD/LL0pXiERx86454Z72k0Uu SWnlKyfOcmXpo1hpvxRerv6n3HiJH6cgZervIubv1dNPX5oOsEmaMQPH5pwpAkwQzs6E HkvyB92T/abq2kbc8FDC7gowDEbKmY8iDqdwmvyZLp7D6Uum4rZwTHZXFnc3Q+qA4WZU FEAPHmXi7879HIFatp47SmHW1800CSmQ0YIUXgPcfEPGrcYeO0DJ+R3RAgbwLT97D3Vm X6WdmKIqNqQ4B+BdFZXhRHQT5LB8GYPHmn1Jnu87UIQmq1wfGduUP5B6H8lj1AHpNves KU+A== X-Gm-Message-State: ANoB5pm4yQd0E2wAxqP82kjTW3VS/5dx/3gacKI/nJAMLhnKflis1hZW Ah9Ju+5wToebXTQOAAHPkRhavH/KnoWPWQ== X-Received: by 2002:a5d:5709:0:b0:241:d71c:5dde with SMTP id a9-20020a5d5709000000b00241d71c5ddemr5385017wrv.678.1669110974285; Tue, 22 Nov 2022 01:56:14 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e18-20020adfdbd2000000b0022da3977ec5sm13530129wrj.113.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 10F2F1FFBD; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 05/11] docs/devel: make language a little less code centric Date: Tue, 22 Nov 2022 09:56:04 +0000 Message-Id: <20221122095610.3343175-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We welcome all sorts of patches. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-6-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index fec33ce148..1319dfd3c2 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -3,11 +3,11 @@ Submitting a Patch ================== -QEMU welcomes contributions of code (either fixing bugs or adding new -functionality). However, we get a lot of patches, and so we have some -guidelines about submitting patches. If you follow these, you'll help -make our task of code review easier and your patch is likely to be -committed faster. +QEMU welcomes contributions to fix bugs, add functionality or improve +the documentation. However, we get a lot of patches, and so we have +some guidelines about submitting them. If you follow these, you'll +help make our task of contribution review easier and your change is +likely to be accepted and committed faster. This page seems very long, so if you are only trying to post a quick one-shot fix, the bare minimum we ask is that: From patchwork Tue Nov 22 09:56:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627498 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344284pvb; Tue, 22 Nov 2022 01:56:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Ye+epuEFro9iYSgBSceFfcqAqAPpiMVM1YR7bon34fI6QeeNX/OMtkXo6NetHGlUxAadt X-Received: by 2002:a05:620a:146b:b0:6fa:f548:7cfd with SMTP id j11-20020a05620a146b00b006faf5487cfdmr4107916qkl.103.1669110997644; Tue, 22 Nov 2022 01:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669110997; cv=none; d=google.com; s=arc-20160816; b=Nk9k/krudyyA8xhL0n0/Izxga6k93dd2NB2owr+cf5bgxBxhTZmC8LvTYCmtTfnqhw NoPCOl0ov2IADMWzA0UhwAZYVfbWKDGuWckQjhs6Bc00GfOtRden4BZM9BfcMI/2b4C6 eFZ2EsDK1tHlmjlDIZdQSAo4sFaNgbrTMhS+rcQZhFZ6ubd1P8qfhwILjnsCq5/P0muX zjaZ/w+TwZEtjD1P63dnOEy7PS2mV9HDTNSXtOWopByhcQ1b4D6oEyBtd6CneCnBPLyf 4DF2Zv7Hj/tQz5BahtEH+qLY/w1Yj0DcF3iytWy5lGHZA/oTG2D5CaAq2ucVYG8qpPFF gBTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=noAWK4Tr2C3oo56ITKJfPI3QYAkN6x1CbswUT/w7uoM=; b=OQOS+mjRsQtVFjDm8cj7YjXkFrUYnzWIBtEBXGRNNGKEgY5OgCXjd86KT5yy8ucaQZ zF8ekqsqNC7toDe4YsaxP5KfjUXcPh8MCQq2DvXl2EYw5NLhoZZTEZDGZ89rceKt/8dX WzTjnL4KeeQoPhyLgWajhBXHk8w1uK/S8CR0KilRaCDZoXNR6tYhunEvwymNp4lrXQZQ 9vba23Ne2qjgLHbDA7/HACpE/MNiI+d67PPS43OLZ2O7Qalk6pIWsLDjopSbZrAV+4Ps LThsM8NHhpn8ow3TH6ajwJdSsmAGMG+LP0AaCvhTCNu7nkugFmhDkMmgh+ieBJVnCtVp 9O7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kEGqoUow; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r8-20020ae9d608000000b006eecf6a0862si7725807qkk.547.2022.11.22.01.56.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:56:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kEGqoUow; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0r-0002Rm-Hr; Tue, 22 Nov 2022 04:56:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002Lj-9L for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0003sF-6w for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: by mail-wr1-x42b.google.com with SMTP id n3so7318825wrp.5 for ; Tue, 22 Nov 2022 01:56:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=noAWK4Tr2C3oo56ITKJfPI3QYAkN6x1CbswUT/w7uoM=; b=kEGqoUowkhR9NjDmEdDbwWqRTfoinf+M4aMTW+PMyzv2y7tGA6WlCA9Dov0aWN8dj4 IHlhW11nOMstUGKXOhaB0/vBQFZQ8QQxohmwnLtW4wSedHfDXqivB1Z1iwxYhWlGsoRL 7j/HCYMVJSrdM6qKWClMxdW5pV0tH5BI9ODS2EM1H4FjeXdRa4I09Y63+1szoUWafCxh dFx4js+rSQrsoMYtNep1jBJ+lsowGGOl/aFeXCBRaRMiyas/5nsuODpRaf4fRKRTpmug 9cZVZlC/COr/LzNAM5s/73U+uoXhOncOyvcr6Z9P+RAnuramo4kT0kF/F8eWpczrcE4O 4vhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=noAWK4Tr2C3oo56ITKJfPI3QYAkN6x1CbswUT/w7uoM=; b=cwy8MciveAElifkxTgknAEAoFbv1IFWmZV6ctVLeBtFfP3fm8R9O5fFrASpjkNRom9 60TlE2UR/5IkieQw/j56PLu5QwImXyYNb+Y9hVWeGQo098CacDJQF81v97RcVda8wJZH QogLwPEYTw7BKR/OqH7bIaaV1AdKMjfCY8Oqr0v5edu4y0yvQDZqXAQQvFzVgBbilSQY GIZY9noLvnPCEjnn8Mn8IhoXxFUN9/vi0evLMi0m6z9gcYBLPFxAzK0e9AuRSrhOuHrc D9Qtd2B9IBatZAMMiQExEum3gxi9yOg5YtgYTF7Izvilp8HxRGrYsw7+v5i32pz6v7bk ij3g== X-Gm-Message-State: ANoB5pkj8JEUdh5oiwREkRvUuC786qYSVj6P3F/Wbq4gzpPJLb+Ui1hw SFLiIse30baPQFbhSPXDtfGcng== X-Received: by 2002:adf:d841:0:b0:236:5655:13a5 with SMTP id k1-20020adfd841000000b00236565513a5mr13405199wrl.477.1669110975720; Tue, 22 Nov 2022 01:56:15 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d16-20020a5d6dd0000000b0022584c82c80sm13391628wrz.19.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 264311FFBE; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 06/11] docs/devel: simplify the minimal checklist Date: Tue, 22 Nov 2022 09:56:05 +0000 Message-Id: <20221122095610.3343175-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The bullet points are quite long and contain process tips. Move those bits of the bullet to the relevant sections and link to them. Use a table for nicer formatting of the checklist. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-7-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 1319dfd3c2..b2a162ff4c 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -12,25 +12,18 @@ likely to be accepted and committed faster. This page seems very long, so if you are only trying to post a quick one-shot fix, the bare minimum we ask is that: -- You **must** provide a Signed-off-by: line (this is a hard - requirement because it's how you say "I'm legally okay to contribute - this and happy for it to go into QEMU", modeled after the `Linux kernel - `__ - policy.) ``git commit -s`` or ``git format-patch -s`` will add one. -- All contributions to QEMU must be **sent as patches** to the - qemu-devel `mailing list `__. - Patch contributions should not be posted on the bug tracker, posted on - forums, or externally hosted and linked to. (We have other mailing lists too, - but all patches must go to qemu-devel, possibly with a Cc: to another - list.) ``git send-email`` (`step-by-step setup - guide `__ and `hints and - tips `__) - works best for delivering the patch without mangling it, but - attachments can be used as a last resort on a first-time submission. -- You must read replies to your message, and be willing to act on them. - Note, however, that maintainers are often willing to manually fix up - first-time contributions, since there is a learning curve involved in - making an ideal patch submission. +.. list-table:: Minimal Checklist for Patches + :widths: 35 65 + :header-rows: 1 + + * - Check + - Reason + * - Patches contain Signed-off-by: Real Name + - States you are legally able to contribute the code. See :ref:`patch_emails_must_include_a_signed_off_by_line` + * - Sent as patch emails to ``qemu-devel@nongnu.org`` + - The project uses an email list based workflow. See :ref:`submitting_your_patches` + * - Be prepared to respond to review comments + - Code that doesn't pass review will not get merged. See :ref:`participating_in_code_review` You do not have to subscribe to post (list policy is to reply-to-all to preserve CCs and keep non-subscribers in the loop on the threads they @@ -229,6 +222,19 @@ bisection doesn't land on a known-broken state. Submitting your Patches ----------------------- +The QEMU project uses a public email based workflow for reviewing and +merging patches. As a result all contributions to QEMU must be **sent +as patches** to the qemu-devel `mailing list +`__. Patch +contributions should not be posted on the bug tracker, posted on +forums, or externally hosted and linked to. (We have other mailing +lists too, but all patches must go to qemu-devel, possibly with a Cc: +to another list.) ``git send-email`` (`step-by-step setup guide +`__ and `hints and tips +`__) +works best for delivering the patch without mangling it, but +attachments can be used as a last resort on a first-time submission. + .. _if_you_cannot_send_patch_emails: If you cannot send patch emails @@ -314,10 +320,12 @@ git repository to fetch the original commit. Patch emails must include a ``Signed-off-by:`` line ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -For more information see `SubmittingPatches 1.12 -`__. -This is vital or we will not be able to apply your patch! Please use -your real name to sign a patch (not an alias or acronym). +Your patches **must** include a Signed-off-by: line. This is a hard +requirement because it's how you say "I'm legally okay to contribute +this and happy for it to go into QEMU". The process is modelled after +the `Linux kernel +`__ +policy. If you wrote the patch, make sure your "From:" and "Signed-off-by:" lines use the same spelling. It's okay if you subscribe or contribute to @@ -327,6 +335,11 @@ include a "From:" line in the body of the email (different from your envelope From:) that will give credit to the correct author; but again, that author's Signed-off-by: line is mandatory, with the same spelling. +There are various tooling options for automatically adding these tags +include using ``git commit -s`` or ``git format-patch -s``. For more +information see `SubmittingPatches 1.12 +`__. + .. _include_a_meaningful_cover_letter: Include a meaningful cover letter @@ -397,9 +410,19 @@ Participating in Code Review ---------------------------- All patches submitted to the QEMU project go through a code review -process before they are accepted. Some areas of code that are well -maintained may review patches quickly, lesser-loved areas of code may -have a longer delay. +process before they are accepted. This will often mean a series will +go through a number of iterations before being picked up by +:ref:`maintainers`. You therefore should be prepared to +read replies to your messages and be willing to act on them. + +Maintainers are often willing to manually fix up first-time +contributions, since there is a learning curve involved in making an +ideal patch submission. However for the best results you should +proactively respond to suggestions with changes or justifications for +your current approach. + +Some areas of code that are well maintained may review patches +quickly, lesser-loved areas of code may have a longer delay. .. _stay_around_to_fix_problems_raised_in_code_review: From patchwork Tue Nov 22 09:56:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627496 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344248pvb; Tue, 22 Nov 2022 01:56:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dxqf7fGByG6yy/F2zzWd5nh5KU2q7FE32eTT49t6hvUjv0pxkgIQnoTmwzrjAqEwOT5ZD X-Received: by 2002:ac8:7599:0:b0:3a5:460f:79c8 with SMTP id s25-20020ac87599000000b003a5460f79c8mr3037335qtq.501.1669110991651; Tue, 22 Nov 2022 01:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669110991; cv=none; d=google.com; s=arc-20160816; b=Rbdp/7fu++MW5IkqcRoGJ9aOr/m9cD6fSo+e1n7KkKevQu/n0v/IyDjeo6XOQ4QEoC IULjHRiYMOlbD7JqyoJ/cSCOKAqP1vX6DbSCSN3q84NOqk9NnwEx90rRmF8YvFp2q6uw Hsz5w2mgoSILwV19j8yUsy1MAU3iOj6peFTEh8i7j1Jmn3sSHl7RBZLRrQ8qHd+vwT1V iBvbRyLrAEtlB4VG5hHZBQ/tMJ9ZHQZuikOlD/1XTYx0QXZTv4DO78QTCPkM2qj/AuOd JZIgI/0OjfPywd2/C0aajyuCGGD81eb2vKg9+9NlERpJA7oh9eCPUi0hE4POqhH7Fdbk DuJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zegCns/hbxeRS6uSc3QTrVi/SCCsN8HyRoAJg014Vic=; b=iZGoZ61EJLFHft9bTPBjPsQGJMByNXvmKqohPd2AwHjOyLhwG4WJFvY7u5s2wrFrKb Vlm/RyIc/kV9DgojSaHP19sVvZHUfB6AF5j/jNJ7kMy/dsPSQX5UBJyegKZLYPO7+LGn h6A6ZzGM8t7G7pvaNTgw0qUyyc0coznG66G5R/F7IAiRWgF5w9IJOB4ZFLeDBdKYE6mD LikxMktaS5LsIufZIXONCCGG9MUP6uWBj2WtvgER//m8ynGlUZMY5LUyD4IS4P5lVtuw OU/X3erKSwHbcJX3GiOnlysAEdHM22LkKGzbl/w1XyFwGGYRxoWPl5RfcDxgCgeSF8iV EBCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LqHpS0Ql; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ey9-20020a0562140b6900b004b195be4dfdsi7842785qvb.236.2022.11.22.01.56.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:56:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LqHpS0Ql; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0s-0002TC-7p; Tue, 22 Nov 2022 04:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0o-0002KY-O1 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:18 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0003rJ-2T for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:18 -0500 Received: by mail-wm1-x335.google.com with SMTP id t1so10309656wmi.4 for ; Tue, 22 Nov 2022 01:56:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zegCns/hbxeRS6uSc3QTrVi/SCCsN8HyRoAJg014Vic=; b=LqHpS0QlldkNdmqGdkhLS81ZRUUrSt4QadygaocVPqBpcjmjczBbdVJe/Fy3ELdL4p 6Y3gkk1QHmJ2S6AbYKUA0zUms0bfYZQ4cWVc6bx0SR7l7f2Je2xNscC6LfhnjO1XcnhN 0MkE+JGb6DiEcv9JBCjQ5VF/AJcOkde5INOjfMi6ct7ws4RK6vgSgZKt6OeNJ75g+ZsB H7uAZA+cHSNKatNrUnlxJDkJEAEFQSKMXay/GmwI8j3eoryB2oelMP3ExPuYJ7Qn555r YnyPaNhRFR4dZ2MHb4xUPND+mBIHg2zhp3dfjAJ+Dzoc70tR21CpEVEzRLotVSP82FDF /WEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zegCns/hbxeRS6uSc3QTrVi/SCCsN8HyRoAJg014Vic=; b=w0uyT1x6Yt2CDfCLPoAjr9c3ltSEjxFriW0VXaw7FbMTzTwCzAWRT3sZgKKMVPHAS/ +HckfdfdzH4OGJBQn5Adc6GrPtlfQr4hSr8qDRL3uVXP0DbzWFi8VjEefWDnWIg4iTAk j4mNJA8eRIKe0gUP1vYyTyZCx3pv6/306exEXZw3BRlnr2rtC23pcxrqpsgeShU4YoJ9 sGu1XnNhW9NaodPGjVFjnrJcmT+a4sk3p67SumS2v6U/eZvtD3EZtOO+wEuhPVLNPBOW YpkP5MXomscDwKiABjUymSVtD9XjqeooCzlfLRPWs7cXJroat+c+VQ85aRXYFHgglsh4 4osQ== X-Gm-Message-State: ANoB5pmgVcgm7abRtAHUCGyBqea2f9sMarbRW6Qvs1VBGZOswu1TZntc nJ287e2xnIvpgYK8pQxIFhT0hg== X-Received: by 2002:a05:600c:298:b0:3d0:2707:ad98 with SMTP id 24-20020a05600c029800b003d02707ad98mr1990478wmk.171.1669110975376; Tue, 22 Nov 2022 01:56:15 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e9-20020a5d5949000000b0022e344a63c7sm13493940wri.92.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C51B1FFBF; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Markus Armbruster , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL v2 07/11] docs/devel: try and improve the language around patch review Date: Tue, 22 Nov 2022 09:56:06 +0000 Message-Id: <20221122095610.3343175-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org It is important that contributors take the review process seriously and we collaborate in a respectful way while avoiding personal attacks. Try and make this clear in the language. Signed-off-by: Alex Bennée Reviewed-by: Markus Armbruster Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-8-alex.bennee@linaro.org> diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index b2a162ff4c..c641d948f1 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -434,14 +434,20 @@ developers will identify bugs, or suggest a cleaner approach, or even just point out code style issues or commit message typos. You'll need to respond to these, and then send a second version of your patches with the issues fixed. This takes a little time and effort on your part, but -if you don't do it then your changes will never get into QEMU. It's also -just polite -- it is quite disheartening for a developer to spend time -reviewing your code and suggesting improvements, only to find that -you're not going to do anything further and it was all wasted effort. +if you don't do it then your changes will never get into QEMU. + +Remember that a maintainer is under no obligation to take your +patches. If someone has spent the time reviewing your code and +suggesting improvements and you simply re-post without either +addressing the comment directly or providing additional justification +for the change then it becomes wasted effort. You cannot demand others +merge and then fix up your code after the fact. When replying to comments on your patches **reply to all and not just the sender** -- keeping discussion on the mailing list means everybody -can follow it. +can follow it. Remember the spirit of the :ref:`code_of_conduct` and +keep discussions respectful and collaborative and avoid making +personal comments. .. _pay_attention_to_review_comments: From patchwork Tue Nov 22 09:56:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627502 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344667pvb; Tue, 22 Nov 2022 01:57:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6pV8N1B/68iJSIzuWI2ZgyNqSuU0SIB/tP0vNkcwlCoxD+XzFIjccnQqAu4Sk3/de4Niny X-Received: by 2002:ac8:44b9:0:b0:3a5:81ec:c4bf with SMTP id a25-20020ac844b9000000b003a581ecc4bfmr9072868qto.180.1669111056203; Tue, 22 Nov 2022 01:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111056; cv=none; d=google.com; s=arc-20160816; b=04Z5ugS1pXgntxH4FI609b7w6w1mBtDQXFHNkMLtdH0nO6sF6fb2nR3k4iKELsDGKu wd53n3rKWnjn5Alu9qTeYE2lwybcbWF8FX7Vu8rRom8bDDvJ1bduIJJY8daSmYnRpZx1 +2m3a2Ua//Tfz2MfSIJ3ICnS1eJzmE0Z55BO6LwnywDDFMniCEf0iYRv1K1XNJsX3QLD 4hhzMXswJ2q6p4GXUdA421dmteXwgwLnIuc39BVGmDIuXzThF3DMfSBsOAtI43eDZU0h iuKRD9gC5UyTaXBwPSIkDsP9Jd3djE1f/swYivIY/lDPPHniDTSHpjz2vcesDzbkiFxn ErBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T7Z8ogQEbj/l37me+vKTddNiXN3s0GS1v0ETJ7AQqmA=; b=1E2H8zSDcxhMn5s7iYZiEBSz7nA8GxH7S7T03p3bnR6Leond1dihwXt3yK2haQ6x1S DYLzsTTu1f03aBjsma4MqpPRXNbakJeZwqk0ow4SeOKHElIIqRsTiYDQ96hgBOzaGZ5k ijUbIZj5+5vSOYx2nRPzDpEAQ9zJyp+iqWXozm16lT3lnKpO/DbAq26qsMm5/rBQfMyA jaZX16dHUTnJAjnus2IfuQ2onmhRjBGvD9CZ2NAoWF+8s4COxBVOetfQnOeTvRMRxUH1 ZqUERk/X+HKT/CU8ZRgR8TP4HBNJIOllqCDBa1RXslPaNvn+1Fjfd6xZXgJueIjE9r+C ZdRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kJlfV3bY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h13-20020ac8514d000000b003a51fa0bdd3si7264158qtn.186.2022.11.22.01.57.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:36 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kJlfV3bY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0q-0002Pk-PF; Tue, 22 Nov 2022 04:56:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I8-FW for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0l-0003pN-Un for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id l39-20020a05600c1d2700b003cf93c8156dso10869111wms.4 for ; Tue, 22 Nov 2022 01:56:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T7Z8ogQEbj/l37me+vKTddNiXN3s0GS1v0ETJ7AQqmA=; b=kJlfV3bYwBQANuoAQGOnacKLK4k4suvHaLcwV5Jc5ldyvnBa8R6ml0nBN67LKWQGps yswpNpj+xZOoGMKHcQrIhNhxGt7dcA9tCEFawPzBcOwTZmTbB4Q9rCpznpOI9tUu0MD5 ZH6zGUr+kKrh8Zj5UgvVmkArwxT9jIjWbaK7Xv1xiN5wGCR0YmQbFhSNB6aE0IUTvSqK F9MVdV0UBnFTJA+QxQxGu7jHysVRzopdRp83dyIG4UIL0WBcJvbjUQs2tZBMrErDZcZx H4KLdDDqWcxWoJ45lVuZ3Psf3wpge0mBprDySMKT7rXZvWjjSyC5HQvoNNDTRTZfTaoC Vqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T7Z8ogQEbj/l37me+vKTddNiXN3s0GS1v0ETJ7AQqmA=; b=Nyf0B+1tR/3pSYtKu5eZzXp+ou3VSopb9E8uIofUS0/3oVy+UO9fS6vNMr74rjQ5Ep GDE7VdczgK9q6tN50tETE8h3ENhQT9fJs1ET2NsaWiFSD0q+Bq+dYPrrxSVu+5gzLu0B 8mncR1dncSPJFlRJrozVRuRoVjJ5M9QhpwgnR/EcdoBS6rgqZE2mTwNqA/VdUd6T36XE Ox2EYx7BCGSAFcWHPb36W+XSWche31kXp8oV3McwRVsjRR/+ucOi1HZtiIy9vVJC2OTk Z7LZvnDt+8k+Hbl/sfi8nuVUczCFO1NeW2q+O2Sr3lPDNkKtefKDlEIHowuV0riAt9Ex Z9sw== X-Gm-Message-State: ANoB5pm34vHOQu91Fcz6EBhu1kLzx09Na/491V4pz2bvZw7v9xrYmFhH Hlhx3UKNooBmcTf1oEtcbctUcQ== X-Received: by 2002:a1c:f606:0:b0:3b4:bf6d:f9ba with SMTP id w6-20020a1cf606000000b003b4bf6df9bamr15458029wmc.133.1669110974634; Tue, 22 Nov 2022 01:56:14 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k1-20020a5d6281000000b0022ae0965a8asm13542984wru.24.2022.11.22.01.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 522A01FFC0; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 08/11] tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg Date: Tue, 22 Nov 2022 09:56:07 +0000 Message-Id: <20221122095610.3343175-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell On my machine, a debug build of QEMU takes about 260 seconds to complete this test, so with the current timeout value of 180 seconds it always times out. Double the timeout value to 360 so the test definitely has enough time to complete. Signed-off-by: Peter Maydell Signed-off-by: Alex Bennée Message-Id: <20221110142901.3832318-1-peter.maydell@linaro.org> Message-Id: <20221117172532.538149-9-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 32adae6ff6..8c8a63ec2e 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -116,7 +116,7 @@ class BootLinuxPPC64(LinuxTest): :avocado: tags=arch:ppc64 """ - timeout = 180 + timeout = 360 def test_pseries_tcg(self): """ From patchwork Tue Nov 22 09:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627504 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344763pvb; Tue, 22 Nov 2022 01:57:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf7FmHIWpGm7eABCnqU8rgWIvyctjz+T5oJ68cbqzNHFPbFgtt6YcEHrl5llNvPG68+DKbmF X-Received: by 2002:a05:6214:5f0a:b0:4c6:a267:699f with SMTP id lx10-20020a0562145f0a00b004c6a267699fmr2899265qvb.28.1669111070275; Tue, 22 Nov 2022 01:57:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111070; cv=none; d=google.com; s=arc-20160816; b=vQvzTg7pVCXiFkpfLY8tT0BfE2fs+3qxX2z2YwjMZhe+1Ui8L4Z7ltKagDBean1sZW OXj7kCjLqPcwlHPxMKXZ13Zl6aYismCnff2/hj6f5Wo4/afcFsK6xDPZWuXPUR/Ro1QY 7rT/tDov5yJtdX4kp69pNe2F7wFGIaoQWCFVOcm2l+l/cC8DCtVWJVcS+2kJdL6cfCp2 c0GBv2HRY83yCIjISLtTNUMsLe5hMsKF5Mf2pSGZCKhwtjQwrkhQKpjdStgClP+3/Ewq qkS+MRdg36yeHarfHvjZoWf3A5wWoGsddLrI4lPHKF/ZC6FqLQ6KFrs60lfv9fXJDxTw hM0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QZkzgfr3NgI9GQ0WZ4StWbyyScfmFuJGZu1Sf1O5bKM=; b=DKDdVJO6X202pyQ33Ki/y8W8clnYYhonowQKfHKcToDdbu90aA9oocXxE61OPD8LA0 sUMVDI+RuP2HvwTfZ5XgrUs/q/mVbUvOFBcbJ1KHwAlYKXNmMU9O3WM4ceK8xogD6Yhd 7Ucb04ygMcUh1enmkAPSLxeTRfD971tlq3GeES8AXOZmb8ZcDphVCNv3Gew/muRBvihN 5mu4PclAt2veTh3l4PAowvHUprzHo316UYZds1JLRMWlICxwtjQq2PBc5wy3uc08avpS oXnpBgJK7XODL4iHuh3crGtlrASMyJP68yq/InYq2+Xx65rr2Prji5s8+WKff7y1DwM7 kePA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yx4dqRmK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g5-20020ac87745000000b003a546ef1f65si7339114qtu.354.2022.11.22.01.57.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yx4dqRmK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0s-0002Un-UO; Tue, 22 Nov 2022 04:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0q-0002Ox-CH for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:20 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0o-0003uA-Db for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:20 -0500 Received: by mail-wr1-x42c.google.com with SMTP id b12so10074838wrn.2 for ; Tue, 22 Nov 2022 01:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QZkzgfr3NgI9GQ0WZ4StWbyyScfmFuJGZu1Sf1O5bKM=; b=Yx4dqRmKNjPgCjyqbfSAAnrpjQaBTEKQanNn56+8WRJXZCzZNo1r7Ka3MDkgndHOht Je/plU6Rn1L1vGt+NE7LxWf7HlSbCQYi5+EanjFB12I7LOp6eWDJZFt3GYx//F92B1Om RieQFj52Lm5Vq8Oxkzu9TLS6Guvw4x5/ABA/1zhw9kb+lCA0+x4RmXY0PEq2WR/MwXmq sDjMiDvRs9h8d1u6jDfohe9Ob+q+D3i++zbhggNJXC3y557ZfYbnseH2OYo3mRcAOUv9 sRMwR0XgOiL6RxkhXk56DnmfQo1hhJQHuNzKjxm0QIqnA2MmKuzwZptKUUEsqeAztqqR 7vKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QZkzgfr3NgI9GQ0WZ4StWbyyScfmFuJGZu1Sf1O5bKM=; b=m2ONg2FUQ4oOP51v2rCv2V+3r9f9uvxG1+qfoa/sFnf9rgmjOZ3f0Gvz0RVr7RtfwZ vpshRrEfI1V314hGIK5BsvEdQ4RLnOq/L2BnI/GqUfLKDUW7smpb8rPUTaQ+iiKyETiU 8e7qmh/dDaLyzMTrhn+byb8M5dbIjEGCOCdRxLVZXdO5hzQEp94Ngzrq4dBKDS28Wy9M A2bZjIzU98E2+nKQyTM+K5aZ8EqMbfNA+qQoI6KgYXbhlq+OE2ESAi22CD7N1Z5jk4yp H+1PXJQBaLBVfL8Yef29TARmcbciQzCeUbwpR3Ofh2n1dmXVot051LvJ5iVQzmlYXDP9 mZuQ== X-Gm-Message-State: ANoB5pnzkA1drNl58o42kAU8CxrFy4hjvdbDCpLHAb2ECxXyuj+IJm0R PMuRPgpGOPS62KlCjqQhnkTHBw== X-Received: by 2002:adf:ea82:0:b0:241:e749:f75c with SMTP id s2-20020adfea82000000b00241e749f75cmr286887wrm.609.1669110976959; Tue, 22 Nov 2022 01:56:16 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m29-20020a05600c3b1d00b003c6b7f5567csm2259001wms.0.2022.11.22.01.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6C8251FFC1; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Peter Maydell , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:Virt) Subject: [PULL v2 09/11] tests/avocado: introduce alpine virt test for CI Date: Tue, 22 Nov 2022 09:56:08 +0000 Message-Id: <20221122095610.3343175-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The boot_linux tests download and run a full cloud image boot and start a full distro. While the ability to test the full boot chain is worthwhile it is perhaps a little too heavy weight and causes issues in CI. Fix this by introducing a new alpine linux ISO boot in machine_aarch64_virt. This boots a fully loaded -cpu max with all the bells and whistles in 31s on my machine. A full debug build takes around 180s on my machine so we set a more generous timeout to cover that. We don't add a test for lesser GIC versions although there is some coverage for that already in the boot_xen.py tests. If we want to introduce more comprehensive testing we can do it with a custom kernel and initrd rather than a full distro boot. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-10-alex.bennee@linaro.org> diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py index 21848cba70..c2b2ba2cf8 100644 --- a/tests/avocado/machine_aarch64_virt.py +++ b/tests/avocado/machine_aarch64_virt.py @@ -1,4 +1,5 @@ -# Functional test that boots a Linux kernel and checks the console +# Functional test that boots a various Linux systems and checks the +# console output. # # Copyright (c) 2022 Linaro Ltd. # @@ -8,19 +9,62 @@ # SPDX-License-Identifier: GPL-2.0-or-later import time +import os from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command +from avocado_qemu import BUILD_DIR class Aarch64VirtMachine(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + timeout = 360 def wait_for_console_pattern(self, success_message, vm=None): wait_for_console_pattern(self, success_message, failure_message='Kernel panic - not syncing', vm=vm) + # This tests the whole boot chain from EFI to Userspace + # We only boot a whole OS for the current top level CPU and GIC + # Other test profiles should use more minimal boots + def test_alpine_virt_tcg_gic_max(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=machine:virt + :avocado: tags=accel:tcg + """ + iso_url = ('https://dl-cdn.alpinelinux.org/' + 'alpine/v3.16/releases/aarch64/' + 'alpine-virt-3.16.3-aarch64.iso') + + # Alpine use sha256 so I recalculated this myself + iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0' + iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'console=ttyAMA0') + self.require_accelerator("tcg") + + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max,pauth-impdef=on") + self.vm.add_args("-machine", + "virt,acpi=on," + "virtualization=on," + "mte=on," + "gic-version=max,iommu=smmuv3") + self.vm.add_args("-smp", "2", "-m", "1024") + self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios', + 'edk2-aarch64-code.fd')) + self.vm.add_args("-drive", f"file={iso_path},format=raw") + self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') + self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') + + self.vm.launch() + self.wait_for_console_pattern('Welcome to Alpine Linux 3.16') + + def test_aarch64_virt(self): """ :avocado: tags=arch:aarch64 From patchwork Tue Nov 22 09:56:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627503 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344697pvb; Tue, 22 Nov 2022 01:57:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Jk3nNYV5wH8uiUOcGQiIGupaCRCWSdh7+15oQTDYeFI9c6oapuUlLJFxFSQjw81vtNinJ X-Received: by 2002:ac8:7cb1:0:b0:3a5:60db:4d5a with SMTP id z17-20020ac87cb1000000b003a560db4d5amr9422211qtv.467.1669111060221; Tue, 22 Nov 2022 01:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111060; cv=none; d=google.com; s=arc-20160816; b=DcbCI3zhwmeeQkrCKvWZ242SqtTkbq1Y5MnA38NUtZKBuvtBIS/omNEvFfz9h4Oabw JTMyMVgS6MZTgWQX2BsvE44ExIXMadFjjaUxdnbfaFwxUXor99LlaNBnKSoeEByvMndP iuu6PPYPvnJEVyISJ3xC4A2KttH0ZTs0o/14jobmb++tTgoJdWGePawSo3okrjah98eS eM8HPJ6L8ePWD1F6UJlI8R7xS6+tlS8XdZMz0AKOcbQEns1jMfKfXtgQSbQ6aF1hCy1h Y1FKjHhwL8e7KkTjIQDwpHrMZhoEl/YG3oKhLJVQS0QwEnIGbkpDQdLOyk6yCIDsJP/j dGQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6pnofIbm8hUyt3M6Fzw3WVtVx5EbjbRzRyOO8l9wWXg=; b=xB2rq/Nty4F1CXgTa+Sh+f8AQ4Ib/2eTO+KKzpzR6TrcTASqjR42qmcjdo99QSFmOj bigP4qgnAlk9LMFwVuTKU0OFym3Gk5Qqy5ZQgb9Io2oLdICrdPXgEk2svDEZEytz9fDH PkevafYCEDMnXM0r2iqWuC9etg5o4MA7M/3LCeYlBHeMx69U1vd0lnxiKBG6IN8YXN5d +7hr9FBNFwT+2xce9NYt9qMXBd57g0JBGBM3fTn8Xv/VBKduiccAPQHMPo31JrCpUXyI K1SOdAYw3bRPkJbYVvA+55tI3VjxpRaAVgmeGEKq4Fu3h0bPo2nq92GGzjBK4K0NPGRY 2cKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cH6bKdCR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ez15-20020a05622a4c8f00b0039cdd679585si7919722qtb.40.2022.11.22.01.57.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:40 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cH6bKdCR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0s-0002UM-N7; Tue, 22 Nov 2022 04:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002Mf-KL for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0003sQ-UR for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: by mail-wr1-x433.google.com with SMTP id i12so20010224wrb.0 for ; Tue, 22 Nov 2022 01:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6pnofIbm8hUyt3M6Fzw3WVtVx5EbjbRzRyOO8l9wWXg=; b=cH6bKdCRV6qZdtzsdLGI5FaJh8VxlvAdTV/bZpZeONa7yi5Kg4qck65e7aWuSGnk3X MBXjxMtZ+gur2klSHavMIqKCGAxkMvL/OYuHOlx74ADsIBPXUMvU60B0HHIGruIRsi8U aevb5jqVPLBAZItHZRJobrwx1ifXVBCk5j9I1E5+1KOVywDOmBLh+lsj0wYFs0lwnL9W CPib3DRJ2oSQBdpVzcwP0Q9JieDTNZILes/3StfPr9y0NK4g+wZy8FMiiSgOXBP4jPro i2ciHF48EgZ0SYwTBr/vCKcJKkgxNpmOjOYeiUT+KUOv2RmDdC48l4QHGg1sChOU3Vh1 u8Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6pnofIbm8hUyt3M6Fzw3WVtVx5EbjbRzRyOO8l9wWXg=; b=nZEVrFrp3R3vqSUsWZnsNY5V7U3LIyHKJa+kLdIkntZ+nqle0W1uSL2ZdfVzhOXzu+ F9wr/GRiQfTugToaIjd03qG5JkUrCOGSlCaOO3PCbdkKpG4IsEwWmwo2PL3kO3CwTRm7 H1gOayVY7akvccJlWeqsoj23pAr6gtxtQW6qIsznt8FdsrWn0ya9NZXI47Q9iR/KuuKT SzwvOLmVkD5tGKqH83gp48tvDWpx7ZVAJDhvccoKeyANEa44yZqd6XH9/XTGPpX3pH6i asgWDbApx7VKsbdN+K6JBpTR/tXpD6ZeDYesTGWkE5HrEATKYgjcbffxWY2fFQtCqN4+ br+Q== X-Gm-Message-State: ANoB5pkLy7YGcPb7FNd0adL/CtQxZLnD+c3mKWn7DPpzF3zR/oeKxxdw wScCJU8XpPEIJKHD7N4M9U0xeg== X-Received: by 2002:adf:e784:0:b0:241:784b:666b with SMTP id n4-20020adfe784000000b00241784b666bmr13587053wrm.483.1669110976158; Tue, 22 Nov 2022 01:56:16 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z11-20020a05600c0a0b00b003c6f1732f65sm23844885wmp.38.2022.11.22.01.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 833F21FFB7; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 10/11] tests/avocado: skip aarch64 cloud TCG tests in CI Date: Tue, 22 Nov 2022 09:56:09 +0000 Message-Id: <20221122095610.3343175-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We now have a much lighter weight test in machine_aarch64_virt which tests the full boot chain in less time. Rename the tests while we are at it to make it clear it is a Fedora cloud image. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-11-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 8c8a63ec2e..b3e58fa309 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -58,6 +58,9 @@ def test_pc_q35_kvm(self): self.launch_and_wait(set_up_ssh_connection=False) +# For Aarch64 we only boot KVM tests in CI as the TCG tests are very +# heavyweight. There are lighter weight distros which we use in the +# machine_aarch64_virt.py tests. class BootLinuxAarch64(LinuxTest): """ :avocado: tags=arch:aarch64 @@ -73,7 +76,8 @@ def add_common_args(self): self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') - def test_virt_tcg_gicv2(self): + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') + def test_fedora_cloud_tcg_gicv2(self): """ :avocado: tags=accel:tcg :avocado: tags=cpu:max @@ -86,7 +90,8 @@ def test_virt_tcg_gicv2(self): self.add_common_args() self.launch_and_wait(set_up_ssh_connection=False) - def test_virt_tcg_gicv3(self): + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') + def test_fedora_cloud_tcg_gicv3(self): """ :avocado: tags=accel:tcg :avocado: tags=cpu:max From patchwork Tue Nov 22 09:56:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627505 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344804pvb; Tue, 22 Nov 2022 01:57:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf5DoYVk972V4IycRkD0zYbDtgWlIiItwieaG5wY6BdyyHYkOhx33FdIHKrOMW4tUdD8xrVo X-Received: by 2002:a05:622a:1184:b0:3a5:6f39:4bd7 with SMTP id m4-20020a05622a118400b003a56f394bd7mr2573491qtk.226.1669111076089; Tue, 22 Nov 2022 01:57:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111076; cv=none; d=google.com; s=arc-20160816; b=R2ZESC4LPqC8ld2NE3oeeHLYjjITGuUnMOh69jfxYAOKuhBoqAZNAOoStMwMrf7ulU 3BCRFea+BrK6D8R+EiswLlOnjL2P7dt0t4ew7gl+EzUOShEeYLhlk/xuvJJTyUVzU4Qq hmoYxDpOBSsvq4+1B/PtNITlWmcb05DjU1Gn8MJPV2qVxU6Dt/YiYoQd8+b1xpx56xq2 yKo0Hmd4CM4JdFxQeTgtWsSxys0ygjKN06wBNO2txmvfehd5JWuPtF68O+BWgahzC3Yb 8QWZaS1fXiX1q+KIhs8Xye+qhq1S1joAaMFN+FHnYvSbtbxndcJwi+d8jBB4ihkCZFrf fK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=poryMUWRLDds72xI/Jm9ugboCEqA18vwJ5mKpSpT8uc=; b=Itvm7CeiyNCLE6uVc8TwFcS35gGQFynnR9Rw62z91/y7eHSiKadFrsugOtEWazZn8Y a/xrs7EMQYZ4juuBG38vXRjX3ay07LfpYqA7d248W+Jh26LFdfjj4OqCa/NAUn05Q1Ps UbQeyTl1a7guCAQr6JVu+IKVIkjWTGUSIq9slZjihcWGmK2NtPe7P+yhI6keKqaE9pVz 1OYC6aa8PnIYepAqPwAmvo/wccHo//kQDMzDLMaDeDlhIPOQTvJY3M94s2oDC/ML3d4z 6eFvpoPAdwjmtOV0EP4S4eIfqjquHTrDydhypGJtGv6eFUWl1i6eVPtjeq1d0GOK3dlR 5ECg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i3osRi9Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l13-20020a37f90d000000b006ee8da2bb15si7528889qkj.566.2022.11.22.01.57.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i3osRi9Q; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0u-0002Yg-Bj; Tue, 22 Nov 2022 04:56:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0p-0002NW-TR for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0o-0003sd-8G for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:19 -0500 Received: by mail-wm1-x32a.google.com with SMTP id o30so10330553wms.2 for ; Tue, 22 Nov 2022 01:56:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=poryMUWRLDds72xI/Jm9ugboCEqA18vwJ5mKpSpT8uc=; b=i3osRi9QZq5roy5icUm/OH3mPmCaumFYI2iZU3debootxdbAtG3Pmq8gEpQKIlA9IS bKJwlkBPUro8z3+3ITdbZSr58t//FkL347BupEW/oCSNwhrEzHL5UDVADjHRba9xE2vI PD++u/PVDJZyVf/jw9eszlRbisDrXaw+SKp36flFa2rrbV8KWO7yYTRBKfZLiq+fHXPq /V9/WL/sb+JQpdg96HdNDMT07sMz1QzKfjKYcwj78binM3+892fyyjlkA1WnRNy/yt4h PWVpO03OY7H0rMtUxMfYC1n7lgATezC91OwgHNZZdLvsuth4m7ChoL7QeuZbmN1KrCqP A/fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=poryMUWRLDds72xI/Jm9ugboCEqA18vwJ5mKpSpT8uc=; b=sER6LChsRpo3WV8ahrfHujfIm/KiJn8G2Jw+03E+sqa+XcsxOCBESPvhUx0IJ+WsVK 0OwCLW4nUTp5lZ+tBT1vwIIvWHUxRGZqCQEI/vUhkOKHPWx8xjEM9E0asdQZiu00VhbH Qmz2CAifymXOdGRsGc72EpQgp5V9mM1TshMEA6SJNoMn7yvRp1WeqCQdWUoSiHd8pTRZ bNORzYn0+3s7JJsx6CCPtQlmu9okzKK+AL1LjLMIESzLmqA8F/s3kJ0CFyuMOlhLosBc KFGaauDEdvlZF6qxlLm8nkYPDG3OaBqn265vyLUeEZSUTvuimiqPPwtp0+HsOxcCuwf5 C9uQ== X-Gm-Message-State: ANoB5plVTtEENa4Xi+16bj5+ETewrk2+e/UJRGWUl4u7Lzs7ylEgnNX+ ifcn+pLKEfrDyIxKyvtwbjX97w== X-Received: by 2002:a05:600c:92a:b0:3cf:69d4:72ee with SMTP id m42-20020a05600c092a00b003cf69d472eemr2005560wmp.122.1669110976587; Tue, 22 Nov 2022 01:56:16 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e2-20020adfdbc2000000b00241b95cae91sm13507885wrj.58.2022.11.22.01.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98ADE1FFC2; Tue, 22 Nov 2022 09:56:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 11/11] gitlab: integrate coverage report Date: Tue, 22 Nov 2022 09:56:10 +0000 Message-Id: <20221122095610.3343175-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This should hopefully give is nice coverage information about what our tests (or at least the subset we are running) have hit. Ideally we would want a way to trigger coverage on tests likely to be affected by the current commit. Signed-off-by: Alex Bennée Acked-by: Stefan Hajnoczi Message-Id: <20221117172532.538149-12-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 7173749c52..d21b4a1fd4 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -494,7 +494,17 @@ check-gprof-gcov: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check after_script: - - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh + - cd build + - gcovr --xml-pretty --exclude-unreachable-branches --print-summary + -o coverage.xml --root ${CI_PROJECT_DIR} . *.p + coverage: /^\s*lines:\s*\d+.\d+\%/ + artifacts: + name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA} + expire_in: 2 days + reports: + coverage_report: + coverage_format: cobertura + path: build/coverage.xml build-oss-fuzz: extends: .native_build_job_template