From patchwork Thu Nov 17 17:25:20 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: 625499 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1007689pvb; Thu, 17 Nov 2022 09:29:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf4P+SknH8Nrbsc1vDwkOzzaxa8qyPbuY0N36lXNnGHX5qS5UlRorjUqPggYvUGQXYF7qXCR X-Received: by 2002:ae9:c116:0:b0:6fa:da78:6945 with SMTP id z22-20020ae9c116000000b006fada786945mr2489941qki.367.1668706189675; Thu, 17 Nov 2022 09:29:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706189; cv=none; d=google.com; s=arc-20160816; b=sBWEfFlVs7Ulh/Pbn3ryhQpZaVYhlCDULYXG1JB2nlxseFVEoo4OnphM85jyhYvnPC 6guGTY8IL+qAOUFariMA/IOlfirmCe3fiYEBmxYWZYBSugy1fxV6IEmFlPFzdM1o515G HpO2m2yLqQIZVJwJwftjeydsVd8NbOXL+KgzJLz390ahvymdr+0k89D0EMxn17hNxLqI +9RbwApyray1d8MhD3AWNoOQmE055lN+urv4pls/4IRcorRrUmfBtjHtOWN/eZZuh5qw a8WXiKD9EovV270pLqhhaeNOg9ebhUU9aYvLm3neU2ddGMto24XvwCcZJBJ8EjP6j4ut +D0g== 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=0janOlTSK9f2YU19w2PIDrRXkTKP3g2+mNpYWnPVHh4=; b=0YuPJKGBiXyv2AQApB2LvOvSE+Er2PYt9g58l15cb+bCNrMGtFUo4gpS9Te1JGWj4e d+uMkRkhGNQ20AXo2Ka4Ub66Vn01iYaW8fMgMQLx2q6NjOWkbmhELeeIyh5oEK3DRx4R 03jOGaR2tx0R+BfJHNDkCZEyqvjjK9d3K9lGwxnwDEUPHflKxNw29aDpOQxmUwtbZ00G BG/pglTJagM/02F5+oI8yJcurBufRBs3lecjOgZXWF+Nvq6r2gMlUd5iDLkVR8OBiNPa klma6F2G3fhgUJba3sZUVKKm+ScNI3ZopSIYinDr0XsAU5cqXcvjrQnMOnYIrim8VE8U hCmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Xj9r//p8"; 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 bi19-20020a05620a319300b006e9872fce2bsi743070qkb.173.2022.11.17.09.29.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:29: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="Xj9r//p8"; 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 1ovieE-0006Ph-CQ; Thu, 17 Nov 2022 12:25:58 -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 1ovidu-0006HR-Me for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:40 -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 1ovidr-0006Dc-Vd for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:38 -0500 Received: by mail-wm1-x32a.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso5624592wme.5 for ; Thu, 17 Nov 2022 09:25:35 -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=0janOlTSK9f2YU19w2PIDrRXkTKP3g2+mNpYWnPVHh4=; b=Xj9r//p85ViHct1+SZq+cQ5mxkpNPgF/rQ8S4yad3+Arwpg1jwZTnUQEephsL6Ix01 9Ad02SwAc8A2Tijgqmo3QEs6EOslKvMGPc3PkqRjJ2yGwuLmtK144p5X63T4xzBANtSG dbfM7WPqf91PqtnQrTMVFU/7/jVJeKOOStX04Fjn2SM4fpLReFNpWqmrG8kWxRchc62S jVMdQK+JgX8MZf96T7Xcu7qrFFHiGpmbFGPDk7ZMiuPN1wdYDAHAkItXAwn9W8QshJU7 3Dxch5fQmO4+oFXYSBoyoRceGcbBGmQXFHZogPNvml9Tnhoih3sNZ6AiIiZmrjFRgPsb NQaQ== 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=0janOlTSK9f2YU19w2PIDrRXkTKP3g2+mNpYWnPVHh4=; b=f+67+1nLhQD/MhSUiHzZV7wknR4rvOl1IXCBq7mXvYodvD7kEGMWWNMYlnPhwKxjPD maIRwkjrZvqIFDPEdHR0yqIcisuDoKTn2z3ckNh43LuG8+1xpYosAh2JYv7kRls70qpN FgpDI9R24XRTAXr+6YUqGbYADCEvR45ZgXQNaymUfHRd/UmrFWIe/V5xzk0w4yW48lXa 9ZmVTS4USjK+eauNlG1gCf7FXtfX2eEC/z6hjWsmPHL8rTxv10yX5WG2keYDlkHHRXoG hPrG+O2c6zbc1j230lW944NxvWrST6qoZxyoONpFc/WCsISai78arz8KZVhZoMuuTshn a4iQ== X-Gm-Message-State: ANoB5pma9dNUvyadbfH1OJ4vkXKGgBhedpccFKNlhAl8X9yNTCl9rJVd aehGeinp5TCbkvqS8U3LITsppA== X-Received: by 2002:a05:600c:15d6:b0:3cf:54a5:b7ee with SMTP id v22-20020a05600c15d600b003cf54a5b7eemr5949174wmf.106.1668705934111; Thu, 17 Nov 2022 09:25:34 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q5-20020a5d61c5000000b002362f6fcaf5sm1543712wrv.48.2022.11.17.09.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E7ED71FFB8; Thu, 17 Nov 2022 17:25:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Stefan Weil , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth Subject: [PATCH v3 01/13] Run docker probe only if docker or podman are available Date: Thu, 17 Nov 2022 17:25:20 +0000 Message-Id: <20221117172532.538149-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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: <20221111145529.4020801-2-alex.bennee@linaro.org> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Thu Nov 17 17:25:21 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: 625489 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1005991pvb; Thu, 17 Nov 2022 09:26:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4+skd5tBiV6w5sN+j6pa0RphdTggWxq8IIrx34vAdTAkB1q1KSlpSs9XJHhzrjxxVmEmbd X-Received: by 2002:a05:622a:590e:b0:3a4:fcde:733d with SMTP id ga14-20020a05622a590e00b003a4fcde733dmr3230149qtb.269.1668705992879; Thu, 17 Nov 2022 09:26:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668705992; cv=none; d=google.com; s=arc-20160816; b=M0FbgJl9/FjBTSu/5mHlZKgGR8f+LGDMOven0izlkgPWdbdh00Gfy4o0dSV54wJJIl apDcW4nYvlYUhJSeTkGTM04+rKelF8DVhpA/NYlKZ1VnZxPqe7k2235WRbyJzToFGlEe MzTZP5vgWWatu0+qTuOXrJiDdoiUuknnUB/HvVcPe8iJY8xIqXdPKsL9Imj654nayoE3 DA0ybgtc5ti6S24Udnxqqa1XOOHHyFlfeIj1ZGtUtzPpd6KdRlf1sdKIuJvoE5Ly9yn4 YB+laredLYekNaegQaIgCQ+KTYpCthWFeCnknBl4wQSVAlu7ia4ErZOq+IIp16Cji3mO Phug== 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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=Qyey5gbZaz288IlxcHI5D8r8vcWzveN4fvmLEwpVCeXVnKZ4jI0MdLBTuqkZCYKgNh H7U33TF/ZMuDSDBrCx7Diat6dsNqH0IVwWDMZLgNPGd/LJhJTCf4VRAatRhFcmuEjyX3 d6dO+ZZSwmKRqxjDvxsr5s4XnR49pMmfoma+iBu6cVftzB+XBAXztlWi5yg+mHEJSMi3 o4dfcthD7VicgD63PtKh+2ybXjjl8n5TsKiHq8m/026AtS0ZZuyPiMB45xtUcJeQ/Q5b odJqsZwOUSEjA3ZKCpDkySatkUzxQMbovPsj/r8241RbdDGqB9V7f+4uwlzT1kZcF2ZJ 6JcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DegIAvdQ; 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 i15-20020a05620a248f00b006fb1450b194si743920qkn.309.2022.11.17.09.26.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:26:32 -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=DegIAvdQ; 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 1ovieC-0006Nt-Ce; Thu, 17 Nov 2022 12:25:56 -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 1ovidu-0006HO-3l for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:38 -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 1ovidr-0006DU-CZ for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:37 -0500 Received: by mail-wr1-x429.google.com with SMTP id bs21so4977417wrb.4 for ; Thu, 17 Nov 2022 09:25:34 -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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=DegIAvdQiHWEZQiTfemoqQ0Gpyp1faaDm5g7reLzxrMBiKw0AoB277uXcEqjInqJnt L+En6UpTlL+kbZbkyI522UBzi+GXmzcQ4DpD3st3iyzse2JyLd02xIBKGDUsrBOHm/J/ I/KMdNthDw4JiCVaQ1JrnJ27XI7gMzlaTmFxnSeMaecO2tzJsimmAg0NVgK9aHYx1XGJ 89IvG+8rOg5OcOat1TbyIiW/W5Nmu4j4C6ax953gHLo8os8mnEX42vShbJ5cZqUBwzHk 9vnIeaMOyQ6BfD5RwFOL5Z6czCcATF+KS2f+dM9SeALD/RZ34AieA2n9tDlB5ZqPM8y7 fivA== 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=TUmxKKupzWW40b+PE4O2JXEtmFVLtKng4SrYWCxYHqo=; b=BPCS9upQkf/CVhOK8WZfLAZ7XTVdM26rQ2/jNYBQeK1vSTPuDC+r96YQ6Yg1ysMaZa eoyqR3NCpER8JhFyIzr5lzqyZTusF267E/0skv1men+euHddyi6J4VOrdR4bZWAZNl5S p+qCw6m9RcknfmZTihH+LLqCmmD6KkRXUHJRIF8pEDOD9lp4g6TZpYgM7jZ3d8ZqwikP PLeGpLM81h90Dxnq9QWv7/MROgabsHhV6HFEPFLMGDgsFaFadQn0IL07Bmg6ioibdvfe 3N0KhI251xB1+WfIHQQaKUipJcEm4PRJJBssnxKBEetijkz1J8qx05LHh7fZsWbr/4by 2zsA== X-Gm-Message-State: ANoB5pldWtBP9PlzQjVpCe+UdkyOkzxwjldqWI5a9diVGqnNAX7K+fSA nwbWXgAyprOV1DyMSs1kJjz2JA== X-Received: by 2002:a5d:4c4d:0:b0:235:25b7:5084 with SMTP id n13-20020a5d4c4d000000b0023525b75084mr2119232wrt.135.1668705933801; Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l24-20020a05600c1d1800b003cf878c4468sm7265846wms.5.2022.11.17.09.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A7BE1FFBA; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 02/13] tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests Date: Thu, 17 Nov 2022 17:25:21 +0000 Message-Id: <20221117172532.538149-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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: <20221111145529.4020801-4-alex.bennee@linaro.org> --- tests/avocado/machine_aspeed.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 Thu Nov 17 17:25:22 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: 625498 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1007277pvb; Thu, 17 Nov 2022 09:29:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf6u8noydwtZuM8dl6XYJ1VpJi3z8i30O2L4qE6LSm8bfEipGX1PNiez/e9LU1f/AbgqTjjI X-Received: by 2002:ac8:5e95:0:b0:3a5:50c6:bdc6 with SMTP id r21-20020ac85e95000000b003a550c6bdc6mr3136869qtx.370.1668706142669; Thu, 17 Nov 2022 09:29:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706142; cv=none; d=google.com; s=arc-20160816; b=oAS0GYV73SXMJWOKB2I6YUed8x5rkZbEgr0JAyKOfROsCDja9fe8wi+ioDjK0jQhEW VtltEOKfpQyheHMu7Cnl+0rxqSOoKNiiE1q5l2j5p8ldxRsrvFmpp6E9iutlrVlySqiL lNht4RGzusM91ARigpSTNWkOhEK8xqd7MrUqrRz4PCkXW5m5+B7HOW+63749fy4lRQz8 Tv/U2SNhGhx/J7jys8uDbOrQHKr2DcH1GCefW0ixynIvR0I8DS+Q/PFsID5EAvpM82Kz wJ4CeYTYNxqFlt+clUn3LVkV2z0/+GOi1f5tfjXE8qeshg9PvCuUQ7/T1Uo/m9k/SElh /JNQ== 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=hCWUi2imTcF7NdRj0zJ1YkRrLEYeaUzgFlh+Cacz5b8=; b=D1JHqoBG281888rSiV7vdHe2y46hcaH3vzrvvBJ49VPfZBpSOf5MK8/o8DVdQ2s1dy UxKUNHGiCJxJLq7zuqDMJkIj4ESxNGXqwK5OshjhWmjB659NmMfW4OvKupYzMuTmRugd iCaTIeU5SzMYUhPW3ENpQcq1Nk87Aw9yK7JGc0GrJahF4pMJcCetwbeX0S49N0LFfoq9 ZmSXd3M0BaJG7+V3MOAJDQwa542Er6UPiMvaRkb+ownhkQ2JQ+eD6qBH3diUbhKqcCuU Xz0Du9gxSMeYugBPInku806p0BJ4JP1bMQ4ZGF7mQIwdgMhA0Mhi9Ccg68uYwPnoQLgO 7n4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WVB7VvZy; 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 fg12-20020a05622a580c00b003a52662d6dasi742487qtb.304.2022.11.17.09.29.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:29:02 -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=WVB7VvZy; 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 1ovieE-0006Pg-94; Thu, 17 Nov 2022 12:25:58 -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 1ovie5-0006LX-4P for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -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 1ovidt-0006Dp-St for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:48 -0500 Received: by mail-wr1-x42b.google.com with SMTP id a14so5004094wru.5 for ; Thu, 17 Nov 2022 09:25:37 -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=hCWUi2imTcF7NdRj0zJ1YkRrLEYeaUzgFlh+Cacz5b8=; b=WVB7VvZyOVYZY+RFjsC/MI5GSCK343nuKrVag8qRuoikhe1LnQmKF+JvNSvPXXfDdo smIyDbAsWluB1kbgi7jRli1v3884lcx5RFft79v/jHQ4pI2lSs1JeUAZ449lfoUIlpcg RYInTVUKYwuq+ClNxFXy4rbzoQDpScwQrqfaMaxsY0nN4corUuT8I1DBLJzi7M1Neme6 /Y4PgxrSAnzbZ0xZApigaUScuZn4bRnM3Zj/XRHaM/Byb2+njJ88xZfPgi+dClVHwWyG VA92oxK2aHOs3uAAh+OeuxjrwM8JAtXNbYA6/Z7q7cu+dRKvYTbwwFcSWeWcxKmwNfRG TQng== 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=hCWUi2imTcF7NdRj0zJ1YkRrLEYeaUzgFlh+Cacz5b8=; b=avnMSTY2zikQ1/deGP2EtlrQaqMp1S7WaSV8goOrWB1lxcj2cZzo3Zaxv9iMddpj6R UhDvi+Uvsfbwwb/CN727ZNgQ3xv1IJe0Ls54tPWMG5fZA9PkE9txlJzKchluqE9wLHOG eLr7FL3ovx1dMp5LeFpg7X/nDdmv4+9DyrWJXnwW4VsbEV6gtFTAqNFNhghafzKpS1UD Idhrbz0rVDweT94kr0cSmlYKBE9Rwbwgywgm0J3pAKkEvk9DZaxPX8O7HaHm7BKHWPAw 8AriQHgRNokuhCL7PsJn8llrhbpJJn5QMxZfb/jvP5pk6XiNB2vr6ZzNh1/+rMOCVZ85 z5/g== X-Gm-Message-State: ANoB5pkA4VcFFop//UtjEx4zeWQq2NzBH7yIFHukR9x4OOd6740BIQK1 sW1ykKtT8aQYhvyp/xCh5ALoWg== X-Received: by 2002:a05:6000:10c3:b0:241:bee0:c56e with SMTP id b3-20020a05600010c300b00241bee0c56emr304205wrx.534.1668705935297; Thu, 17 Nov 2022 09:25:35 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id 23-20020a05600c229700b003cf75213bb9sm6084440wmf.8.2022.11.17.09.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 231A91FFBB; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 03/13] tests/docker: allow user to override check target Date: Thu, 17 Nov 2022 17:25:22 +0000 Message-Id: <20221117172532.538149-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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: <20221111145529.4020801-5-alex.bennee@linaro.org> --- tests/docker/Makefile.include | 2 ++ tests/docker/common.rc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) 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 Thu Nov 17 17:25:23 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: 625497 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1007197pvb; Thu, 17 Nov 2022 09:28:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf42BEgliCEthDbUKpTy7zp8zqwFtvQUExD0KwoX2ey8Mf3Cex8non7X/c6NlRU5B5iIawe3 X-Received: by 2002:ad4:5188:0:b0:4b9:a782:6eeb with SMTP id b8-20020ad45188000000b004b9a7826eebmr3380944qvp.98.1668706132676; Thu, 17 Nov 2022 09:28:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706132; cv=none; d=google.com; s=arc-20160816; b=A1jj/hdSLolKoRdIFfBdwWkVQc3zsRlZPWHvNLzqBB2eSEJJzdbZI1azPQLOuN6eHK z4m0NqpH4g98uCjhWPirYHHi/51G1Oy3vwMyJOJGglrhMyQp2ssbNUC1htLqcoAhWtP+ yUPjMEsbKBQ+4CW43QByjvkMGYXr+ZFFUcUxw+gYtU5Xg1wwLorihU90LGiQIF0+eUck bJ6Fh5sxgA0rnFZrH+b3GppD+Hud1Rlibpj6J6iCf3KvW2DnzIWlOoJVU2dzxEw8Q/eI ss10JBmjliXTeJDcvXLFGlHf1W/v0+9BDo8NTpANe6kN6mlq6aEGPeu5usEG2BvEXW1q zYWQ== 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=DfPQ6iqjiMv5CIUl9rrkSxsv2TCIqblfNK7K93d8LNw=; b=IdxwuYW1qQR5cTTs4rIjho5ZyVaw+WQUsLbIuw+wt4qXSu7YVrW6I7MPjEtCR95B/N 4rKEEhoMUCLxvR3vNybt3oUZKFoUgTiugfLRtqucijFp1cr4M9SZGIidVtAmplQ1UkEt F0sqzhljlDtub6jvL4OI+ZKJGZWnw/CIQ55XXKIWSeo5fl5EXcwyuoIVGOMVeIvNNezZ AYEy9+OoAJnuzG93jw/eSxSFD5AS3awfbvE1L4lFtrPjxl5c2am74M61h+Fj0qt85afj YzgmKv0JgvALwcsqf2syrk1MvJphKZP72nGJo2vGxE7YIa9FXDdwcYBE0KsNzF+56Wh9 4QAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GiX+HdQ8; 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 bk41-20020a05620a1a2900b006faffa80357si757968qkb.1.2022.11.17.09.28.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:28:52 -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=GiX+HdQ8; 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 1ovieF-0006Qb-6F; Thu, 17 Nov 2022 12:25:59 -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 1ovie2-0006KU-BZ for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:47 -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 1ovidw-0006Dt-Ao for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:42 -0500 Received: by mail-wm1-x334.google.com with SMTP id c65-20020a1c3544000000b003cfffd00fc0so1646811wma.1 for ; Thu, 17 Nov 2022 09:25:39 -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=DfPQ6iqjiMv5CIUl9rrkSxsv2TCIqblfNK7K93d8LNw=; b=GiX+HdQ8ICAOH0wbyGJdP+LITz50WYFdYyecRJchGoeEuyq3rFSOS48SGitfN+1tIT qzNYlm8u7ciKvWM5xXC33HBOkfbNgi5BG52IZzHCmgTIn3CCofSIM8E/2ZLwFp1vAkiZ yjorQOqwwE2NMrHh3YMzxIat0PEfyOwRsyrBzrV6TXJRSmQKcwAXQ4otgT7cofauDDNS Vv6cfviLfK+AHXXdISGOhInnMpu9IfQK6MpH+RukPmkPszNEJC8ZOwnfER/iRjvvjWR1 DL12IWBEAjWz2w09p47+eS0BDpqLnerbWjvLf+wnvXMrEIGP43lqEwZ2U4B68rnlYiZD V8XA== 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=DfPQ6iqjiMv5CIUl9rrkSxsv2TCIqblfNK7K93d8LNw=; b=hHL49sB5d3b9B4P37yR0U6wFfaLfHvyW+H8uDCb61tbcQcLDN6AiqCTDyUagMnyxHP m4S4lUYoO9x5W1N647eP821IfIgcasmZ1hXRT42R3l231rwSxERucW03DVDfK7gqLvUQ a6meXjglgI/jaHguts2Bd4A3uklkW0NdLhJGdReiEG276JKI/Y0mkF5IGuf7G5bLMOsg APUe3skeOcQy4SuZG5FeVdo3Ii8fGU4QwZw3EwM96Ynfpb+/ZQy4wPE4nurQfOb/qLHC 1fsgzuqL3pevyH71dM5bhVb3A6GPMkSzfVyLuVX26/tCPOQd7jHIRSTi0YlTpRcIgyqf qudQ== X-Gm-Message-State: ANoB5pnDKwz75E/zUtyx4Hs8YQ/oHkqItdevlJOkBfK8TBgP/S8DUUY3 pDRDzzRE27pUvtnfJY+zrT/f2w== X-Received: by 2002:a05:600c:1603:b0:3cf:8279:c80c with SMTP id m3-20020a05600c160300b003cf8279c80cmr2427444wmn.169.1668705936154; Thu, 17 Nov 2022 09:25:36 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b14-20020a5d4d8e000000b0022cbf4cda62sm1754578wru.27.2022.11.17.09.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:34 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 410331FFBC; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 04/13] docs/devel: add a maintainers section to development process Date: Thu, 17 Nov 2022 17:25:23 +0000 Message-Id: <20221117172532.538149-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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 Message-Id: <20221111145529.4020801-6-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- docs/devel/code-of-conduct.rst | 2 + docs/devel/index-process.rst | 1 + docs/devel/maintainers.rst | 106 +++++++++++++++++++++++ docs/devel/submitting-a-pull-request.rst | 12 +-- 4 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 docs/devel/maintainers.rst 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..05110909d1 --- /dev/null +++ b/docs/devel/maintainers.rst @@ -0,0 +1,106 @@ +.. _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 + +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 From patchwork Thu Nov 17 17:25:24 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: 625491 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006268pvb; Thu, 17 Nov 2022 09:27:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf46gGBMbxC8oov7OJfI5j8R+UO3F589rXRTX4EuSpcj1BY2ok1y3B5ZBpQZGJ1l5O7bHKCa X-Received: by 2002:ac8:4913:0:b0:3a5:467b:c1ce with SMTP id e19-20020ac84913000000b003a5467bc1cemr3141575qtq.451.1668706025863; Thu, 17 Nov 2022 09:27:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706025; cv=none; d=google.com; s=arc-20160816; b=Q9wkOQkRLinjJ/lqv9i1nogvRZNA89VZwWen/gkY56brrGg9MHMtsKaKJ27reZvSqN pvEvzBDJoHoN5FyJAI/+a3jKcWws329lwas+8ln3fNAxCoZtbm6/MAOai47GTEIxUnuT ZvjbL5Ik6YWyCoK/k4gLUkuMJ9A4ijL39Vu/gOy9j5IDRfTfW8RHdbjgDaXCy/rI0rAz mQu5rkE9fU0lC10a1fCo4ym4jR6xFoUh8i9+k9FGxnrT1C9NPKvdRvi6Sf8QIq4RsNdZ UceRWURIFxXm43P6LsxfvGCeoIAeHzHVs5jHRnAkTwguTvTwJvw1Ki+7syzHxOOwB+JF 3Dwg== 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=tqH/LJ8p6IB5IgfabSHUA1BeTb2LXLwtHowvhXmA9sY=; b=Ez1e2Xnxn4spGtcwLHNxab1U69eZWKEvx+dIsueN4TG7g1YwMqd/QtCtfqSdnJbD+h T5kTsRT37B9Ac9rcSouOmOBwhiJiBKtvw6MzWp0QJd+czlipkfEg+X+1ZBfrQPzXJvO3 h4nPhlA+bTsfUujYuO4VLKQt4FKVGsItYFl5DgqWPWbVaxGGI6ipMjetwlXmeeFic8fk GJDVmOmF7ZGp4hDDS7oWEWJWq1eVTU8dk7kNYFnVsLsxtFKhLJrD3JEWiXoaDM+cYS4p C2iPW/bDRETaI21FXSvIuyU3l2HFsgfCRp/mcRtC6s+TmFXMgdb2uyZOj1WaCQZV4F2c 888Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cAwayni7; 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 fv24-20020a05622a4a1800b003a4fc1a02a9si679314qtb.704.2022.11.17.09.27.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:27:05 -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=cAwayni7; 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 1ovieF-0006Qa-60; Thu, 17 Nov 2022 12:25:59 -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 1ovidw-0006Hm-Ht for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:42 -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 1ovidu-0006E1-RI for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:40 -0500 Received: by mail-wm1-x334.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so5640244wmb.2 for ; Thu, 17 Nov 2022 09:25:38 -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=tqH/LJ8p6IB5IgfabSHUA1BeTb2LXLwtHowvhXmA9sY=; b=cAwayni7W2Reiyq1nU2mig5YDDVjYgCQiYSm3bY7mBuktSZPTvRg4y1AaC7DGioKzK WV8aZz8omzIFVFVnK0fgsJr4781hhvQfLOTWHRXmplqELWslFl53Ii7T+ioLRQtq+qBq HQ+HeYK2TZ8tmuJXKiWX7ENgnYm8jY/2EZwlyrfb6mdpiuk8nJ5Psy/2ankF1G9Bi8hl v77MRw0w/8DWtsTbyV6Knj4LFGIJy9Qfdgby+dGpUR/HrGglEEK91vUklO0wIOz2ufWA lTb8m1SWkBak94a2Bt9z2n3lqzfCG1k/hPIC0ch+qGcwMI7CxIQoIKWhX2hRWFCbZK3u Cw0A== 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=tqH/LJ8p6IB5IgfabSHUA1BeTb2LXLwtHowvhXmA9sY=; b=fEqQz0xgEvT6vpxW5pUpuI5hNdPHuGW/AQJ4wGvDK8bEkizp/w+y0ArHM/ImhVByuz rn7xkhtBgoVNAxxCxQU5UCk0/EthlGpj8RDJItiorf4L9WZTX1yevPT/ZocS9M7id2sK v5rRIu/gjUNyeD1h7vi6OO+Jp7G8hxBoLdFgv8lXUng1UUKXCW/tx4wL+NbSIoW8lf51 7l5gUVM8A0ZvzBY80iuhw8rgpREuxof+xOHKXJdUeRS4HjrAz3sP5ccvMl3BELsIUoHE Cr6CCixh0e+/o9itDj+1QdpUE+9zabwpPZJcOg6+nQx9+U6jCAN5r7/svrGQLJyg4+sp ezpA== X-Gm-Message-State: ANoB5pmY/3ZrVIDr7spNNWCw1mnCuBn06INyV+FgbvJ2jP18CdgYgcuJ ClVgcCntJt9YrayjMmqzIRlvkg== X-Received: by 2002:a1c:1907:0:b0:3cf:91fe:25a2 with SMTP id 7-20020a1c1907000000b003cf91fe25a2mr5930378wmz.69.1668705937184; Thu, 17 Nov 2022 09:25:37 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q5-20020a5d61c5000000b002362f6fcaf5sm1543746wrv.48.2022.11.17.09.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 579C61FFBD; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 05/13] docs/devel: make language a little less code centric Date: Thu, 17 Nov 2022 17:25:24 +0000 Message-Id: <20221117172532.538149-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 We welcome all sorts of patches. Signed-off-by: Alex Bennée Reviewed-by: Stefan Hajnoczi Reviewed-by: Paolo Bonzini Message-Id: <20221111145529.4020801-7-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- docs/devel/submitting-a-patch.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index fec33ce148..9c7c4331f3 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 code review easier and your patch is likely to +be 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 Thu Nov 17 17:25:25 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: 625501 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1007927pvb; Thu, 17 Nov 2022 09:30:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf7II+03+dFyK6u9TgvG4DDHSKSUGN8/nXxm9DBJrSsML034aA3GCQE+wHvB47wK2lIxqJwJ X-Received: by 2002:a37:607:0:b0:6ec:56df:12dd with SMTP id 7-20020a370607000000b006ec56df12ddmr2584322qkg.124.1668706212806; Thu, 17 Nov 2022 09:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706212; cv=none; d=google.com; s=arc-20160816; b=dx0RfdInJ1LypMYxsSqun4d3lM2hv5FAF/u169mcJLD3oIHgEcvhZ7a/bsh5CmRStj sOLnqhfS9xlKbRvYOJmALdFV4Ew/UfmAfwL+p/GUf+IwWRXXzMNPsWPSBPxrO8YTpfjS yxMOo7jlBb6YMNvHxu63CXqDhT0ebR5YpjSSFvvcbYG1cCJpR0jclf9EJqyOfoD87nmp Ui8qPn1sYGI+hpiNyMgXgbf4hxYnOCVZj7i+gazvcBMLk0i2df/b2sHSKcJ6cby4K84m d/msA6/5dRnWQ4wQA8AqAz7/z7MIhH826/wfCoLcRoaT78x8u8txDGl8Anyb910ojzqy Bq7w== 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=7dn3LYPsrO5MbYIeyGRbprma5QBVCnZAiF7XUQjrkFs=; b=L0Gw5pmY1zye4MrZFoTXQCVA5U1UQHn/rwh0zx/3tiduHIYxrsGQzn+xSpFMCHxGob ArU8SpLhYjrmLofVyqPMmReLbBLxjxlsqP2lxfzbyz10rpSg+uin8uIu1Z8fQIF4VUhw jM4dM3ly3xiVTJHHQQYRIaRJdVBcnFj8oTckorPbwf6IFlz8fr3CSH+J+9mayeaBH1Rp CCOVjewXCwr4ep3cfw1W0PHj2hqn83TgEutWeMvzaKukUumV3V0Hi6mfR/XxaPcZFTOv i5UccgGjNrIriiW3YGMqXtEeGlz9APuQ+CKprjxwx1A4Z6MJ+j+US+7UBWIhgBnSM9V0 b4tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pcGoj9oW; 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 x9-20020a05622a000900b003a612161453si792580qtw.164.2022.11.17.09.30.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:30:12 -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=pcGoj9oW; 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 1ovieD-0006PL-De; Thu, 17 Nov 2022 12:25:57 -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 1ovie2-0006KX-Ct for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:47 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovidw-0006ED-BI for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:43 -0500 Received: by mail-wm1-x333.google.com with SMTP id i186-20020a1c3bc3000000b003cfe29a5733so5626173wma.3 for ; Thu, 17 Nov 2022 09:25:39 -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=7dn3LYPsrO5MbYIeyGRbprma5QBVCnZAiF7XUQjrkFs=; b=pcGoj9oWj8iaNBySHG7ylm7ymDRkm8WhOsUWj8R8twOBzx1uO6W5KAGZ+vDJBLn0rK LWMu+lfP/sw45YHGphUw9a0/ex1LAFGI2rNaW0irAd03c54ITLxHbfJzu2DWIlQXOaHq 3pvYUH8PogbzNVkoKiDObhAgSp1cTcOZQyniw1/eLTGmIvFdOsWq+4m7jm6ebJnIELgx Y+xHZmd/e6xENHdxkQYh9WvjJJFWYy24rR0wvEv7RtFJLYCaJSogN2+ibBLjYCVRU5ae t/nAA8bjUOIaT5IYZIoNOLPor5B+sNppIDi7/cAnoWvBMwJGsQQMY5dNyk+7pKPDcq4T fm7A== 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=7dn3LYPsrO5MbYIeyGRbprma5QBVCnZAiF7XUQjrkFs=; b=oTBNT6sYaIQbMU7pqlNWQTBvrflxhu68Yst/j0uAAH4uHwFleANi2CggtFCz2qDqMG hls5yxBSEnIlIsB1+JM2703mmOR6qEQaS0hBELaiSdNPqKHvYz9ZTZFa7ry5yZGK73Ar RapV7RO19ju3rtFthbONBsl5KMs5Qp1Yg+CWMOEiwkfR49Zz976YP8VPbGTSMQlwNYrE OuzpK69NRTWDBxB4NPnqwg362CjzV9Cd6kyfzQJGqmC2NcIcpfwgpgsxEYjjnrM5ubWH vNUPCYhLeKJXdgedR2/7fL//zjiKSMNlofMA7F86Q3tSlSw4tDt64RiFmGlPXi4BKf9w 8VeQ== X-Gm-Message-State: ANoB5pmyAx+RA5QpySTiWDC82FhPOz+yeC4ydDm6MLm201eb3aJUwL4n iwu9D77Z5hQ/bE9oLDDvkGvNTQ== X-Received: by 2002:a05:600c:3ba1:b0:3d0:47c:9ff5 with SMTP id n33-20020a05600c3ba100b003d0047c9ff5mr1290265wms.121.1668705937511; Thu, 17 Nov 2022 09:25:37 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d5-20020adffbc5000000b002417e7f0685sm1798388wrs.9.2022.11.17.09.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 707CB1FFBE; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v3 06/13] docs/devel: simplify the minimal checklist Date: Thu, 17 Nov 2022 17:25:25 +0000 Message-Id: <20221117172532.538149-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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 Message-Id: <20221111145529.4020801-8-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- docs/devel/submitting-a-patch.rst | 75 ++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 9c7c4331f3..1f2bde0625 100644 --- a/docs/devel/submitting-a-patch.rst +++ b/docs/devel/submitting-a-patch.rst @@ -12,25 +12,18 @@ be 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 Thu Nov 17 17:25:26 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: 625496 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006917pvb; Thu, 17 Nov 2022 09:28:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf5V777H7W5OAvEproJTH3ccgVMu/6PXPAunnbch43aEQn9dYYVVH2UVw6kAFTaVGL+NknNF X-Received: by 2002:a37:a893:0:b0:6fa:2721:2e74 with SMTP id r141-20020a37a893000000b006fa27212e74mr2633493qke.467.1668706099985; Thu, 17 Nov 2022 09:28:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706099; cv=none; d=google.com; s=arc-20160816; b=RFzTYAkTq9x/22QjzL1sLSIDoBlRs2ctXJaQN5x7Z62mUYF5WwoQyNfbacZDm2EiqN o8K8T+vZvEuvu2lwZWSD5RzKfpmG3fiAqGZXKixfKJip/+psFKyMU6tpbEEHAmrA0Q5r rhuPg7DfT6Zx4RpoKV765xQahVWUe6o9FkipTnmM8o0nBsnsYrFFFBJIFvFnaE+yxq9v Cjjgw+w3W9iyT42ex1VbfxGf8AAzW8cxmF5alXmGmGc+9bRjqg7RSt1OXz/aHTZw56qL r6GWE1wxsSsmitoJPSDRHl935M/r/4EpEV3DphIX5U1CAYrfjHGNmXFkU92syd1DpkCq Lgpw== 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=a1Pj8Pcso9OCC5jDWRBbmf7M1aOUY8qcP9iBCC6JI9I=; b=gZ+qmI9K8DL+vBMQDqyXZl9SJkLLBTnAyiIl6YeVCHFgyNb/9BsTTjjByxDxcbzNBy gtOMaA+Gp9xhkE4jTdJAhQaE1pEZiQ4XXOI0iQ/WwTeafy5s5TTz18aOCYfFvpVjMcMd C50SoYoZuDHiejamU/0LmzW7aCkYY1Qr0AsOu1XbGIzPIjbDoDG0HSuZX0FakLa+AJOb YCdnuEP/RG3ZFk9F2suDpkQnUIOUqyJD8/b9+sLpWpWk/IC2zvxJQDKsavPBbnq97piw bS7/k9cjTHKHp3ugX46ubU+fbxrWhfEoYA1kiW3L+HGZZ8Zxvbkx6hV1JaS3Tm0FaN4b 2AFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BIXXAqCR; 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 fy14-20020a05622a5a0e00b0039cbf9402cfsi703785qtb.363.2022.11.17.09.28.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:28:19 -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=BIXXAqCR; 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 1ovieE-0006Pe-49; Thu, 17 Nov 2022 12:25:58 -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 1ovie2-0006KW-Bs for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:48 -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 1ovidw-0006EO-GI for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:43 -0500 Received: by mail-wm1-x32c.google.com with SMTP id ja4-20020a05600c556400b003cf6e77f89cso5026175wmb.0 for ; Thu, 17 Nov 2022 09:25:39 -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=a1Pj8Pcso9OCC5jDWRBbmf7M1aOUY8qcP9iBCC6JI9I=; b=BIXXAqCRgV8XLbwgfKsl5T7yi/UBZBzUZ/EyDas9cEVyUzgSjKEf1jq8fnETxjjwlu nzLIQmUfep6Ok2/NvcbQKNd6Q96B4hr98o+H+qJ8e1SDeZsLVm6ERzkcXpIe7lqsIlcW BqRoIwTkxo1EiBfYpmjhE/mMLYV+hxbs+4LbHwp1rr8df6PVnkZvG/C2yBfXq9CYNcwa r5iPl/cGIPQc5feDGMOctp/eCizw5uOykmS8U8JXXHeMfheM1NQdMvQ3xPZRoS1u+oBH lpe4CEn02TVw3ecfy/29ZdcXhoISO8fLzcT61bJ6bNVBt64EtbH0CThjuFaeICJx7WTM yqYw== 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=a1Pj8Pcso9OCC5jDWRBbmf7M1aOUY8qcP9iBCC6JI9I=; b=jcznV/sWfukc+tsT47UPQy+9DfLcptT0Q7so1qNMPxnDm3vgKN3CSlK9m55xZJJZQW CYJvoGF+MeREVucNI0QrhKchwdBqdDYlSsWvbCNdSY0vxMFGH6wB/k+3evcDFdhY+vaN Ca0wwxhvcby5J1EnBJL6zG9JeaLdYZnn7gyEzn7QDGvlMpDP/UPK3u6GzVcxFxyY+T8j w3jYV4gvgW9O1W84O6sIE/+TaJ/RdDVJYnAXI4sKIrzIfz6r1x5z+0APnDzW6Lozhp2o J43gSDz8KSGaEiIopLxz2emdKJ6lpnkxq7s9HG04sDSER5bm7d5QkGyLzZJ2Gn0/2LKk BTRw== X-Gm-Message-State: ANoB5pmoJaSJZ0b/FwGVpjfDEW8EQ5WmssBOunwbUND2b93cXQ7btyqG 2msNox1PuWkTDH/CFTGzAfcRFg== X-Received: by 2002:a05:600c:3b1e:b0:3c6:c182:b125 with SMTP id m30-20020a05600c3b1e00b003c6c182b125mr2433826wms.145.1668705938326; Thu, 17 Nov 2022 09:25:38 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e16-20020adffd10000000b00241b933f8cesm1473859wrr.74.2022.11.17.09.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 857EF1FFBF; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Markus Armbruster Subject: [PATCH v3 07/13] docs/devel: try and improve the language around patch review Date: Thu, 17 Nov 2022 17:25:26 +0000 Message-Id: <20221117172532.538149-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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 Message-Id: <20221111145529.4020801-9-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- docs/devel/submitting-a-patch.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/devel/submitting-a-patch.rst b/docs/devel/submitting-a-patch.rst index 1f2bde0625..80e8693bb6 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 Thu Nov 17 17:25:27 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: 625500 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1007924pvb; Thu, 17 Nov 2022 09:30:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf6psug5rwDM45r4+eWyCfnmC4ZyPRBdpT8r52Lnc+rZb/lImUVMEh7eIApSTEL67Yq4R9/4 X-Received: by 2002:a05:6214:5f04:b0:4bb:8383:c8d7 with SMTP id lx4-20020a0562145f0400b004bb8383c8d7mr3424230qvb.74.1668706212409; Thu, 17 Nov 2022 09:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706212; cv=none; d=google.com; s=arc-20160816; b=OO4GiRc4OdpCF3Ffu2DQ7AirXwICavt0B4kTSYSNbaaO95RVnHJu/iDXguu+HPPxD1 I4+BI8B1WXPJTrsG5zwcLDQtpOkMUG0myKuEumpukl2XVjKM+C2rGXeam2RVjixOhofl OSD7yJVRpgdvoHw/I+1qIVSf8AA/15edxeZwMIigfxj8MGCbXnGYj/HMOH+ioBqNpLRj 7j2SxBC7aZPSUfvHiCIvyaQWPJYbr6XXrkBVUNGXJ890s0wLaD40Ynnv6vvSn6l9fXUS RUCm7RWUYRjFB4DCrdNIN2INnV7siRVkjNrBrjie1iw1VMlASSvOOYOH2fZ8fjATY+1+ ZWQQ== 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=r0gPi4afo9I5YmqQbfJD2lj3D8+SZO0B+Jf+mMaPF0M=; b=0qnctTlnWWPG6ahoZ3GLfyv68evEuwFpWuXX8hw7I0b3Ct7I35b5oS3YoCeDuwdUoF yv0Bo+Qu1iJAhMBG6fBmIuAAZKQWvy5E3DT3l6DcDzpv4YRqtqufzMNPqt5l3CspVLQn a6VPtCSE/rK9Xm1SM80bum3cTDTr+MQM7ImDI37k9GfFyeBP3Cy6/cW1Y2+ToH80QhaV K/sPoKFjsSiwAcpNcxl+Iq0Tga0pQPIZmSRiSOzSgOpahdtVHPEUBEkjx6YHj5g1hUDW VRDD7TiaGCF5mMQ1Ol1zfEkz5bwPcMx4t3I9o7r3cz2jsV3G00RR9o8p3uNvMytL5MxQ hx8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IK6HqqXH; 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 u8-20020ac80508000000b003a573297fa8si677425qtg.500.2022.11.17.09.30.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:30:12 -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=IK6HqqXH; 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 1ovieD-0006PN-FJ; Thu, 17 Nov 2022 12:25:57 -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 1ovie2-0006KT-AW for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:47 -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 1ovidw-0006ES-BO for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:42 -0500 Received: by mail-wr1-x433.google.com with SMTP id y16so4938807wrt.12 for ; Thu, 17 Nov 2022 09:25:39 -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=r0gPi4afo9I5YmqQbfJD2lj3D8+SZO0B+Jf+mMaPF0M=; b=IK6HqqXH4W+Z+SESWgOgyKL4VJlhgoQrJwo1tlKBWpaN2FEmg0KcJdykUePY5uHv9I OA3TYA6zBCqHs6rBgQ4V963SQJJVG3U0reoSiz/d4AH2esKqR8Yjtn3DN1syUsdD8Rzu zOOTSRyBYtJV0fySCj0n3f2DlVGpHTvL2vc0sor1ChIOfmv2sAnx/izSh/ASrDaSYrOX j5wxLuTG9gu85yIkHuCtF1a8rb7DVdIm/7z3A6qPcGj4wqAWr5HsHHDPHd0H8qRf9y4d xjztEJCPj+k/2OJw/yccEawdrwXFyceDKCQVvnVB/OfPBh0lWUlrfi/rhZskms3f1S2h 8h1w== 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=r0gPi4afo9I5YmqQbfJD2lj3D8+SZO0B+Jf+mMaPF0M=; b=5EWVnLNKohc0DbivcGD06rw+jcR4MU8FaFUOqshLQmYfZvK2s7G4N+2ckYEqAThoRR AyTZTbsWNaARBAx6yJ4dHM780FWvbH2mRr3WJ1XM8pGTZ4mp7U7L07LzZnPuM7cMu3G0 IW8CZGPe7/GaAMfRnPKACA9drS1pd26OdDQDTHxkAnvZ1HtRUGwXw6D6Sz3rbJbZneu5 bHTZKBThZwQpLL2OaiHowQlmIVL/66JuWLwdR3KsF8zTieNb9mOPUSxucSHLSnnnbOEy 07dbBkLWBGej880UyZjj2PX9OYhA6VfKDJmbbSIajXfLDyWlWW59xnpRi8DHB3+F/6d+ Q1dA== X-Gm-Message-State: ANoB5plCC7fdRGR7ohadw2XRYeV9oFDBZiiIEjgXROoflDSGuC2W/ckH punovaeMGGCAD/z+Mgh/+vMJIYgojDtBxQ== X-Received: by 2002:adf:f601:0:b0:236:55a7:348f with SMTP id t1-20020adff601000000b0023655a7348fmr2164163wrp.331.1668705938658; Thu, 17 Nov 2022 09:25:38 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0acf00b003c21ba7d7d6sm1825646wmr.44.2022.11.17.09.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:35 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9CAF81FFC0; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Peter Maydell , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 08/13] tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg Date: Thu, 17 Nov 2022 17:25:27 +0000 Message-Id: <20221117172532.538149-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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 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: <20221111145529.4020801-11-alex.bennee@linaro.org> --- tests/avocado/boot_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 571d33882a..2be4be395d 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 Thu Nov 17 17:25:28 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: 625492 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006271pvb; Thu, 17 Nov 2022 09:27:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf7m21hTpcT+LaiB2zmWTMGT2OipNxK66VzbEbcZtvsHiPR/Pb2DIb9TTwbTPCOXuYwejlwP X-Received: by 2002:a05:6214:81:b0:4bb:5931:f949 with SMTP id n1-20020a056214008100b004bb5931f949mr3440471qvr.66.1668706025909; Thu, 17 Nov 2022 09:27:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706025; cv=none; d=google.com; s=arc-20160816; b=rUXP3+mzqZ7c9P8rA5hgTmHJ8XQNl4l6lVwAWHWZlUuz0yNGiGfK3cbjG/S7ZmQIGg suPcq6H0fpDtGeGM3pue+upGgOpZT9UbIGQRgnBtDvXssknYsOz19DMMB3VKVYlFyDF1 V9sSrKgaEqAWFHRNFhNp4ElzHNKp6XRx015SuZKYiVSQd0r0764RaHNLeLYlh+XhC+7D lxcKUbBkaWbSig+eDQBLIKJi50tSh9cWDf5dQoKn4TKfDY7YaB9DNa8NWA7jBxpEkzF2 +03ZDO5zV6BpFJqeDUAKQHFMAznHMfM7ft1eS21IANb/Wey2c52bK4B0kDBjGdMOEz33 2Tbg== 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=26+j95KhNnRg/9welD9ngC/SIn1nmwD8VeCvoiMe1LU=; b=X/li2AmurLA17zQLB7ihbDoYQy6phyDxRvkwIUGpsbpC0dc2JabhR+l8Uwx0Mt6/lb EY16hU97eX62VsAQ9BA1+y7denuQp+QiqQc9E4sak4YX25Sw77IiLuxAKlgeTy/w6LsK dLBQKcjotSH9Cm/nAc4XID8zSAR1yEtod6m0zNnHhsOOZphNGC0BMdiqElM1LDJkg2it 3os9GPyyrWYL5lSM99kCN+4Yb5TqfaDzy4r59tcSpc1OwDyMCuRnNz/j5em/ZI6nZVqt S6qH+dOOxzPQg5/SmrAhNUcXzC+rPXwoLi2ZoM9qhaxAZOdBrrcEBP5IE4M7LCHLwetc IAqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YgCe2PVQ; 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 q13-20020a37f70d000000b006fa0c69062csi659474qkj.184.2022.11.17.09.27.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:27:05 -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=YgCe2PVQ; 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 1ovieF-0006Qs-F5; Thu, 17 Nov 2022 12:25:59 -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 1ovie4-0006LO-7w for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovie0-0006Es-7w for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:47 -0500 Received: by mail-wm1-x32d.google.com with SMTP id c65-20020a1c3544000000b003cfffd00fc0so1646921wma.1 for ; Thu, 17 Nov 2022 09:25:40 -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=26+j95KhNnRg/9welD9ngC/SIn1nmwD8VeCvoiMe1LU=; b=YgCe2PVQijyi04ajtrLo84dw7mATzK7TD4mOOLljMpfS2dbUa3JswIAy0VJMUigvJB pRCxy4n1+Gy08IDESPCJX4B1Tt7Ubm280y04JZjI6xlRKYjrd4OtcgEVBquZXBketgBc uKgVB27+gNt8Sevvo3nHl/27k7/uR8DaBkpjevLd6to+Q1Tm5ukvxoT1ZXAyGU/OhCdf 6pAXx4Hhgvy9RnFxnkGB0ye3h2PUmldHAq9sCVqRyYuCLC3SFsq13h8PtDxMqWpZl+pr zJQ6qOeg0svxQqzfCjdzOEtYw2mNwDfgDMBf5pj53HxPJ+HBpXnvT3jgCOz/7W7y1DjK ///w== 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=26+j95KhNnRg/9welD9ngC/SIn1nmwD8VeCvoiMe1LU=; b=HqDflufN/+sjK4WhILSpuvQLMqwrlB1aIQ1E2gAXWJyTQK7AF4bP4zcANjpQfDkLqq cb1/qD0crLGHaPWK+4OqTv3BWLqJ3nW67TiyK22pUGdGxHprynGroBjY24Su+3SpRHvs jsAWR/xbxbaRQY9TpHRBUhSPHW88Uylf+xVlPWKSgUHKLcYoyO7qSBney2Ux3SERlhBg z1TKzN+djZjSNqjFiRNko9Rl/siA8oYy5XJl3Lol4RdHwxr1UeYav5Hz/5GNbvY40TWt HbRZvOQLonO90k1VJlQ3kfhjzWFeglCEBPmIEF9O+NYUJt9V10nTEXeaGgmFt9fcTgiB 9NSQ== X-Gm-Message-State: ANoB5pnUmvSpouE2vnaSZ4gc38duAusVuiDEFGBjNykRENM74niIcX1U mfsdq0y9TblgwN6wg47RZCj/OA== X-Received: by 2002:a7b:c456:0:b0:3a5:f600:502e with SMTP id l22-20020a7bc456000000b003a5f600502emr2479667wmi.39.1668705939518; Thu, 17 Nov 2022 09:25:39 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l32-20020a05600c1d2000b003cfbbd54178sm11306161wms.2.2022.11.17.09.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B30041FFC1; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:Virt) Subject: [PATCH v3 09/13] tests/avocado: introduce alpine virt test for CI Date: Thu, 17 Nov 2022 17:25:28 +0000 Message-Id: <20221117172532.538149-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 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é --- v1 - use "virt" image instead (even faster) - don't drop boot_linux (it is now disabled for CI) - re-phrase commit message - add alpine to the test name --- tests/avocado/machine_aarch64_virt.py | 46 ++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) 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 Thu Nov 17 17:25:29 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: 625493 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006618pvb; Thu, 17 Nov 2022 09:27:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf68DZfwp8tkethqCVE6oqpRLqfgtuIYsOURRHl2Lh5JkyVnSO7QVZI8u2xEvPacXR9dzN5r X-Received: by 2002:ac8:5214:0:b0:3a5:4cb1:7c3d with SMTP id r20-20020ac85214000000b003a54cb17c3dmr3144812qtn.558.1668706065128; Thu, 17 Nov 2022 09:27:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706065; cv=none; d=google.com; s=arc-20160816; b=WoIaDLJ1LgTmNylHoI3jlwLN8CsgXhf7DX7GfRKKU8GrOaCEPF+e9qaNZsDziZvPLQ BcjXqU0Ap5Dz0NK/rp2xl6JkJ6GuwE7DGMEfwB6wtsxpgpqvDyl+IpVvzfIn8wIvA5aD H2VX1I+Oy/VY//V9FSnnBYbPokf6Zg0kZ3MQ/WkiWMJ2FUfgtd0ZrlgxXriU7ft/opDX nn16iWPTzKQsbVs+pWpwjZNVi8MqcmKAP2y8+DQ4LT9cRl8CI6qQryXcWp97IbCH+cA+ sNQtmki+pb2oqqoQSSLvdPRaMdIJXAgs4qHo62ApoTb5l32pyelJ3U9u83XDEsDPHW6F obWw== 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=qC/VoVqNlKC3sjWCOYbeWRAUuEITkY8ByQXqJYDIr5s=; b=PmVCcpriZSloBwyzgAD4cDio6k6bKCiamMSCcaDe/TPCi9uT/c4tP7zDdM2llEvJkM PDcEnK1QKItb63+bliP+z8W2uXgTyltjCKHmxqxKnVqKkyOOseq5dRqQtt6xUjtzNUfL 9JU2IblAYx9gGeBhGOclOgpFcYfj7TT0A6Mlu9F8M5i0KNp+Xj2+vPCPAygAvkgKQepA ZbQ2BU/VPqpWfvVN8YdRtbGWmrfoMztuxt0197DIj/x/l3LNwPVSTdeWmlfeLX6qxSby QQyK1cRNaaqr0wMoz6I8ZVQFJAN3TQgU4Xw71lb7rEHbnXkIMDxU/1PkdYpYeaqvZYng BiRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HHJgyU1N; 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 ay9-20020a05622a228900b0039ad65104fcsi708525qtb.714.2022.11.17.09.27.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:27:45 -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=HHJgyU1N; 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 1ovieH-0006R5-PN; Thu, 17 Nov 2022 12:26:01 -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 1ovie5-0006LW-3k for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovie2-0006Ex-2s for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:48 -0500 Received: by mail-wm1-x331.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so2254671wmi.3 for ; Thu, 17 Nov 2022 09:25:40 -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=qC/VoVqNlKC3sjWCOYbeWRAUuEITkY8ByQXqJYDIr5s=; b=HHJgyU1NDgzpyLbfiLzF/Ksi3Qeh7v6JkzLWhz+E4EEjTCSAGpp9wgX1TcXBlobrt9 9eme352cQ1YfbGjocS4aSzur2e6UH+bRejS8u4uU9XR2xOZ52Qk1juIMQLSYDzy23UhE nW3txn70pLi9xPwoREeMkM8AaojWrN2n7wgjzBG0ImIFox8YxnB/KXdcnAoMq1yFuDnN 82A4SJ2Di0+jVj2t8mNUqShbPZMpMRjZ4bTJnZMBufaFa3XqhbXg2QSYFcjpq0VJiVFr kyMMZhIzZeZEMEeZOEmcKAL5FV2SZSyWZgTM3Z6C8kShbjh8QCmAyfX6JomTsGR6Vcwp qqvQ== 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=qC/VoVqNlKC3sjWCOYbeWRAUuEITkY8ByQXqJYDIr5s=; b=K0KQta/oMoy71URLSLAQtW8c7TEKFgat89Lh/q3FENw80IiecfdUXKtwrA2QCcovhQ gIVpr0WldZvAEjc3AOf4y3yJefzS6NpB2Zf1PHrJvaNSP+LBvr2HaJ++rw9swAGnMUee VBMWT6y0+vP+F6debixYKZMfoL+T8ZCgtM5Seva4COLs85ISzrqjcO87ld5cid1a7y47 Z4jNFShZ8fAyV5e0w+5CZTpLXDOKqYt22jMuTZ7VEnbAuKWN94/mbGCWR1vBCNzI205Q U92MVQuZQ/944p3pp08vCDjVDSjO4voqSlFIZlBWauJI0Z1YY46ncXdt8L2RwkAqZ0kD HxmA== X-Gm-Message-State: ANoB5plWim7h9JpSr7qMiSVRzLDxtJEDruv9lJxoVo/Q5IrQT9E+Dvgz kvVKMgW2DfRnk/Iwdvfqw61jWg== X-Received: by 2002:a05:600c:3b0c:b0:3cf:8df2:63b7 with SMTP id m12-20020a05600c3b0c00b003cf8df263b7mr5907423wms.11.1668705939965; Thu, 17 Nov 2022 09:25:39 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o19-20020a1c7513000000b003b4a699ce8esm6006010wmc.6.2022.11.17.09.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:36 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C9B421FFC2; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 10/13] tests/avocado: skip aarch64 cloud TCG tests in CI Date: Thu, 17 Nov 2022 17:25:29 +0000 Message-Id: <20221117172532.538149-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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é --- tests/avocado/boot_linux.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 2be4be395d..79810be942 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 Thu Nov 17 17:25:30 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: 625494 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006759pvb; Thu, 17 Nov 2022 09:28:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Ei3PuMm/xLh+UM8eG8eYg3IEEnaAgdq19+Zwn9l+5vXyuZ4FO1o7hXYazVdecJqsqDuN5 X-Received: by 2002:a05:622a:1c16:b0:3a5:3084:9271 with SMTP id bq22-20020a05622a1c1600b003a530849271mr3096592qtb.366.1668706082529; Thu, 17 Nov 2022 09:28:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706082; cv=none; d=google.com; s=arc-20160816; b=xzREI299ylM8mTRja+7QIF8coWG2S+JM/MNFnqa7WGEa43eE58mPc3mqR6VhO6se1F uFS3Jekm0vmH2JsBgSx9zruxKAgziQlfkJq9nfr3wwWtVsKU3wB2mTNpgQxvT8HcSaOI DIAh4wpHlaaPCzFCMNQVvzEx59DoyrBkmsNYkedIMGZQRJIHNKmvQudzP5bnGLVO0rpp AjLjVTMgyGE8Hbqrwpf7CuynTBU0n5F1nXet9ITqkEm3i6guDBFiqj0VTn7s9fLD8xB5 gsgnVhD0gWJo8ibTKjeqHqolnE+PieXrqQErMn0fctGxs1ZKwYug4tmdevONY72jz8Nx 0XEQ== 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=KsoXyv/ps+YbWahAkHox+gO9CbRysA54OuU4lgnIP2M=; b=FhuM+VSye94Gvsba5akrUGQzP0I+0Flw2sXGmPzFoJY4hGFwRrJO0BqUxBTb9Gju+a BqRh3wbeLUu3LbmZpeHGuri9XKb7Ph7VWaTOQ9xs4VeAC7MVwBxpOzWXa7exyNow1Hlo takzp2sc73T04rQkIXK+NrmatCeKIwnsowae+EiuW2DHEoAdKLyWQvNybGg2KBfX8oXw loaghcgTyCWHInneo4Orgp+C9iT0YNXbiqY5IsJy/JcNg50h5YhrJGG4dlzv7qVmqcZp tLFc6lDRYzXWK0revsR2jEHbEnpt/9pvQmi4GkaA56UpFwkPCRhjO8Scb9348BsggdFX EXaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LrNMXYZh; 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 jm11-20020ad45ecb000000b004ad040f974asi773130qvb.67.2022.11.17.09.28.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:28:02 -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=LrNMXYZh; 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 1ovieI-0006SL-CT; Thu, 17 Nov 2022 12:26:02 -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 1ovie8-0006NT-I2 for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:56 -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 1ovie2-0006FL-A8 for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:52 -0500 Received: by mail-wm1-x334.google.com with SMTP id m7-20020a05600c090700b003cf8a105d9eso2246001wmp.5 for ; Thu, 17 Nov 2022 09:25:42 -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=KsoXyv/ps+YbWahAkHox+gO9CbRysA54OuU4lgnIP2M=; b=LrNMXYZh4HdY6xoENMuEilMMzR92JAiCLd4VXmwV8jKL9uxrm/+867pSNs1Tp2+cZa GEaglqS6AYsmmhVpS+rjlqsX3u0F+RefnXFfpGF8Df738R34fsR9rdFcNnrSRQvCLA9U OX2hgL6zPvrPNyYmPjhIszHS2IKm9bGQTaVCwPAkcHu0vR222tAWNuyj2ut500U3ONhf 6pbQOFk7XjyXo4v9EVMitxFUX04e2lshbJrnT8ltl0yCJCgaxYwJPKaTEmQCzh/9Dgfk DT/c5KPiiMXJtnSK3WV0Cbk2zh8ttRHPG04pC043i9NAJcJ4bv9N8Ta8CA0IY661kKHQ JPFw== 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=KsoXyv/ps+YbWahAkHox+gO9CbRysA54OuU4lgnIP2M=; b=nAiGfCpnDKbYMKRDLmqTHrJcDEtHsChxJWl+8FjaUVfwq6ZUhNB7ImdQ3SN9G3kn4o v0hQ8OYBeh+CYdT4bDwIYDZgG5PsvG8T8O9phECY3Z2qv+uioEMTE6+NWwIxPlHHrPVX QL3sjMkKWy50foqwxkY7zN549EJBDUaFWysuTTT73ZCdcz6vFaONbtdXXBsQBXfCni1I OCiydi+LfjB6sKyQuEd0Fat+q3E8Pl/RdskPjvZFtvk7IhN5sEGZsWb98bIqUCfBObzs 6doDrsQ3+oXfJ4CoUILhddc1X50YDnTrfp0Wfx2DbC4aRE+sO91XiEufuixskf5emlhf SeWA== X-Gm-Message-State: ANoB5plJ9ocaNRVYzxn9FezMpsaKR2vaUF4eqfOfvuofUaIq0xXUnQ1m tKbcRe0vb3Lm102e9BW+PYDe9w== X-Received: by 2002:a05:600c:4891:b0:3cf:d367:2765 with SMTP id j17-20020a05600c489100b003cfd3672765mr6071371wmp.12.1668705941418; Thu, 17 Nov 2022 09:25:41 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q125-20020a1c4383000000b003c6cd82596esm6259337wma.43.2022.11.17.09.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E43C41FFBA; Thu, 17 Nov 2022 17:25:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 11/13] gitlab: integrate coverage report Date: Thu, 17 Nov 2022 17:25:30 +0000 Message-Id: <20221117172532.538149-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-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, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+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: <20221111145529.4020801-12-alex.bennee@linaro.org> --- .gitlab-ci.d/buildtest.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 From patchwork Thu Nov 17 17:25:31 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: 625495 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1006907pvb; Thu, 17 Nov 2022 09:28:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Pjp1eS6cvZo8Isa/QzMET2K6i/UVQmkW3nKpCbzYiCKLX1hsz9xioGUv30131XyT/pur1 X-Received: by 2002:ac8:728e:0:b0:3a5:4fdb:ac40 with SMTP id v14-20020ac8728e000000b003a54fdbac40mr3151783qto.268.1668706099077; Thu, 17 Nov 2022 09:28:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668706099; cv=none; d=google.com; s=arc-20160816; b=iKCixWB2+WjwNk/vuJ6eUCSPISrTNCzKjWbdZ3T5M9AJun+6bidCFDZuJ7qNQVqnlk xqptBtJ9gyffMjZdN1CFn1czibx1HeZI6g6p2VrUHZmpRy1fAMZ+zEflRqtpCPhgz6j0 uP/kR/sRNCBJnemR3ZNrWqM6OYiwA+eevWrrU4mWKzEeesmLinBiAkFVviHomATsnfgp fcXmDVylDqvbLt5OG7mtIccrX5ZmK1tU8i76XRXVgSMdmx4fmEIil09pyRdH0bwZB1jP hi/IolmG/xsA5IwEAwmSHArBBf13sCxQ29G1bFGbqoo3nPitycFSP/ZTMXViBxG4tfxl YWvg== 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=ZN0cS2zXnFlCnu9gVWFbK/ag61x7K3nHdyQ6BLwUiic=; b=RGVRtlBL0O0U3XC7xDWkB5iVzeFVU933c6sU1FtcgyltStbeKrmxA3BEQG1lNyMla5 FX/jW5+hIKDTk4Ifv+BOSiE3DfW2FwNCONzHUoGgkCFmmb7G9XQ8Y/Y6Cnx7BcZcpLqq r/5c7T5yO1t3gaqT1sH/0S0ibUcvxl8UeETppqgWNng+ekpmKCyJPSCHGvKl0a5/X5l4 KzLPdGBHP2IG21sej/e31Kp2rY3oFFb/Xo2+eg9Obo3sBeqFs2xqAI1qnuOCiW7MYk5n y6qyqnGn8BrEZJXSA0wicWx8Tgg0pdg6FSyjYH0wj5llhVco9bi86gc/lXWeuXD3BJWW brLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="u/Z5GGL2"; 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 cn14-20020a05622a248e00b0039ceb3ab9f0si701214qtb.720.2022.11.17.09.28.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:28:19 -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="u/Z5GGL2"; 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 1ovieF-0006Qx-WD; Thu, 17 Nov 2022 12:26:00 -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 1ovie8-0006NR-G5 for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:56 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovie2-0006FG-BT for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:51 -0500 Received: by mail-wr1-x431.google.com with SMTP id a14so5004532wru.5 for ; Thu, 17 Nov 2022 09:25:41 -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=ZN0cS2zXnFlCnu9gVWFbK/ag61x7K3nHdyQ6BLwUiic=; b=u/Z5GGL2M0gCN1Ty+kJ7A9PiLKiQBLd7VCIuLi3xWkHW00rSLCwQ7qeLW9rOM4xgm1 AsAsdvNRFGGEdKJoC16KyUS4zqpMRhhnSMjnFGZEmCpatDALgFL9U/9iwwvGFJNZGEeH xCDdWW23Cf9CbMKCQZyJy/K0LlMcs4wYh+41X57UttzpTwjwpRilqj6ofMbYAvHawXJo f2sp1sIxCCwPW2XfhmMiPkmzfG4sp6JBOL8XtRHWU0v9u31BvDo5Po4LCdnr8yE5mHcX TdOoRavG/Tg48FlrIeyuB5UwKPk4kly4Gk5obyozV/5J024xCuqSFKB/qLM9OGi5lq1K IWsw== 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=ZN0cS2zXnFlCnu9gVWFbK/ag61x7K3nHdyQ6BLwUiic=; b=ZFy/Kc1W8W89mQ6l04FotgSnYyQvtT6IolDloSGKmHv5Ka952/uGpQcfjXEGLFyv1u G3cTgg4aWYiryVW2mW+TPJis4IxEg7p9i2HDmXp5afdY5IGftW2369H2Q2mW3XLfpyT5 +GQk8qW53Du6UlSLRNYcjLk3ZJd0a5T8mnbJUR6qu24WoFNG9NEwH85nONuoAjvhDwaA 3MGx+pGAE2YWejR+0qV98zenrb3AofNOMXJ0RAehL/REeiu/fr1iVuFW5v4Juwn/7mMV Atnyg8rPzJIioW0zff60YUDRxhTZOiwTH0a66RhSs607BXg0+WQDxEtomud7xwEftdMW P9sw== X-Gm-Message-State: ANoB5pkrpgDopgHxfKE0KoO1nElxDTNANsrjoailWF0FMy6ntlrQa0Qb nl6DXkiAv/WT5UhwyABJ+jf+iA== X-Received: by 2002:a05:6000:1d94:b0:238:3d85:8e2c with SMTP id bk20-20020a0560001d9400b002383d858e2cmr2144693wrb.650.1668705941117; Thu, 17 Nov 2022 09:25:41 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c3-20020adffb43000000b00225307f43fbsm1443818wrs.44.2022.11.17.09.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:38 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 089651FFC3; Thu, 17 Nov 2022 17:25:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Peter Maydell , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 12/13] tests/avocado/boot_linux.py: Bump aarch64 virt test timeout to 720s Date: Thu, 17 Nov 2022 17:25:31 +0000 Message-Id: <20221117172532.538149-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell The two tests tests/avocado/boot_linux.py:BootLinuxAarch64.test_virt_tcg_gicv2 tests/avocado/boot_linux.py:BootLinuxAarch64.test_virt_tcg_gicv3 take quite a long time to run, and the current timeout of 240s is not enough for the tests to complete on slow machines: we've seen these tests time out in the gitlab CI in the 'avocado-system-alpine' CI job, for instance. The timeout is also insufficient for running the test with a debug build of QEMU: on my machine the tests take over 10 minutes to run in that config. Push the timeout up to 720s so that the test definitely has enough time to complete. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20221117111628.911686-1-peter.maydell@linaro.org> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 79810be942..b3e58fa309 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -67,7 +67,7 @@ class BootLinuxAarch64(LinuxTest): :avocado: tags=machine:virt :avocado: tags=machine:gic-version=2 """ - timeout = 240 + timeout = 720 def add_common_args(self): self.vm.add_args('-bios', From patchwork Thu Nov 17 17:25:32 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: 625488 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1005904pvb; Thu, 17 Nov 2022 09:26:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7QtoLZVzCX1zN+nJzAmK2tAP6ZwI03oWpL+9UQot+ZLbxdo9y2BVosof3wMG/1snPUzWB4 X-Received: by 2002:a0c:ed4f:0:b0:4bb:d550:d06a with SMTP id v15-20020a0ced4f000000b004bbd550d06amr3269134qvq.131.1668705982857; Thu, 17 Nov 2022 09:26:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668705982; cv=none; d=google.com; s=arc-20160816; b=BbKETDIb2/Ne2IMt1MXEAiessOjyr8jhLBJBueWecjMhaJLWOqrNGI41sloax4IS4c YUZnUCpOzdMRhPBdtiRUVxkzEEzsDxSQbWllICWif7w0PvKvIedknXsTDb3+YPA0ppNL stRZsNpKYFvqiJ1CPOMd3z0HRhmTW0iMOcP7MCefMgkRI4m8lcJZ64536baW16mMdLzL AcAahWbhHzVOmwWTIzwTRPkSLzdTaVQwXgr5Jk4rYe1J6qju/lixMUax1wW78TtpbLLM EBKFQsVAmHg2ly4Sa+dsZLV/ubqLePF4Q+onuwaBdW/yw0rSSIQZHeJUIr67bv+Yx2NG huFg== 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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=OW3L+km00j3oFH5kE+qCEKpC+fgi2YUjFwbjBDqHL3ehjDT7LTW7OhNa5PIfZIV0oh A0TvVFxaa0kw2jWRLTYxe6Ens59/u6uPZPDlr0wwHYOjy3RTfLqzCzmLkPcoOgnhkhs3 SZICUvqvxCGLFiWwTasFJwyvDTBO3Je9ntpAd+rmklC1a8q5UeX7JCV3dPuD1cGUqPIa EppByIdR5ZX2XEmdSBw86nH5X4WFC9nCvAv4tdWUAA4//nKIeudvYQhK03I1ORJDOKAp iHjQDXohh1a2GaRhsRSQKSejuuTPoyIQ/+gKpFS7/q0pgAdqV8uCoUY12rYT92QJKQfa aPiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dWSPr9U1; 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 jm8-20020ad45ec8000000b004bbf5db39e8si744007qvb.259.2022.11.17.09.26.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Nov 2022 09:26:22 -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=dWSPr9U1; 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 1ovieG-0006Qy-3N; Thu, 17 Nov 2022 12:26:00 -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 1ovie5-0006Lr-Mx for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovie2-0006FW-Bd for qemu-devel@nongnu.org; Thu, 17 Nov 2022 12:25:49 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v1so4923656wrt.11 for ; Thu, 17 Nov 2022 09:25:43 -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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=dWSPr9U14LI9Lv3mBmWZtcjDj3ICSFiaSrIZzGqEbWuR0Rk1k/93d2FGzCP+dM7DTs lvhGLGPJKPuUwS31VjeZAfMd0+3TF/CB6Mfn365UZreSGRO9cG2OKsXq0ES2MWdInaAJ Snq9NwSke0nSk0LSuT8olP9rMPaVieTmM3YgiJynOg7972NyERrMfr60CWPETu57ONsr /9UCcj+aRZsEbGlyzn2lTi1cxodkxwRMe6fN0Y/fyPt6hywkVhAVaPYM7cH2ueHpMkqU yzzntf54nPnDt+hAicS5Gs0nIezjyp3grVh8PJcY2jg73boqsLade2GbOva2fkdgdGMg nduw== 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=oMlvtnFEABWg8w92G/8HRIs95GXnsgMR5Vml1n/BCPw=; b=KDUcbu7mlo0J5COHf2lrxBDCxIJPNBKMbZQIQ6vn4vRCfN0srTZEesNLPb/eLMNv+G K/bAjcseoiSsNzKhbwqNSLnYG8kJyFq8wgMEsu1S6kb5ZMYq1M5ZYB74I15QpKsalmYs Ql3OaWkge/qhCeuvls2aC0WPO9JEK5rN2yrq8ig4/N3DX1Ftu6d1e9ybIHYH3PdDT/QL 0IaqovN6016b0KHn8T39y3HR+bOyMwfUdTgc+3bK8Y3XnQ4WZWJSDkTbIA808hmxMDmL q2knh+iDjMxmXdoSuQttVQfJUO9HlPqcVF/XmdG+zDnpBMKlfrU248+lmIrLXokrk+HU HzLg== X-Gm-Message-State: ANoB5plPMIw+cVon1c4nOabZ0+tNSnFECLSXq/i+/YPzkmSNl2vbQ5k8 06BtVpqCF/YmteQm7hTSyxqLeA== X-Received: by 2002:adf:ff89:0:b0:22e:38b:95ff with SMTP id j9-20020adfff89000000b0022e038b95ffmr2009971wrr.202.1668705942142; Thu, 17 Nov 2022 09:25:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b14-20020a5d4d8e000000b0022cbf4cda62sm1754696wru.27.2022.11.17.09.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 09:25:39 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 26A771FFC4; Thu, 17 Nov 2022 17:25:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Thomas Huth , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v3 13/13] ci: replace x86_64 macos-11 with aarch64 macos-12 Date: Thu, 17 Nov 2022 17:25:32 +0000 Message-Id: <20221117172532.538149-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117172532.538149-1-alex.bennee@linaro.org> References: <20221117172532.538149-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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: Daniel P. Berrangé The Cirrus CI service has announced the intent to discontinue support for x86_64 macOS CI runners. They already have aarch64 runners available and require all projects to switch to these images before Jan 1st 2023. The different architecture is merely determined by the image name requested. For aarch64 they only support macOS 12 onwards. At the same time our support policy only guarantees the most recent 2 major versions, so macOS 12 is already technically our min version. https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ Signed-off-by: Daniel P. Berrangé Tested-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221116175023.80627-1-berrange@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus.yml | 12 ++++++------ .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} | 12 ++++++------ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) rename .gitlab-ci.d/cirrus/{macos-11.vars => macos-12.vars} (74%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index d70da61248..634a73a742 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -70,19 +70,19 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check -x64-macos-11-base-build: +aarch64-macos-12-base-build: extends: .cirrus_build_job variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurses/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64 diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-12.vars similarity index 74% rename from .gitlab-ci.d/cirrus/macos-11.vars rename to .gitlab-ci.d/cirrus/macos-12.vars index aee9f50de6..ef9e14b373 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -1,16 +1,16 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-11 qemu +# $ lcitool variables macos-12 qemu # # https://gitlab.com/libvirt/libvirt-ci -CCACHE='/usr/local/bin/ccache' +CCACHE='/opt/homebrew/bin/ccache' CPAN_PKGS='' CROSS_PKGS='' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' +MAKE='/opt/homebrew/bin/gmake' +NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' -PIP3='/usr/local/bin/pip3' +PIP3='/opt/homebrew/bin/pip3' PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' -PYTHON='/usr/local/bin/python3' +PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index d40e203631..e3eb28cf2e 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit d40e203631eb3eacee17e8cf8fd20aa5152db62a +Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ce0b24c0b1..fa966e4009 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -176,7 +176,7 @@ try: # generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") - generate_cirrus("macos-11") + generate_cirrus("macos-12") sys.exit(0) except Exception as ex: