From patchwork Fri Oct 4 02:29:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13821749 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92400CF34DD for ; Fri, 4 Oct 2024 02:30:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.809930.1222499 (Exim 4.92) (envelope-from ) id 1swY4y-0005VE-GJ; Fri, 04 Oct 2024 02:30:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 809930.1222499; Fri, 04 Oct 2024 02:30:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4y-0005UC-7B; Fri, 04 Oct 2024 02:30:04 +0000 Received: by outflank-mailman (input) for mailman id 809930; Fri, 04 Oct 2024 02:30:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4w-0004wg-Mn for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 02:30:02 +0000 Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8c202c97-81f8-11ef-99a2-01e77a169b0f; Fri, 04 Oct 2024 04:29:58 +0200 (CEST) Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id 1CBD611400EA; Thu, 3 Oct 2024 22:29:57 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Thu, 03 Oct 2024 22:29:57 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Oct 2024 22:29:55 -0400 (EDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8c202c97-81f8-11ef-99a2-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1728008996; x=1728095396; bh=OizhH49JgJ MFP9tqWTb7RhW7NtKKGQLwUXUgz3F/Jk0=; b=a+RsE5TuUBVpblgTjhOFnFpQPf HAEMuUoC0AvyugD6xkKJeqgl9d38NA97xjgihZdBBZv4yJCVXgaIpybky5T/0mDd oNSipYanV8lYZUO9OvuCAW3oaT/OM8xqtFmkx8SpADVH/stIGoK6oZOwikAEVwsg MHSy8vi3vqvF1ehlREL8bX9iCxBC/kaZJQfmjh38u/1oPPR9S3kK2xhllfxzcEsB s151sNcgY2polqRhSCZGc5UcstQXaMXgJT5KqDmv+194ebJVJAL8P1QQsfcSJHhU 9R9RsM3rFrYgGBvzEkoiZ+rVDWFjim8x7jieqodEzYYppet4IiwSR2RHTVuw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1728008996; x= 1728095396; bh=OizhH49JgJMFP9tqWTb7RhW7NtKKGQLwUXUgz3F/Jk0=; b=e nBczmOrNoucJM4nK8yIwL0Rh6DsRVmeKwmE0TI91NaKISOImMj0uXVB8ge6lfpMU o4jqxDHUvVLlQtDIihiqqLADbfy16hLqWlWFKtzLZHeyy4V84De7qnE2dt+6Nx7u Q0I6ViFFU4Eze9iDScSZC2/vP/oIyMWxPY3qYkuc6kSUWPt92YO1Xp+538wS1q+0 zoVKW1Gm4B6+AcxBZjxaKDVhZx/I/iEXVLA+Ck+D3Dt4f1IU8/rJC1wQCGeZQYfx 92MBgdzfjX7lAexAYA+oCRbIeFS/3Y86FbehxlUk+D/9tusvYrGrA5EalETDbs30 fZ8kIdouy4frKoExf6yMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvvddgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdej necuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoe hmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucgg tffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegvedute euiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpd hnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeigvghn qdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtthhope hmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhrtghp thhtoheptggrrhguohgvsegtrghrughovgdrtghomhdprhgtphhtthhopehsshhtrggsvg hllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 1/3] automation: preserve built xen.efi Date: Fri, 4 Oct 2024 04:29:37 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 It will be useful for further tests. Signed-off-by: Marek Marczykowski-Górecki --- Changes in v2: - deduplicate via collect_xen_artifacts function --- automation/scripts/build | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index b3c71fb6fb60..302feeed2eea 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -41,19 +41,29 @@ cp xen/.config xen-config # Directory for the artefacts to be dumped into mkdir -p binaries +collect_xen_artifacts() +{ + local f + for f in xen/xen xen/xen.efi; do + if [[ -f $f ]]; then + cp $f binaries/ + fi + done +} + if [[ "${CPPCHECK}" == "y" ]] && [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Cppcheck analysis invokes Xen-only build xen/scripts/xen-analysis.py --run-cppcheck --cppcheck-misra -- -j$(nproc) # Preserve artefacts - cp xen/xen binaries/xen + collect_xen_artifacts cp xen/cppcheck-report/xen-cppcheck.txt xen-cppcheck.txt elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then # Xen-only build make -j$(nproc) xen # Preserve artefacts - cp xen/xen binaries/xen + collect_xen_artifacts else # Full build. Figure out our ./configure options cfgargs=() @@ -101,5 +111,5 @@ else # even though dist/ contains everything, while some containers don't even # build Xen cp -r dist binaries/ - if [[ -f xen/xen ]] ; then cp xen/xen binaries/xen; fi + collect_xen_artifacts fi From patchwork Fri Oct 4 02:29:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 13821751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C054CF34DE for ; Fri, 4 Oct 2024 02:30:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.809932.1222511 (Exim 4.92) (envelope-from ) id 1swY4z-0005js-2G; Fri, 04 Oct 2024 02:30:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 809932.1222511; Fri, 04 Oct 2024 02:30:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4y-0005hJ-Px; Fri, 04 Oct 2024 02:30:04 +0000 Received: by outflank-mailman (input) for mailman id 809932; Fri, 04 Oct 2024 02:30:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4x-00056c-D8 for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 02:30:03 +0000 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8d0a27af-81f8-11ef-a0ba-8be0dac302b0; Fri, 04 Oct 2024 04:30:00 +0200 (CEST) Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.stl.internal (Postfix) with ESMTP id A089125400BE; Thu, 3 Oct 2024 22:29:58 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Thu, 03 Oct 2024 22:29:58 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Oct 2024 22:29:57 -0400 (EDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8d0a27af-81f8-11ef-a0ba-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1728008998; x=1728095398; bh=UUSX/6jdgQ dvcUrZZczumy32nQDsNtQu974vvHbh+9w=; b=UwVqcwIah+Til0lEJD2Mn/rfg+ oGVgi9k7Twgd9RPoVUHLx70I/Xuoxr0vVgJlkG+bMpQviqjHQjFllr4Mjhzn66d+ 4S+6fkEb/tUb+RtXj9mhN04Bn9kyZIgVjbNpQXWvIJtwVpokdISNrtbjMgMb7lz3 ErH80KCcboNMYxe3M7ZRXWModJ2R3x3QwMHqbA2lLaiOutelwmyZMVFI/k9Kmq2C 1/ZeYL2XuHqq+fFuKSnjgvNP4WLVd9HftjIJsYYvNS8qgiqYMr21+KI/a1ESfc3g ft3797B54bD6CGevtlNtQkOd3Subf9/vZKGyzPm3nglcPXd/G40kBWcO1UYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1728008998; x= 1728095398; bh=UUSX/6jdgQdvcUrZZczumy32nQDsNtQu974vvHbh+9w=; b=K 5gCq8x+UDosa6RCWjodXJYQ24lJOe8hWCrThJ81THUKvM1mv+J6RCKqsmKx1U7SK dZ+hbWpippIgUFCvj+lzgc4t7mqyYVKKerzwFwKdGYUYBLcGFGfERTzkOyyXq7L/ hbx3TmKpR9u2C2SzPdXHvWsCL24iAmrFJJa3UG3GlJ/9FusPwdaRd6v8C9JiB4Y5 9jGB1+q+ZD8Jjy+m69ASaM7d3ejLdndtlSZIhmPbkNYWtSepFOmc89Jg8lyhb9p9 orkSbKzvYyYQtK3bBW/u2edPx+zftN9zFROP2SiKYS872s9gN7/L1+qA1sv8CiVb HuVoraTtHqSyOEevEW4fg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvvddgiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdej necuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoe hmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucgg tffrrghtthgvrhhnpeekieettdeivdevhffgtdduveetveejheevgedtheevhefghfefgf ekkeefudekffenucffohhmrghinhepgigvnhdrohhrghenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisg hlvghthhhinhhgshhlrggsrdgtohhmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhm thhpohhuthdprhgtphhtthhopeigvghnqdguvghvvghlsehlihhsthhsrdigvghnphhroh hjvggtthdrohhrghdprhgtphhtthhopehmrghrmhgrrhgvkhesihhnvhhishhisghlvght hhhinhhgshhlrggsrdgtohhmpdhrtghpthhtoheptggrrhguohgvsegtrghrughovgdrtg homhdprhgtphhtthhopehsshhtrggsvghllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 2/3] automation: add a smoke test for xen.efi on X86 Date: Fri, 4 Oct 2024 04:29:38 +0200 Message-ID: <6114373e9513b531af06d7e1e34ead90eedf02d3.1728008940.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Check if xen.efi is bootable with an XTF dom0. The multiboot2+EFI path is tested on hardware tests already. Signed-off-by: Marek Marczykowski-Górecki --- This requires rebuilding debian:bookworm container. Changes in v2: - drop forcing TEST_TIMEOUT in the script - now can be set from test.yml when needed; and move actually reducing timeout to separate commit --- automation/build/debian/bookworm.dockerfile | 1 +- automation/gitlab-ci/test.yaml | 7 ++++- automation/scripts/qemu-smoke-x86-64-efi.sh | 43 ++++++++++++++++++++++- 3 files changed, 51 insertions(+) create mode 100755 automation/scripts/qemu-smoke-x86-64-efi.sh diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index 3dd70cb6b2e3..061114ba522d 100644 --- a/automation/build/debian/bookworm.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -46,6 +46,7 @@ RUN apt-get update && \ # for test phase, qemu-smoke-* jobs qemu-system-x86 \ expect \ + ovmf \ # for test phase, qemu-alpine-* jobs cpio \ busybox-static \ diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index e9477361955a..5687eaf9143d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -463,6 +463,13 @@ qemu-smoke-x86-64-clang-pvh: needs: - debian-bookworm-clang-debug +qemu-smoke-x86-64-gcc-efi: + extends: .qemu-x86-64 + script: + - ./automation/scripts/qemu-smoke-x86-64-efi.sh pv 2>&1 | tee ${LOGFILE} + needs: + - debian-bookworm-gcc-debug + qemu-smoke-riscv64-gcc: extends: .qemu-riscv64 script: diff --git a/automation/scripts/qemu-smoke-x86-64-efi.sh b/automation/scripts/qemu-smoke-x86-64-efi.sh new file mode 100755 index 000000000000..7572722be6e5 --- /dev/null +++ b/automation/scripts/qemu-smoke-x86-64-efi.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +set -ex -o pipefail + +# variant should be either pv or pvh +variant=$1 + +# Clone and build XTF +git clone https://xenbits.xen.org/git-http/xtf.git +cd xtf && make -j$(nproc) && cd - + +case $variant in + pvh) k=test-hvm64-example extra="dom0-iommu=none dom0=pvh" ;; + *) k=test-pv64-example extra= ;; +esac + +mkdir -p boot-esp/EFI/BOOT +cp binaries/xen.efi boot-esp/EFI/BOOT/BOOTX64.EFI +cp xtf/tests/example/$k boot-esp/EFI/BOOT/kernel + +cat > boot-esp/EFI/BOOT/BOOTX64.cfg < X-Patchwork-Id: 13821750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 675ABCF34DF for ; Fri, 4 Oct 2024 02:30:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.809931.1222505 (Exim 4.92) (envelope-from ) id 1swY4y-0005cv-Oy; Fri, 04 Oct 2024 02:30:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 809931.1222505; Fri, 04 Oct 2024 02:30:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4y-0005ag-H6; Fri, 04 Oct 2024 02:30:04 +0000 Received: by outflank-mailman (input) for mailman id 809931; Fri, 04 Oct 2024 02:30:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1swY4w-0004wg-Th for xen-devel@lists.xenproject.org; Fri, 04 Oct 2024 02:30:02 +0000 Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8df03d1d-81f8-11ef-99a2-01e77a169b0f; Fri, 04 Oct 2024 04:30:01 +0200 (CEST) Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 2C2ED11400EA; Thu, 3 Oct 2024 22:30:00 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Thu, 03 Oct 2024 22:30:00 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 3 Oct 2024 22:29:58 -0400 (EDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8df03d1d-81f8-11ef-99a2-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1728009000; x=1728095400; bh=q7xGTN37Al 8UjpHCPbgwMdAd2LdqV8NjdJmY0wCHOpU=; b=Mu1m8qc9ZrhiYmDCQlhY8ZXK1T OQXQusda0wFU9dQjIo6zKyJ7KOVzmoIPesh/Q93ItchsOjXCgLv6un/lU99nb+b6 mH9q1AJ0otT1kSxhZ0cLvjHlzwNOkRpijHgd7kZ1ctkyvUNKWNSC2j0rScVVpZB7 YxeHqR36rGsjO9HuJxdTJbR1SwxPbVvJyv3BZQcMRQHfwEuOQVStc/CeQnW+uivf NirbiYAayG6C8Rba8VYNegg3WYIxpO1SzOl24LBmUNTC0kgySMsx2nwFvljBEJ2t IXyOotCIscVC1KABEwHdRhZ0427B1A6x3kOgYF7FgMxO86+J6OkqKZx25+qg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1728009000; x= 1728095400; bh=q7xGTN37Al8UjpHCPbgwMdAd2LdqV8NjdJmY0wCHOpU=; b=b ncGC3KJVtOgyjc0MtsfFf320ptIlrthXSYqP784fj2rLLrxvLISWKdTyYG3eUsLe eUfJoitx4+IECM+mlAdRsmTZ4ofTCijPX87A2Gl2icsIubdFhFJCPd1VHztTW0Z8 f2xHrFeptmfbnQoHQv3MClR3JssUDIVMaQvwnlmzOl+UPmCevCjbI3M137YvV9wG jBrHy6r6bdOdFF6cT8TT7aSz8ePqRpChfWZRfZt3PiJ/V3qj5lIT3gdJyqAQyRej duiqwxcawnduZfAcjLGuD4+JH9xGzuVy9huo1RJzB2X6t52finUai6b9OcEgQN4f pp1MXeovdxBYDJ0sOGFYQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvvddgieduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdej necuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoe hmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucgg tffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegvedute euiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpd hnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeigvghn qdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtthhope hmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhrtghp thhtoheptggrrhguohgvsegtrghrughovgdrtghomhdprhgtphhtthhopehsshhtrggsvg hllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 3/3] automation: shorten the timeout for smoke tests Date: Fri, 4 Oct 2024 04:29:39 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 The smoke tests when successful complete in about 5s. Don't waste 20min+ on failure, shorten the timeout to 120s Signed-off-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/test.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 5687eaf9143d..b27c2be17487 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -53,6 +53,11 @@ tags: - x86_64 +.qemu-smoke-x86-64: + extends: .qemu-x86-64 + variables: + TEST_TIMEOUT_OVERRIDE: 120 + .qemu-riscv64: extends: .test-jobs-common variables: @@ -436,35 +441,35 @@ qemu-alpine-x86_64-gcc: - alpine-3.18-gcc qemu-smoke-x86-64-gcc: - extends: .qemu-x86-64 + extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - debian-bookworm-gcc-debug qemu-smoke-x86-64-clang: - extends: .qemu-x86-64 + extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - debian-bookworm-clang-debug qemu-smoke-x86-64-gcc-pvh: - extends: .qemu-x86-64 + extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - debian-bookworm-gcc-debug qemu-smoke-x86-64-clang-pvh: - extends: .qemu-x86-64 + extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - debian-bookworm-clang-debug qemu-smoke-x86-64-gcc-efi: - extends: .qemu-x86-64 + extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64-efi.sh pv 2>&1 | tee ${LOGFILE} needs: