From nobody Fri Oct 31 23:23:02 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 1744781572443909.7121350955879; Tue, 15 Apr 2025 22:32:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.954993.1348869 (Exim 4.92) (envelope-from ) id 1u4vO5-0004PM-Hb; Wed, 16 Apr 2025 05:32:41 +0000 Received: by outflank-mailman (output) from mailman id 954993.1348869; Wed, 16 Apr 2025 05:32:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4vO5-0004PF-Ef; Wed, 16 Apr 2025 05:32:41 +0000 Received: by outflank-mailman (input) for mailman id 954993; Wed, 16 Apr 2025 05:32:39 +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 1u4vO3-0003si-Tg for xen-devel@lists.xenproject.org; Wed, 16 Apr 2025 05:32:39 +0000 Received: from mail-4316.protonmail.ch (mail-4316.protonmail.ch [185.70.43.16]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 355c522c-1a84-11f0-9ffb-bf95429c2676; Wed, 16 Apr 2025 07:32:38 +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: 355c522c-1a84-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1744781557; x=1745040757; bh=AsC8FP7AN+giDJPs6/iyPqqQiNrqpgVGQhnG1yoYCi4=; 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=JEnZLa2M9kZ7soG75K1Uzov1+P2hkyjZ2r8d3F85XNMLwvU+WmGZtPrqQxO61+zO4 VVOyamDrDcUmTCb8y7KA9EHJRCkA4nHoqy61a1LSSwr7Hj+IGPjv8u0yRXMcnlodd0 kEFH9kVmeyl2EmQCvnZe8yDYs7fGqHXGGwmiDqWYG18R3xFxSEKSitfCRkq4f9JG7b 970oH1mHTjcz6H85ddUD+MfJEVXCXP0HnKjELaaucbBxVKWuiL9FeNhZQNbZ2Yvgea ix35DdFOtqJeIbKIcAThmuJv8lV0n67BKmHLKXPsGb4nwogu9/E21MIsv3Y7SSfhQX 5Ibqk7U5YAH1A== Date: Wed, 16 Apr 2025 05:32:31 +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 v1 2/4] CI: switch x86 EFI smoke test runner to qemu-xtf.sh Message-ID: <20250416053213.921444-3-dmukhin@ford.com> In-Reply-To: <20250416053213.921444-1-dmukhin@ford.com> References: <20250416053213.921444-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: d9a5239f7accab34cab2f853694de4d8faec8406 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1744781575926019100 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 --- 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..79622d5a6c --- /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_CONSOLE=3D"${XEN_CONSOLE:-com1}" + 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 <