From patchwork Wed Mar 20 16:13:36 2024 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: 781376 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp387730wrj; Wed, 20 Mar 2024 09:14:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOzDiPHRdUhgq6anK8NHEWMkxdIgb1+/8XhdgmYS9sO/a0XCF6qaCHAg9AXZScLMR0B9KT//7OzNKn5Rjkqn0x X-Google-Smtp-Source: AGHT+IEKWiMPk6U7uJ9wjWRBhw3bHi78wctpkuWOGgoEZdN5CSJqyvY3wIbnqUQ3H8oxPbn2VQ1H X-Received: by 2002:a05:620a:29d0:b0:78a:29f3:afc7 with SMTP id s16-20020a05620a29d000b0078a29f3afc7mr939173qkp.42.1710951262650; Wed, 20 Mar 2024 09:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710951262; cv=none; d=google.com; s=arc-20160816; b=0qoTu1gEs0jmx1mpAqbzfmgK4iWF2aODHGs9n/9DmhQI/M8uDpeRBbSOfnt5B9/xUO CEGO6b3A53BzufZcoIsBdeAMt0OQyZkji86LBKJ/ZlyArhCyoeifMWh4bGWgaeIPoEgE QxbHXHRhCjR92025+QdN7PTjj4EN4TSNLgr4KQ5Sg70EsJoehrAy6iJ9G7VUyeWIeaqP qJ68Bhxn6k7Z4SaOIo1+QcLy3m1TLPgxTAANvskI/YZuI1AaqP+c9ITlV6mBUWEFjvsr pAnznFv6pU0MCC8rV69293Nbz0tOpyoRlnBH3gpjgwJLhqJRMtK3XWviVmqpANqEvE9i WhRg== 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=nfjqk3C9XKUuY3mZ0blhMLx9KnHWjtdF/kXD7veoPg0=; fh=0h4bzgtXQVEfkB6XdSl03pD0dH1bJixB2DvqzWWqGJM=; b=ckvWqp2YT2dmHkU0K9RjcAmz3yynWxpJmCQheExa02q3zCi8G7YUeEBzdnY8dGJx0o /jp29lvAFwGYKOFqDXX4dQvFBTXl1o/g3gmktYHtSWfnrRU4fHHsATcDcWPCAKVbiA0d PCtCT3cyxNh6zd2trfM6Hu/TdL+edkHRU2DvT+/WDpuSUYeqpTDn96hwYc4GOtMffHOG UUyz7VNZZSikB6kzEcWEWT61o8BCblh9JlrVExVJ2s+U7T0DzmC095hqtkABTPBUDqoc pDeQI8xfmq0bqqftDb+sHr2DX0GLABc5cph4+nS1qR0lrgtd+kPJJF18FyglC1czD557 m3Jg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NOII1P75; 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 pc4-20020a05620a840400b00788258b54e3si14174373qkn.503.2024.03.20.09.14.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2024 09:14:22 -0700 (PDT) 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=NOII1P75; 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 1rmyZY-0002ze-So; Wed, 20 Mar 2024 12:13:48 -0400 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 1rmyZX-0002yk-A5 for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:47 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmyZU-00035J-Cl for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:47 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5688eaf1165so10101900a12.1 for ; Wed, 20 Mar 2024 09:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710951222; x=1711556022; darn=nongnu.org; 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=nfjqk3C9XKUuY3mZ0blhMLx9KnHWjtdF/kXD7veoPg0=; b=NOII1P754miSGkxqhcGaMg3a7KgpYSjkmzibDG9tmgdxLVqZVlCuhBRYhh2o/FhPvE MXX9EoTRgt/zr5x6WHKtRq+kI1VL20nNthtlP8HmwZt+0w2QXb8L//ueu4qpN3o7pHi7 TxKWJY7AqahWgwOz3cDH/Et8gmF9PsD2K8ElMfTXZDF63tJsUDpxucE7V4pzCCuvT/f7 dAaD+oxaL5lGMjxoMtm9odkfkJnAwY6ADCpwscLMy3TQfLczvB3vVl5B9JmguQ4YiyZT A8RNgDBNgMu4YBErlT1/YHz+FePhsEbkmra0GcE1WkKe1ET7hTb/NezNj5FSxoDv8Enx BTEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710951222; x=1711556022; 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=nfjqk3C9XKUuY3mZ0blhMLx9KnHWjtdF/kXD7veoPg0=; b=qlu9KtkdLVLUxgMIEmXJBJk1PvlBwKbsSLT7KBA30bBl70wq8q340jZGfCC+gN5anc +SurYr6ZtoVSwOQ3DSKSlx3K6JlTi/hFV+TkYyDYzF3WT5Ev8ODqjMF9x8sc7HXUt7vf qnxnS/nBasHlr+zX388S2j2BK0UNyAwEQqqk9Vyooosbxjgf0tUqDGFPzxpIuJ6qBDoV sE9LjlbJa2VpDSN6/yiZT34Yy+m6ODrs3MhFhWwmUFNc2WY05xHGfUQITvAw3xPZyIun ryaAovqbhXORMmRB3fd4UPMDWL+ZFjGyT39OUGxlPwPBj3RTO2hfvbTi+BOjhaj820Uh uslA== X-Gm-Message-State: AOJu0YxdxAZcvVxJIdHCoquvYXhGRYBmCEjk8/md7gPQCp5+DovCz3mj 1GEhP9NYx16bGwnFJ9BL9cwdDBTMJDqu8dJwBf49atBgcGcOtKeum9/APdpVF5c= X-Received: by 2002:a05:6402:528a:b0:56b:863c:2c92 with SMTP id en10-20020a056402528a00b0056b863c2c92mr4166907edb.34.1710951221848; Wed, 20 Mar 2024 09:13:41 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id co24-20020a0564020c1800b00568c613570dsm4682613edb.79.2024.03.20.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:13:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 177FD5F8B0; Wed, 20 Mar 2024 16:13:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Manos Pitsidianakis , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Yonggang Luo Subject: [PULL 1/5] gitlab: aggressively avoid extra GIT data Date: Wed, 20 Mar 2024 16:13:36 +0000 Message-Id: <20240320161340.391798-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320161340.391798-1-alex.bennee@linaro.org> References: <20240320161340.391798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This avoids fetching blobs and tree references for branches we are not going to worry about. Also skip tag references which are similarly not useful and keep the default --prune. This keeps the .git data to around 100M rather than the ~400M even a shallow clone takes. So we can check the savings we also run a quick du while setting up the build. We also have to have special settings of GIT_FETCH_EXTRA_FLAGS for the Windows build, the migration legacy test and the custom runners. In the case of the custom runners we also move the free floating variable to the runner template. Reviewed-by: Manos Pitsidianakis Signed-off-by: Alex Bennée Message-Id: <20240312170011.1688444-1-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 2dd8a9b57c..bf3d8efab6 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -24,6 +24,10 @@ variables: # Each script line from will be in a collapsible section in the job output # and show the duration of each line. FF_SCRIPT_SECTIONS: 1 + # The project has a fairly fat GIT repo so we try and avoid bringing in things + # we don't need. The --filter options avoid blobs and tree references we aren't going to use + # and we also avoid fetching tags. + GIT_FETCH_EXTRA_FLAGS: --filter=blob:none --filter=tree:0 --no-tags --prune --quiet interruptible: true diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 4fbfeb6667..22045add80 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -14,6 +14,7 @@ - export CCACHE_DIR="$CCACHE_BASEDIR/ccache" - export CCACHE_MAXSIZE="500M" - export PATH="$CCACHE_WRAPPERSDIR:$PATH" + - du -sh .git - mkdir build - cd build - ccache --zero-stats diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index c7d92fc301..cfdff175c3 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -187,6 +187,8 @@ build-previous-qemu: variables: IMAGE: opensuse-leap TARGETS: x86_64-softmmu aarch64-softmmu + # Override the default flags as we need more to grab the old version + GIT_FETCH_EXTRA_FLAGS: --prune --quiet before_script: - export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)" - git remote add upstream https://gitlab.com/qemu-project/qemu diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 8e5b9500f4..a0e79acd39 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -10,13 +10,14 @@ # gitlab-runner. To avoid problems that gitlab-runner can cause while # reusing the GIT repository, let's enable the clone strategy, which # guarantees a fresh repository on each job run. -variables: - GIT_STRATEGY: clone # All custom runners can extend this template to upload the testlog # data as an artifact and also feed the junit report .custom_runner_template: extends: .base_job_template + variables: + GIT_STRATEGY: clone + GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index f116b8012d..94834269ec 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -28,6 +28,8 @@ msys2-64bit: # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. TEST_ARGS: --no-suite qtest + # The Windows git is a bit older so override the default + GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days From patchwork Wed Mar 20 16:13:37 2024 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: 781378 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp387920wrj; Wed, 20 Mar 2024 09:14:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlZGTUZbASsAIPKXWcqktlpWAaMxwgcQeJ+eqZkvCgm9s/tgUJ42mlUPTE5Vj3/rGdJDhpyuwaTy/uCZXFsDUP X-Google-Smtp-Source: AGHT+IFpsTaaJ9+9el0YpKy5p7I3CpAD506vF8DgZ9a7rjR7OGTFYMOclVadPT7fCwczja+Q+R8U X-Received: by 2002:a05:620a:5e0f:b0:789:f0e3:d8a9 with SMTP id xz15-20020a05620a5e0f00b00789f0e3d8a9mr216401qkn.13.1710951281948; Wed, 20 Mar 2024 09:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710951281; cv=none; d=google.com; s=arc-20160816; b=mk2WCf3sVRDqkrBd8/wnioa1pbdJT5FoJMtWEUa1SquBDItl1aAbXM46EzAbHouSIO jUe0lLYvrV44A6zUaMMCLRp9lXA+4F//vktmBVk3eKyZBiUwNB/lF4Ra3l8KhkeamNLv uKjHZv0zvY9DJj5QvfL0LQ3Soy+JOUDrhEpc4Bs0qRkDOPkB1xFNoFnXfqtZggceHMyo Bd2bwXzJYpv6XRaH//LIcq9AtNy299diLqpc+hd455W21oz0eT806bqG7Xay3SZYbHbA Y+O3k+n4QaZwzH8/xPp1iOB1u+I/Nn7Nr8qS80Cop64Hj9n8xmcP8CeQe0XM2JgprQQ8 Sdfw== 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=XT2fjAt/fMm7dCx4w3sQ31zoFoyy4ckvjlYypijIbGY=; fh=6U2J5omtyhaqLcqmFSctHI6Cv/ER2BdjCLTdVvmd0gE=; b=nNNFz9KWB+pVHTPcsbalpDJMvlCBSViPLwYtHYbXtg0pF/eGTcE7rhPyFqqIV3p0jn pBPqJTTAAz+2O+Z6tocxgrHU6mTd0kgaggYM0wuxPMmZnApsn0MY/mHwgqbDxFAyvWnY 0UJ1pF6xuTWJl7z0ewiIJPYnPdR05mXdkORJIg1BGuS2DyrCk3/nCDGZORbvmUCXONIS iM+S/S40qNYRLRy9d8vTZFiN3u3LCVY/ndiE/W0dnS/0vbOTjrF/UNQEk343IogpICx1 dkelEULbqHaZSNDZ4J8Abab0CkoD8Ogs+HTja4IdE+gDeSkqhqhrtw5LEQhuKqO3Gw2P Q4TQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pUg270RY; 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 c2-20020a05620a134200b00786fe4117fcsi10763107qkl.388.2024.03.20.09.14.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2024 09:14:41 -0700 (PDT) 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=pUg270RY; 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 1rmyZt-00033A-E2; Wed, 20 Mar 2024 12:14:10 -0400 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 1rmyZb-00030t-F6 for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:51 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmyZU-00035Q-Ch for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:51 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-56b93b45779so2980372a12.1 for ; Wed, 20 Mar 2024 09:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710951222; x=1711556022; darn=nongnu.org; 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=XT2fjAt/fMm7dCx4w3sQ31zoFoyy4ckvjlYypijIbGY=; b=pUg270RY0q+8XL9rqsSA+epnm9vBmgBDcdyCdHOabKH30E6zZ/5Ie+r1E83gljqMzy R87fxWNtkkY7p3dqOnJQsPMj55F06efKgLTWysjTMX8puMlActB9wpaqym5O9ZHOXptd FYsble5TqTZTb1oJVhlqcvz592qSgxdRjXTbl7W4CpjB7G2wrTm6SMtJ2nh2SLBa1vK4 fQoLUKHq4LJYipA0OJKWJZczrqL4TQkcLoyXAJJQMk6Kayv9u70Q+QiGaOIItPScvWNj +IkcvYEX/M9A/7N+SympkIJJmHkW9yIg1wlEH5GSx/988lol7iUijIYfujpCUybma9Bs s72g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710951222; x=1711556022; 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=XT2fjAt/fMm7dCx4w3sQ31zoFoyy4ckvjlYypijIbGY=; b=jBIC/C7l76L75b5+cbauNuM/7JLsOl8tajwMVJYpx3gM+9viMjr0fV4Sdz7TLJHAlK 6/rVyJH3euRZatEp3BfMkwxUA6FIvJg6lyniZZfnG44Q3Zp6R/H2bzdWgxVb9Pka2YUT UjmiQ9nKMgPFh9z2Hn99VpU49ZBhxjr2h8kSRuerB0jvUSSmqu6aPfNjroi9AIMDOz/1 aEoskUH57PG1n3EQ8ggQIu1YMLTbA7ilL+nXpjHVhSXRaljvQwITmhrEBThkerdKw1zB CQUFzyi8dgmeTCeDu3vnCq7miGkx/JqD0hpFXSXHrGwRMO5FgggPek47ENxDfZsApF6F 8K3g== X-Gm-Message-State: AOJu0Yye9BJbFVf+Vj04QDigkei2Eg0aciqOkVntolGOQAGXGVHxhb78 W891eUh+CWdZ0NNQb0IRk1NDMGCVrXV55uG8BfinZWVU/wirZGl1E8BA5b7350c= X-Received: by 2002:a17:907:1b03:b0:a46:e51a:466e with SMTP id mp3-20020a1709071b0300b00a46e51a466emr4393621ejc.64.1710951222311; Wed, 20 Mar 2024 09:13:42 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e25-20020a170906845900b00a449026672esm7463987ejy.81.2024.03.20.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:13:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 29FF55F8F1; Wed, 20 Mar 2024 16:13:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Marcin Juszkiewicz , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Radoslaw Biernacki , Peter Maydell , Leif Lindholm , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:SBSA-REF) Subject: [PULL 2/5] tests/avocado: update sbsa-ref firmware Date: Wed, 20 Mar 2024 16:13:37 +0000 Message-Id: <20240320161340.391798-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320161340.391798-1-alex.bennee@linaro.org> References: <20240320161340.391798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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_SCC_BODY_TEXT_LINE=-0.01, 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: Marcin Juszkiewicz We now have CI job to build those and publish in space with readable urls. Firmware is built using Debian 'bookworm' cross toolchain (gcc 12.2.0). Used versions: - Trusted Firmware v2.10.2 - Tianocore EDK2 stable202402 - Tianocore EDK2 Platforms code commit 085c2fb Signed-off-by: Marcin Juszkiewicz Tested-by: Philippe Mathieu-Daudé Message-Id: <20240318-sbsa-ref-firmware-update-v3-1-1c33b995a538@linaro.org> Signed-off-by: Alex Bennée diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 528c7d2934..cbab793455 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -1,6 +1,6 @@ # Functional test that boots a Linux kernel and checks the console # -# SPDX-FileCopyrightText: 2023 Linaro Ltd. +# SPDX-FileCopyrightText: 2023-2024 Linaro Ltd. # SPDX-FileContributor: Philippe Mathieu-Daudé # SPDX-FileContributor: Marcin Juszkiewicz # @@ -32,34 +32,36 @@ def fetch_firmware(self): """ Flash volumes generated using: - - Fedora GNU Toolchain version 13.2.1 20230728 (Red Hat 13.2.1-1) + Toolchain from Debian: + aarch64-linux-gnu-gcc (Debian 12.2.0-14) 12.2.0 - - Trusted Firmware-A - https://github.com/ARM-software/arm-trusted-firmware/tree/7c3ff62d + Used components: + + - Trusted Firmware 2.10.2 + - Tianocore EDK2 stable202402 + - Tianocore EDK2-platforms commit 085c2fb - - Tianocore EDK II - https://github.com/tianocore/edk2/tree/0f9283429dd4 - https://github.com/tianocore/edk2/tree/ad1c0394b177 - https://github.com/tianocore/edk2-platforms/tree/d03a60523a60 """ # Secure BootRom (TF-A code) fs0_xz_url = ( - "https://fileserver.linaro.org/s/rE43RJyTfxPtBkc/" - "download/SBSA_FLASH0.fd.xz" + "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/" + "20240313-116475/edk2/SBSA_FLASH0.fd.xz" ) - fs0_xz_hash = "cdb8e4ffdaaa79292b7b465693f9e5fae6b7062d" - tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash) + fs0_xz_hash = "637593749cc307dea7dc13265c32e5d020267552f22b18a31850b8429fc5e159" + tar_xz_path = self.fetch_asset(fs0_xz_url, asset_hash=fs0_xz_hash, + algorithm='sha256') archive.extract(tar_xz_path, self.workdir) fs0_path = os.path.join(self.workdir, "SBSA_FLASH0.fd") # Non-secure rom (UEFI and EFI variables) fs1_xz_url = ( - "https://fileserver.linaro.org/s/AGWPDXbcqJTKS4R/" - "download/SBSA_FLASH1.fd.xz" + "https://artifacts.codelinaro.org/artifactory/linaro-419-sbsa-ref/" + "20240313-116475/edk2/SBSA_FLASH1.fd.xz" ) - fs1_xz_hash = "411155ae6984334714dff08d5d628178e790c875" - tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash) + fs1_xz_hash = "cb0a5e8cf5e303c5d3dc106cfd5943ffe9714b86afddee7164c69ee1dd41991c" + tar_xz_path = self.fetch_asset(fs1_xz_url, asset_hash=fs1_xz_hash, + algorithm='sha256') archive.extract(tar_xz_path, self.workdir) fs1_path = os.path.join(self.workdir, "SBSA_FLASH1.fd") @@ -96,15 +98,15 @@ def test_sbsaref_edk2_firmware(self): # AP Trusted ROM wait_for_console_pattern(self, "Booting Trusted Firmware") - wait_for_console_pattern(self, "BL1: v2.9(release):v2.9") + wait_for_console_pattern(self, "BL1: v2.10.2(release):") wait_for_console_pattern(self, "BL1: Booting BL2") # Trusted Boot Firmware - wait_for_console_pattern(self, "BL2: v2.9(release)") + wait_for_console_pattern(self, "BL2: v2.10.2(release)") wait_for_console_pattern(self, "Booting BL31") # EL3 Runtime Software - wait_for_console_pattern(self, "BL31: v2.9(release)") + wait_for_console_pattern(self, "BL31: v2.10.2(release)") # Non-trusted Firmware wait_for_console_pattern(self, "UEFI firmware (version 1.0") From patchwork Wed Mar 20 16:13:38 2024 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: 781380 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp388465wrj; Wed, 20 Mar 2024 09:15:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUBQ+yF4dqXzZ/eXd6YmpCT79QzdPP1x+ASrGP9Mjd9+X8VPJmizJD/Eai4iRc1W7JmhKldQQYd/i6HVlxmXQyg X-Google-Smtp-Source: AGHT+IFgbN+eQ9LwAXHnB75SYWdCJ3+FGhCqwWEmfGUy97eFAU08gtFgg0vWxGSvIIIayRpH8dQm X-Received: by 2002:a05:6214:14aa:b0:690:b179:9e45 with SMTP id bo10-20020a05621414aa00b00690b1799e45mr2213097qvb.38.1710951333343; Wed, 20 Mar 2024 09:15:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710951333; cv=none; d=google.com; s=arc-20160816; b=TcAUNllL5MY2Mz52Pw3o9uPXVqZYTQOfkyF+E+zcaxoB49OSFYROZ1hyjtj/ZiBkGn HTDUYJDkHMH6DhcPz+APbp0l/N9+K5S/5ySsCKb0LjX/zFFWWfiCpYz+mO57ch4Yl/NW 6GzdolCyV9GZwvC1Z2buuXizxIHvGwmLD1JjlBA0IMp0L+iryCoeTp1DJfPYXq9Akvxh zTHqSjxc36FCwNlrslNSLEGBw+rw6IdBenaD0t2ljCbrlSrt6Pxxfm5LAzMviopT8uNt eJA8GgMPc7hzR3aNhwEWeBpP9StimMAg9EcBNnznWy4jEmgc4tTHC8lB4OScUULLdKkQ pSoA== 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=OxFF+lXeHd0yKI0Ua/EbWo5MYrhYmKhteKonFtX7/6E=; fh=ClT/TuslVouDhBCaxi9No5hDhvV0DgUaJkP88VkJD/k=; b=ObXpONMAqtQljwba/BmqMUzXrPKXxL8SG+iqsP90rK2hULUntHCEEvhN3JWbbaeSD3 XrQC99ELlsCeIDZVwBPIPx+1glbFxAHrfls187PtTBjKpvkMVRFRfTkwC+F9jVTG96Lv NQhttMDp3XAdb1c8pewg1GVzck+4iy5WqsLPDe12REmaZ9shk/LsVKrYvVWK4xAIy/lW aBrHg56+tLjbQo75TGi4MNPhM1qyxaG+kDVY3c3o1apcd1egQmRMqyTyhC3w68arfb8f V6DyH1ML2EbS0meEMQkVvWIoXJAz9dm/UVIsEB8iorR1kTL4/i49x+IhpCBT+cm2lRD5 0X5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UYUusye8; 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 fn3-20020ad45d63000000b0068fea245ae7si13616793qvb.23.2024.03.20.09.15.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2024 09:15:33 -0700 (PDT) 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=UYUusye8; 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 1rmyZX-0002yi-5Q; Wed, 20 Mar 2024 12:13:47 -0400 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 1rmyZV-0002ya-V6 for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:45 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmyZU-00035M-CM for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:45 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a46db55e64fso274465566b.1 for ; Wed, 20 Mar 2024 09:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710951222; x=1711556022; darn=nongnu.org; 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=OxFF+lXeHd0yKI0Ua/EbWo5MYrhYmKhteKonFtX7/6E=; b=UYUusye8mqKGJe+0Zog8qq84r9yQSf2f8VdlNPlgqgfVTEDybf7cdKnCk3fEXsj1RY 0DQ1p0dIg/MAD6SR90FNJA+ubgt0KRZvS2b7lBt7bUsd9o0Wka4NzlRvi+q0zZcP0uuA mDrPkzF0GNlPHLGL9KruUNrK9TzD89YxNWyyNAa7eHbfcuxExNU+1orOiJgr7ZY1qkG5 OQgqYIv65JZkjBkcZYTf2EKnyvvE+dVVFcOcF1A5YlNIkRVb6F5NPWl5+S0kkpgRQDMc i/rm6YRvPODi15l5yvpXb8O+Zjij5hSZEUAM+4DwdVFmaZP+qp8+C9uGYJ5nq4pORiZX Nisg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710951222; x=1711556022; 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=OxFF+lXeHd0yKI0Ua/EbWo5MYrhYmKhteKonFtX7/6E=; b=BmnsUYBnB680I221a7wDpNCyGuHms1N26fLRLhVm6c31tEdVih/0Vw1SrtjQMhHKNo pQuft9AqSRQFgvuhENvUbz3QVEsPBlfNl8b5zdIdEh+1ogSgoy34WMg7x8qMLlWWPpl5 +m4DYsjBZb+dT/i+NLyviR3RANnQEPJIupFLWQrpyhF4JswjKN6h0BAYihmnYeFKKd8F 0u69AjajXVZZLhd4qYaK0/9c5Vs1kguY3PIowNNGhEGNKEhIADIsIqPei0UHfdQQ9wnU hX4LDln8toB2OFN9ytxZ/PY0u5Cwvo02TxNW1AAgnV7vhoPiI1juasgWfy5UvYCjqRFZ ea5g== X-Gm-Message-State: AOJu0Yw8W4SJDDxkYs1SskB9R74C5EI7VL9DIR20XLRt/TIJ5KlFCEzG dXAeEkXNtqhUvmjFQNXqoXZuI9fcc12ZfG9cq6zEinaYHtu4nfYh1gkhoHrO974= X-Received: by 2002:a17:906:1856:b0:a46:643d:9a3 with SMTP id w22-20020a170906185600b00a46643d09a3mr10914707eje.61.1710951222070; Wed, 20 Mar 2024 09:13:42 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u16-20020a1709063b9000b00a46e35bef66sm1940559ejf.219.2024.03.20.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:13:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3D7735FB8A; Wed, 20 Mar 2024 16:13:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Marcin Juszkiewicz , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Radoslaw Biernacki , Peter Maydell , Leif Lindholm , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:SBSA-REF) Subject: [PULL 3/5] tests/avocado: drop virtio-rng from sbsa-ref tests Date: Wed, 20 Mar 2024 16:13:38 +0000 Message-Id: <20240320161340.391798-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320161340.391798-1-alex.bennee@linaro.org> References: <20240320161340.391798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz sbsa-ref is supposed to emulate real hardware so virtio-rng-pci does not fit here Signed-off-by: Marcin Juszkiewicz Message-Id: <20240318-sbsa-ref-firmware-update-v3-2-1c33b995a538@linaro.org> Signed-off-by: Alex Bennée diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index cbab793455..259225f15f 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -132,10 +132,6 @@ def boot_alpine_linux(self, cpu): cpu, "-drive", f"file={iso_path},format=raw", - "-device", - "virtio-rng-pci,rng=rng0", - "-object", - "rng-random,id=rng0,filename=/dev/urandom", ) self.vm.launch() @@ -179,10 +175,6 @@ def boot_openbsd73(self, cpu): cpu, "-drive", f"file={img_path},format=raw", - "-device", - "virtio-rng-pci,rng=rng0", - "-object", - "rng-random,id=rng0,filename=/dev/urandom", ) self.vm.launch() From patchwork Wed Mar 20 16:13:39 2024 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: 781377 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp387904wrj; Wed, 20 Mar 2024 09:14:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgSW/bIUxrXK5hbt1zK7AfKv+EwpVdB2K0/ufarozvjOg9EThpZBSrvidnssjiVVV23OrQ8YVXFyTgRMenX1WK X-Google-Smtp-Source: AGHT+IFzNZQYGsABv8TbQ7bezpVVzxOynoV6lKuO5E4mm+ZzUsvAsfRpQsIVgaPXyHN40ZR2zfp1 X-Received: by 2002:a05:620a:4484:b0:788:30a5:6aaf with SMTP id x4-20020a05620a448400b0078830a56aafmr24859299qkp.52.1710951279949; Wed, 20 Mar 2024 09:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710951279; cv=none; d=google.com; s=arc-20160816; b=itmrxRDI/eQcPw0tsIFAOAuccs2Vr2wI967slEE66SkPOpdZxk00KPG+B4f59X4f+1 9Kbk5BtUH2EwsuB9pCQru523IcaaqjslGXAVbDdXPCKkXSWnsgiCJQXrktqgOd6BhPkj ewiM4SDS1faWhTQFBrBTq80RBMQyb/xtCBInbDsB94KihXeX59FuBP+1XHdISIgY91mW j2QVyanoI7c4zxBnUX7M3RHJ9XE+mU7t9kqGqYvwyU48kv30BYNTICljV6s2OQqItZPw NUcZ8ISJddYvv7o0l9bLpDGghBE41rgCiysN6e+H720fmUOZtPuycYbintDGIysKqwm3 ciRg== 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=a/x0YSZtzRIY30vUkQYvc9W5wyQ/P/3DVs+8N5NQ/6c=; fh=6U2J5omtyhaqLcqmFSctHI6Cv/ER2BdjCLTdVvmd0gE=; b=OYGyU4aGwkuIn6jA33HrIU3lh5I2hHd9r6MdBywtP+RDwhpnRdflOoEIPGuBTBqgJI TobgOcyu1+IauLU+WvQJAsDOvUnQnMWSa12eIepm67loMN8eJK2d17yaE7piSbiSpuNf 4+npp3FauvDQaIbyAGnE5ArzorLk12hv3ukyZ8fLnu15+3zK7HWgL5qozmCq/eFtjMcx +gHPsyFYA5nMzuquCEeyhsLTV3LK/gVnEz9szPNLzw/nG69Mup8okP6gB0XQdkEshkiJ toIgWVFrqGXmlnCq4EaNm0u2exs5BkRUXYcn03VcWq0JKu4xKuloFs7B7B666Lv64L/p VkPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TGPKOCVH; 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 y5-20020a05620a09c500b0078a00bb0043si6660006qky.233.2024.03.20.09.14.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2024 09:14:39 -0700 (PDT) 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=TGPKOCVH; 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 1rmyZe-00031S-S5; Wed, 20 Mar 2024 12:13:55 -0400 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 1rmyZZ-000307-TX for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:49 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmyZY-00035u-7o for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:49 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-513a08f2263so25691e87.3 for ; Wed, 20 Mar 2024 09:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710951225; x=1711556025; darn=nongnu.org; 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=a/x0YSZtzRIY30vUkQYvc9W5wyQ/P/3DVs+8N5NQ/6c=; b=TGPKOCVHBYWJhbEG7IrRl0oTnP/+Nauy/sxN7T1jC01WUzWZD+v9Leh7+jI6pgMMlT 5MzZbp7JJYB3mOLMsCT8Dtst05VtQFRbFzNJsmETCllz0HtjtDZn3yFa7WVc6EC6//Qr WQD3gX1YSRcl3/bjU7WGN0Kfi5AHn0BHn55IIUH8rC8Ho27py6C0XkfqlUFd2TCzZ6/h p1gr/IadVvd5+heG7HAjGRw3yd/lTZj7oX14JlfhvnQj/fTfAIi1SJpT+LRWkWn4nkBv xM3vxHn0+Lc0FZuiSmKjxd6b5QWcwQnOILFH/QoQbj/3HXWL+sM7HWKZogsc8Vb56gTz 47IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710951225; x=1711556025; 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=a/x0YSZtzRIY30vUkQYvc9W5wyQ/P/3DVs+8N5NQ/6c=; b=kUU5DcA0kxac8No7BRPwdGtlhELQi30H2c5Vs1lGJu6ZmLCuGbVcHBROei/RdLHgX/ 3L+C5v+2//sJYJxKhtHMUiUb7hc/36fkMj64VbxgfZFTUYWb/B/qv0mJEUWhasQWnlHr MaueywpYR25/4ni+NdDWeOUVh1PFgDGPfpC6lpWjrewjtbNlgTdbZxnSbACRBqjZX+bU xjN/rkhhnqgkNzlFGkat95jLjjBnWR6NdD1+77tEVOZknu15J5sxRw7J8ATxuBDpmlUl XCqq6rll0ueWjA28iwOuuGOops+rjyFMnWluNM1NcaOkSelm/RAAj1kIRxcDFqY0howc l3nQ== X-Gm-Message-State: AOJu0YxrDaMu3aOPrdbZ0/2Q6C5EgMqTlJ9PNa0PQyhT/Q+ZGeHKoeLq a+C+QtNathH6CGF/yftMFxVIAstGMuyTI7Dvt336pK41vwr0b+Nc2NrpfgBIfcI= X-Received: by 2002:a19:6408:0:b0:513:d32a:89e1 with SMTP id y8-20020a196408000000b00513d32a89e1mr4875122lfb.51.1710951225469; Wed, 20 Mar 2024 09:13:45 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h25-20020a17090634d900b00a46196a7faesm7416406ejb.57.2024.03.20.09.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:13:41 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 505025FB8B; Wed, 20 Mar 2024 16:13:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Marcin Juszkiewicz , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Radoslaw Biernacki , Peter Maydell , Leif Lindholm , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , qemu-arm@nongnu.org (open list:SBSA-REF) Subject: [PULL 4/5] tests/avocado: sbsa-ref: add Alpine tests for misc 'max' setup Date: Wed, 20 Mar 2024 16:13:39 +0000 Message-Id: <20240320161340.391798-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320161340.391798-1-alex.bennee@linaro.org> References: <20240320161340.391798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz PAuth makes run timeout on CI so add tests using 'max' without it and with impdef one. Signed-off-by: Marcin Juszkiewicz Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20240318-sbsa-ref-firmware-update-v3-3-1c33b995a538@linaro.org> Signed-off-by: Alex Bennée diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 259225f15f..cf8954d02e 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -140,18 +140,36 @@ def boot_alpine_linux(self, cpu): def test_sbsaref_alpine_linux_cortex_a57(self): """ :avocado: tags=cpu:cortex-a57 + :avocado: tags=os:linux """ self.boot_alpine_linux("cortex-a57") def test_sbsaref_alpine_linux_neoverse_n1(self): """ :avocado: tags=cpu:neoverse-n1 + :avocado: tags=os:linux """ self.boot_alpine_linux("neoverse-n1") + def test_sbsaref_alpine_linux_max_pauth_off(self): + """ + :avocado: tags=cpu:max + :avocado: tags=os:linux + """ + self.boot_alpine_linux("max,pauth=off") + + def test_sbsaref_alpine_linux_max_pauth_impdef(self): + """ + :avocado: tags=cpu:max + :avocado: tags=os:linux + """ + self.boot_alpine_linux("max,pauth-impdef=on") + + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_sbsaref_alpine_linux_max(self): """ :avocado: tags=cpu:max + :avocado: tags=os:linux """ self.boot_alpine_linux("max") From patchwork Wed Mar 20 16:13:40 2024 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: 781375 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp387734wrj; Wed, 20 Mar 2024 09:14:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUrSs4DZaaT8GVaZJhvDX99lIqpQWdcnW1/+UrPwLhmP6Xk8KtZP0EKaNaYN3twABPyCXqt71VXK4u382iUBjCt X-Google-Smtp-Source: AGHT+IFQpmOOtLb6Ugs4ZlToxIjpWDk0goWxh537YjwwSEYH3jK52roFIbYOlVbAayIZxtg+XC9B X-Received: by 2002:a05:622a:cb:b0:430:ef87:ee53 with SMTP id p11-20020a05622a00cb00b00430ef87ee53mr5087110qtw.49.1710951262577; Wed, 20 Mar 2024 09:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710951262; cv=none; d=google.com; s=arc-20160816; b=MxsMQ9kCbAvFCzCMlN+LylHui/PLQLxyg21lI3Gr+0RCc+3k98ngHxo60Q2AkUVjUb wuNnoPdzidK11360lsLtBdIIrVKhOijrzzMpJgceppBcub82blhEA2SUvA5KqB/HMDZ9 J21DaZHyW7Nmfe0YhY7irMjOKUStHC568EA9PKKg+qqWJRukZ5WwUSt7AonDqqc0Cxc4 AZ0VnmlO9wlacmIaQfRBNKCx5tlDMzPzWBz7cjgeGibB/vj5UJ7yXibnoRE7cekTClSo eCH3IepXyZ+g3lYtiDOm1uly5d9issztDjvvnPcEhjkPrgZMuCe9k6tCQN3CG4KnRRLv FpgA== 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=3Yct75axRVllCYvwRsbgggiBS0DJ4rQPjxub5vw7VsY=; fh=wuHpxm6/5YXoSYINoD76iswBoa4Aw4454Tvf5aJEZq8=; b=FMMS23ET4bsK88lGKu7z9CTYRZSBSY+1dcrNh8ucLMj5HB/acqqBl0UuL374n/1o88 a07Cp2Zq4xbuG7U3bRAlivfcbzIDx6b9YiF1m9aUWPoI/siPX6a0tf7ktKyIpPl2b7jb 6LzhU1IyJ1awYfbj/7ZncMnO6KBtmQfz/TYqurHJM/kvrepJ6/j6qlB11VagKfr09SB3 Wv2wQc/ZN0s2m2VZI/qn0mELYg6KVuU69KGDvcBJvt4JyAg4pkVvMLa3oAe5H1GbQow/ Mi7N9UYFPyz3lnELAnWlPC2ycR9MMFYXdBM76wdqL7cIxu9/T811JcijQq4q4KmBz0+9 oYRw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vxV9R140; 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 n12-20020a05622a11cc00b00430ce0c95b0si7422482qtk.614.2024.03.20.09.14.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2024 09:14:22 -0700 (PDT) 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=vxV9R140; 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 1rmyZe-00031O-OU; Wed, 20 Mar 2024 12:13:54 -0400 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 1rmyZb-000317-OF for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:52 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rmyZX-00035s-3w for qemu-devel@nongnu.org; Wed, 20 Mar 2024 12:13:51 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a45f257b81fso1807066b.0 for ; Wed, 20 Mar 2024 09:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710951225; x=1711556025; darn=nongnu.org; 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=3Yct75axRVllCYvwRsbgggiBS0DJ4rQPjxub5vw7VsY=; b=vxV9R140ojGixNPs1ZAjnFlMpwhVzJrJEQAgLcVLYNKW9biWAMqHQipsNoQ7/GZ/u9 Ro3KZR+Mw5dyUdX5G5bPBEqYQ4kY9W2w0GwzNSw7m0MW48M0XufSLStGoPFW/uodzBVd zBLwZ4JdPMANQX2TgBxtOAOebpZH7MRssbxUa+L0ImN1llcJ/u/BqlRIiulAteuvETsr m667nuELMAzMqvPFoh65zS/+swp86Zghaks0rNqZr5k0ndoqI84M1y5zkkVRVQvFbzOq yt2GVrXHS+EMxTcXkvQn8XlFejYIEWL63FyGfcnE1050rZGelNwIawqAnEeAgOpiSCOw NGpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710951225; x=1711556025; 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=3Yct75axRVllCYvwRsbgggiBS0DJ4rQPjxub5vw7VsY=; b=QUXnOMUz7zZPa/dHeKTGQ2neHV1o7+kL9qNSGmzSkib2Of0JTxyvznGEeGAArTeHcZ LLjFemGnl1gisiWJDRoxhDl4FFaYBNUSpfIfB64UxLBf7wkF8+YcCUncaqOM1zR8s40s d4OG4/R0sdQIUeyYsFrirqQltmOdBMaB3UMYTlwTvC9WnXeJ4Ublpgzoo2GD6PpwnoOP g2GGm256HGoN5LlB8omJJOPJ5ANV5Hl+IucYatbWqhCvZvP8KfnSyMRz692Xi2MrDNR2 ThKAMEK2CY5DkuDfPIy3UMCQaBZ6jXKDLh5BVMpfqED6OlIAmisodKZrzY3fzdtJF1Nt oQNQ== X-Gm-Message-State: AOJu0YyzDBfM8IL36qx7iuRNmiKaOtbIeRM4XKV4Xwd006KpeJXxqZSN oNXM/wpcd8IOV9+xD1dKgbhuKXAFbJwHJe85WUXXkY6zNd11b9yeB9uTUIuXQ0s= X-Received: by 2002:a17:906:2a0f:b0:a46:c8e6:b825 with SMTP id j15-20020a1709062a0f00b00a46c8e6b825mr1558635eje.26.1710951225664; Wed, 20 Mar 2024 09:13:45 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w28-20020a170907271c00b00a46acfc72a2sm4874276ejk.84.2024.03.20.09.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 09:13:42 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 631B85FB8C; Wed, 20 Mar 2024 16:13:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Marcin Juszkiewicz , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Radoslaw Biernacki , Peter Maydell , Leif Lindholm , Cleber Rosa , Wainer dos Santos Moschetta , Beraldo Leal , Brad Smith , qemu-arm@nongnu.org (open list:SBSA-REF) Subject: [PULL 5/5] tests/avocado: sbsa-ref: add OpenBSD tests for misc 'max' setup Date: Wed, 20 Mar 2024 16:13:40 +0000 Message-Id: <20240320161340.391798-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320161340.391798-1-alex.bennee@linaro.org> References: <20240320161340.391798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marcin Juszkiewicz PAuth makes run timeout on CI so add tests using 'max' without it and with impdef one. Signed-off-by: Marcin Juszkiewicz Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20240318-sbsa-ref-firmware-update-v3-4-1c33b995a538@linaro.org> Signed-off-by: Alex Bennée diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index cf8954d02e..98c76c1ff7 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -203,18 +203,36 @@ def boot_openbsd73(self, cpu): def test_sbsaref_openbsd73_cortex_a57(self): """ :avocado: tags=cpu:cortex-a57 + :avocado: tags=os:openbsd """ self.boot_openbsd73("cortex-a57") def test_sbsaref_openbsd73_neoverse_n1(self): """ :avocado: tags=cpu:neoverse-n1 + :avocado: tags=os:openbsd """ self.boot_openbsd73("neoverse-n1") + def test_sbsaref_openbsd73_max_pauth_off(self): + """ + :avocado: tags=cpu:max + :avocado: tags=os:openbsd + """ + self.boot_openbsd73("max,pauth=off") + + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') + def test_sbsaref_openbsd73_max_pauth_impdef(self): + """ + :avocado: tags=cpu:max + :avocado: tags=os:openbsd + """ + self.boot_openbsd73("max,pauth-impdef=on") + + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') def test_sbsaref_openbsd73_max(self): """ :avocado: tags=cpu:max + :avocado: tags=os:openbsd """ self.boot_openbsd73("max") -