From nobody Fri Oct 31 23:30:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=proton.me Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1745024673691233.5027032085336; Fri, 18 Apr 2025 18:04:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.959751.1352033 (Exim 4.92) (envelope-from ) id 1u5wch-00016D-LW; Sat, 19 Apr 2025 01:03:59 +0000 Received: by outflank-mailman (output) from mailman id 959751.1352033; Sat, 19 Apr 2025 01:03:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u5wch-000166-Ig; Sat, 19 Apr 2025 01:03:59 +0000 Received: by outflank-mailman (input) for mailman id 959751; Sat, 19 Apr 2025 01:03:58 +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 1u5wcg-0000dd-Gq for xen-devel@lists.xenproject.org; Sat, 19 Apr 2025 01:03:58 +0000 Received: from mail-24416.protonmail.ch (mail-24416.protonmail.ch [109.224.244.16]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2b6eadf7-1cba-11f0-9ffb-bf95429c2676; Sat, 19 Apr 2025 03:03:56 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 2b6eadf7-1cba-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=suphjhcguffetgdy2q7waelgwe.protonmail; t=1745024635; x=1745283835; bh=HfwyqHc65a2c6fDlXXG5iL28PrCHMVj+m8sxLB9s/3E=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=U02Fc05+VSwdhZCmk8u6uqjSh+P8wH+5MNipgM0MTeSTWplXoiufaw88OilNT/lXI UNikoAnadt+t0/oO/Uvpqowitq1nf2WIjc223hN5Bn7X6L2w6wprP/9l5qFiRU+zGc WPl5YSZprgVHlKq0KnaKoudIdt94bNUQIZ7v8VTAwHH0O5XJcwt+ZOr6vOIvSOA5CF oy0MaQ2RuraL5RiRoQaA23d9hMfnFUkxW1T7gHS56AW0pKsslEjeNsakigrl/aLcGh YXJKXgAoBIk5kF/J7lCoTJPg96VGOmhdz25MAvBpbTAMDr+egcKmSumtT0dmoho1Z5 TFztuO77Vie8w== Date: Sat, 19 Apr 2025 01:03:51 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: andrew.cooper3@citrix.com, cardoe@cardoe.com, marmarek@invisiblethingslab.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v2 2/4] CI: switch x86 EFI smoke test runner to qemu-xtf.sh Message-ID: <20250419010319.2572518-3-dmukhin@ford.com> In-Reply-To: <20250419010319.2572518-1-dmukhin@ford.com> References: <20250419010319.2572518-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: b251f973a9d426487d883a84237249e3db943fe0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1745024675947019000 Content-Type: text/plain; charset="utf-8" From: Denis Mukhin Use qemu-xtf.sh for qemu-smoke-x86-64-gcc-efi job. Lead time is reduced a bit since not all XTF code base is built, just the required test. Signed-off-by: Denis Mukhin --- Changes since v2: - removed TOP - dropped XEN_CONSOLE in favor of XEN_CMDLINE --- automation/gitlab-ci/test.yaml | 2 +- .../include/configs/xtf-x86-64-efi-config | 0 automation/scripts/include/xtf-x86-64-efi | 52 +++++++++++++++++++ automation/scripts/qemu-smoke-x86-64-efi.sh | 43 --------------- 4 files changed, 53 insertions(+), 44 deletions(-) create mode 100644 automation/scripts/include/configs/xtf-x86-64-efi-config create mode 100644 automation/scripts/include/xtf-x86-64-efi delete mode 100755 automation/scripts/qemu-smoke-x86-64-efi.sh diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 3adc841335..ca1e4eb528 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -687,7 +687,7 @@ qemu-smoke-x86-64-clang-pvh: qemu-smoke-x86-64-gcc-efi: extends: .qemu-smoke-x86-64 script: - - ./automation/scripts/qemu-smoke-x86-64-efi.sh pv 2>&1 | tee ${LOGFIL= E} + - ./automation/scripts/qemu-xtf.sh x86-64-efi hvm64 example 2>&1 | tee= ${LOGFILE} needs: - debian-12-x86_64-gcc-debug =20 diff --git a/automation/scripts/include/configs/xtf-x86-64-efi-config b/aut= omation/scripts/include/configs/xtf-x86-64-efi-config new file mode 100644 index 0000000000..e69de29bb2 diff --git a/automation/scripts/include/xtf-x86-64-efi b/automation/scripts= /include/xtf-x86-64-efi new file mode 100644 index 0000000000..e0d821b3f6 --- /dev/null +++ b/automation/scripts/include/xtf-x86-64-efi @@ -0,0 +1,52 @@ +#!/bin/bash +# +# XTF test utilities (x86_64, EFI). +# + +# Arch-specific environment overrides. +function xtf_arch_prepare() +{ + export FW_PREFIX=3D"${FW_PREFIX:-/usr/share/OVMF/}" + export QEMU_PREFIX=3D"${QEMU_PREFIX:-}" + export XEN_BINARY=3D"${XEN_BINARY:-${WORKDIR}/xen.efi}" + export XEN_CMDLINE=3D"${XEN_CMDLINE:-loglvl=3Dall noreboot console_tim= estamps=3Dboot console=3Dcom1}" + export XTF_SRC_BRANCH=3D"${XTF_SRC_BRANCH:-master}" + export XTF_SRC_URI=3D"${XTF_SRC_URI:-https://xenbits.xen.org/git-http/= xtf.git}" + export XTF_SRC_VARIANTS=3D"hvm64 pv64" +} + +# Perform arch-specific XTF environment setup. +function xtf_arch_setup() +{ + local esp_dir=3D"${WORKDIR}/boot-esp" + local efi_dir=3D"${esp_dir}/EFI/BOOT" + + # Generate EFI boot environment + mkdir -p ${efi_dir} + cp ${XEN_BINARY} ${efi_dir}/BOOTX64.EFI + cp ${XTF_BINARY} ${efi_dir}/kernel + + cat > ${efi_dir}/BOOTX64.cfg < boot-esp/EFI/BOOT/BOOTX64.cfg <