From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628975; cv=none; d=zohomail.com; s=zohoarc; b=U5rHbcNt64aj4I7ujFDgu0lvymQ7gxWor7MowLrOW/Xc7l2G0XjKcTNeu8JVjXXxgkhOiwDOynnDUFRX+RDAzRuIogRjNLffHkepAV+M4coa4+pI1lnmnWpaXwgUDfk+KtFO9gyMJ2WArYCo4Mcg4s0W+d4OdveEwc8/0N6T5NU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628975; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wBsbtJWmb5Zjdqx5uqaCyBE8HBftWoPnuYYOOu+JrK4=; b=YxzDLFbIqWJeDRHADv3PqGyrRUy3Yv2+ytgI20S2qkcc1xkiq0ZPnyAldItaOpDwGu68EKGXMKqEHnAJidzWGs4aVwjx/ph/A4TeY3lxzvhAR5TnE4fSj/1k/+jSyQ0wMlGFIXjoiHKTpZl7jpZo9O3CCiLJm3yFrDfNb4aj+5o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628974564341.2227132481711; Mon, 14 Apr 2025 04:09:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949711.1346185 (Exim 4.92) (envelope-from ) id 1u4Hgc-0000Pp-Cd; Mon, 14 Apr 2025 11:09:10 +0000 Received: by outflank-mailman (output) from mailman id 949711.1346185; Mon, 14 Apr 2025 11:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgc-0000P1-6e; Mon, 14 Apr 2025 11:09:10 +0000 Received: by outflank-mailman (input) for mailman id 949711; Mon, 14 Apr 2025 11:09:08 +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 1u4Hga-0000MU-Nw for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:08 +0000 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [2a00:1450:4864:20::334]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e220a06e-1920-11f0-9eae-5ba50f476ded; Mon, 14 Apr 2025 13:09:07 +0200 (CEST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso47883105e9.3 for ; Mon, 14 Apr 2025 04:09:07 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:05 -0700 (PDT) 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: e220a06e-1920-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628946; x=1745233746; darn=lists.xenproject.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=wBsbtJWmb5Zjdqx5uqaCyBE8HBftWoPnuYYOOu+JrK4=; b=K7aXmDmdfjApTyw7xTUEavAFIsO/4b1tGBpc8NQzCloYdKyI55RGk2Hap00hPEzzNk hrsBoE27fv0dJYEEwYK2P344UY0HTYFVcRSj7WgjgioUCS27D4aj8KlpPrVP1ZoomMJf 0KPhNRKCNuoTkZZrWW0XLCuvVFJrpIfR5NvqY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628946; x=1745233746; 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=wBsbtJWmb5Zjdqx5uqaCyBE8HBftWoPnuYYOOu+JrK4=; b=f7L0nPphXVWBofrwuzs000Rpgw568xHkafhVrjxEViokVn7Y47elC84JCz39ppihou LTAmZC7BQ5Wc6EJ+TI0FXz+VR+kccDMctyy1rRmQyQZIMRicm4Ww3QivTwoJLzQpGi9H mJkwGyfqFlKE9cxyV1krVmnUdc0m55hAI3P0DqrfJNn8mduXaqS0qWOAbHnn9fNEGhjE NdbifAMYvOEXSkx3gWE6It7aO4kaeVVQN0yFBlypGmw357d5KYWfa1vyP8yLE+J3UIaS FrwBNFoFe6MXk0q0iE1LRA89xhPA5k7ac663K4DKoMkAV0VuIqMJfTZ8jpO5XXjUo/Hk RcTQ== X-Gm-Message-State: AOJu0YwtPidPi+wRoEa868zyNbrP2gpqRkZF4aj7R19NK1js/LUPKOeC 3l6hvZ6GQV6QBRBlVN8RD8vT7B5LFsCdZJNCrUTxwdD1g9GOlmsIb+NJt9h4YtGS1httlvnMT5w CknM= X-Gm-Gg: ASbGncscMhASDKVZuyk35YS9ydmcXCNem5CFzGLeFBAa/RXfKh259vPJzN47M/jq/8D Ze8HVsqsnruYfR387jkHDJXz0gBYOdteMNpbhxXaPD//xKACT3tfXWDXbl6DE1ahp05rCT7g096 kba00eT09npyeyWuDO6Ti5m6O5DlkMdJN9egKr+RBDevr0aXZMZ7cDTzdDj8ohYZlcBMB15HTWw IzIEmSyKsKF0+zAYLn6UzNcDHlV/x4JT26ezpXEqwfhF1sphPRB8hx0WugcTmjcNd2mN4tjSmUF ur+4b69q9/VajeW2zaACDL332CSFP6leRlZwIGE0vSlNZWSEIEKm5F7uKBnbgBznrhxcy0EWW6m Fsx67CWMITwnfMw== X-Google-Smtp-Source: AGHT+IGRrOJO2/s0qdC9+UYnzuhqfQU7WPJnHgdOGp2ljp2CYzPrhmFz5zMHaZtxGrbYYkmHkcz7Aw== X-Received: by 2002:a05:600c:83c6:b0:439:643a:c8d5 with SMTP id 5b1f17b1804b1-43f3a7db13dmr114462585e9.0.1744628946440; Mon, 14 Apr 2025 04:09:06 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH v3 1/6] CI: Rename intermediate artefacts in qemu-* scripts Date: Mon, 14 Apr 2025 12:08:58 +0100 Message-Id: <20250414110903.2355303-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628977787019100 Right now, we have initrd.cpio.gz as domU, and initrd.tar.gz as the base for dom0. Rename initrd.cpio.gz to domU-rootfs.cpio.gz, and xen-rootfs.cpio.gz to dom0-rootfs.cpio.gz to make it clearer which is which. Rename the VM from test to domU. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki v3: * New https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1765822634 --- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++++++-------- automation/scripts/qemu-smoke-dom0-arm64.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/= qemu-alpine-x86_64.sh index 89bdb4df7dac..569bd766d31e 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format=3D'newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. =20 # initrd.tar.gz is Dom0 rootfs @@ -38,15 +38,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root -echo "name=3D\"test\" +echo "name=3D\"domU\" memory=3D512 vcpus=3D1 kernel=3D\"/root/bzImage\" -ramdisk=3D\"/root/initrd.cpio.gz\" +ramdisk=3D\"/root/domU-rootfs.cpio.gz\" extra=3D\"console=3Dhvc0 root=3D/dev/ram0 rdinit=3D/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash =20 set -x @@ -56,13 +56,13 @@ bash /etc/init.d/xencommons start =20 xl list =20 -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg =20 " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=3Dyes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. =20 cat >> binaries/pxelinux.0 << EOF @@ -70,7 +70,7 @@ cat >> binaries/pxelinux.0 << EOF =20 kernel xen console=3Dcom1 console_timestamps=3Dboot module bzImage console=3Dhvc0 -module xen-rootfs.cpio.gz +module dom0-rootfs.cpio.gz boot EOF =20 diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scrip= ts/qemu-smoke-dom0-arm64.sh index 51d037b0003e..e8e49ded245a 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format=3D'newc' | gzip > ../initrd.cpio.gz +find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. =20 mkdir -p rootfs @@ -36,15 +36,15 @@ mkdir srv mkdir sys rm var/run cp -ar ../dist/install/* . -mv ../initrd.cpio.gz ./root +mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root -echo "name=3D\"test\" +echo "name=3D\"domU\" memory=3D512 vcpus=3D1 kernel=3D\"/root/Image\" -ramdisk=3D\"/root/initrd.cpio.gz\" +ramdisk=3D\"/root/domU-rootfs.cpio.gz\" extra=3D\"console=3Dhvc0 root=3D/dev/ram0 rdinit=3D/bin/sh\" -" > root/test.cfg +" > root/domU.cfg echo "#!/bin/bash =20 export LD_LIBRARY_PATH=3D/usr/local/lib @@ -52,12 +52,12 @@ bash /etc/init.d/xencommons start =20 xl list =20 -xl -vvv create -c /root/test.cfg +xl -vvv create -c /root/domU.cfg =20 " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=3Dyes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz cd ../.. =20 # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded @@ -78,7 +78,7 @@ MEMORY_END=3D"0xC0000000" DEVICE_TREE=3D"virt-gicv2.dtb" XEN=3D"xen" DOM0_KERNEL=3D"Image" -DOM0_RAMDISK=3D"xen-rootfs.cpio.gz" +DOM0_RAMDISK=3D"dom0-rootfs.cpio.gz" XEN_CMD=3D"console=3Ddtuart dom0_mem=3D1024M console_timestamps=3Dboot" =20 NUM_DOMUS=3D0 --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628961; cv=none; d=zohomail.com; s=zohoarc; b=cY79k4JglBUl6KnstzBHbNdEOZt+Rlxd10oU5u5jxOIb+Hxqa5+p9M555VzwE1Z9eM92cDNV+Xv6nph6ZzbwTAfFc1IiHGOMElIqHqiTNUpnANqM8hILp1MVxmr/ke4llPT3oghloybOQ0Wd0DO7xhovG5iquK+lHZnWHYwHli4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628961; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bcs0mTf05pW6RsmqLWTa0rpSF3biapjjXDW/JQKGWb0=; b=QfWaYTx0FEb5i+vKSj4DF/DWKEDww60YLAgQFdsvzRYwxDorYI+ZFox2gwB8S95Ox63rhY+Wg8lhKf7VOGUe3KA4122LPheb4oVzFadP5fu/8mSjuCy3rjHtH3GA6qrPeyj0TDZism9AOgh8ZftejmidxTdg9xizIITq2KcADQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628961337564.9031242674947; Mon, 14 Apr 2025 04:09:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949712.1346193 (Exim 4.92) (envelope-from ) id 1u4Hgc-0000UH-Lu; Mon, 14 Apr 2025 11:09:10 +0000 Received: by outflank-mailman (output) from mailman id 949712.1346193; Mon, 14 Apr 2025 11:09:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgc-0000S2-EW; Mon, 14 Apr 2025 11:09:10 +0000 Received: by outflank-mailman (input) for mailman id 949712; Mon, 14 Apr 2025 11:09:09 +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 1u4Hgb-0000MU-DQ for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:09 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e31b2929-1920-11f0-9eae-5ba50f476ded; Mon, 14 Apr 2025 13:09:09 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-39c30d9085aso2479598f8f.1 for ; Mon, 14 Apr 2025 04:09:08 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:06 -0700 (PDT) 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: e31b2929-1920-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628948; x=1745233748; darn=lists.xenproject.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=bcs0mTf05pW6RsmqLWTa0rpSF3biapjjXDW/JQKGWb0=; b=SVPckvHlozuZ/+7j/W06TA5YvWS8qtW4XpxFkTGZvU5fxfa/ArP7hxuonGF3gMP0vP byZwyJxI4WApi8zfJNB2Q5SktHSE6eo8JmDNIHMYqmPUUu6P78iMFf8c1ZSsFAe3j+em k8qZbaVRDFjL6azg4hHMxy98mZC5UCNqBpmqs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628948; x=1745233748; 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=bcs0mTf05pW6RsmqLWTa0rpSF3biapjjXDW/JQKGWb0=; b=uzM+0Mm6B2Am0Rmmg1p5bGPzCmB68Jxr7v5RxL6fTzWdQ627We81s8XHnWlNEZO8D/ udt8zpC5wrnaJJJQzbhsCY1RcZ+5bLTfK7NLgaw81axaviHOI3Q3BXhO1+AnT2Lt0AU3 v3S2Y4fnEgm6dQQqLAMpXwCuIX9m8WvgYlmaQbzDXkfoOdxrqwuAS/iO/kqAW9q3cwp4 jf1im3cY82q7LbdyVy6i8MlDRjfilO/dkkyDBFUAWtlCxowiP/GlWPQGv3ghQ/fIxBs2 jq5qpE8ARGCwtMcN7Uqk6bHqcmuh5OihquJBVZxMVkslyva4kK0XZJ5Ryc/qEYr3fKAJ CU8w== X-Gm-Message-State: AOJu0YyGznQwRyh3mzYUJwcytIu5ukbBARWCT/lxZeq3X7q8nBVT5xSl ca+AWHbkJsmJEF2CPtDcBIThXrS+T+lxRv1ftTQdm2a+B2y/xKOJE9sZ/G9AFUfUwYw3gGDwWqq lKjU= X-Gm-Gg: ASbGncucxAGTHm41UkQQpURQ/JE/9m5T3oHShQQX49nQqPOpv0nk3sUY3XWQ2H+PJCT fShsDZhxkSXJQYfprfgsNvAiR66a6QmhqurDz8QQKeGRGPYaLuvE40RoPHB3zGIEa1YI6mMcNdE IWwPEQjTlM/nEE9Dks2pdvm494UhX5ijw3O2TEE776bXDdSfzoR96+7jQc7SZ/Jii8ljnsgza6m LBqCRTo4Hdwk3x7RgLojBRmG2vrPJ9/KneW1rKFY8SvzJoi61XYDVoTgya5kVR9tLOqHMXbdMs3 h5b8fQsdlMAZ64xQt+7Zs7mCcOu7zgMK1BLxam73BYI61zbpKLDMLObIveYcKQzkx2GxiMwcIX8 H+D44MbqrK+gLMQ== X-Google-Smtp-Source: AGHT+IHtaAmj4fRrSlvKNznngr25ISRl0Roii0RJOq2qhjEzvgcD98P9wOdKRiTnBj/DSjmDt9NCcw== X-Received: by 2002:a5d:584f:0:b0:39c:1257:c7a2 with SMTP id ffacd0b85a97d-39eaaecae92mr9048984f8f.58.1744628948004; Mon, 14 Apr 2025 04:09:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein Subject: [PATCH v3 2/6] CI: avoid repacking initrd as part of the test job Date: Mon, 14 Apr 2025 12:08:59 +0100 Message-Id: <20250414110903.2355303-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628963406019100 From: Marek Marczykowski-G=C3=B3recki Use the new test-artifacts which provide rootfs.cpio.gz rather than initrd.tar.gz. rootfs.cpio.gz also has all the necessary top-level directories, and includes the rc_verbose setting, so these modifications can be dropped. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. For xilinx-smoke-dom0-x86_64.sh, this involves instructing grub not to unzip the archive, as doing so corrupts it. Signed-off-by: Marek Marczykowski-G=C3=B3recki Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki v3: * Tested (bugfixed) on xilinx-* runners * Rearrange logic so the order of concantination is clearer (relevant for subsequent patches) https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1765676583 --- automation/gitlab-ci/test.yaml | 8 +++-- automation/scripts/qemu-alpine-x86_64.sh | 16 ++++------ automation/scripts/qemu-smoke-dom0-arm64.sh | 14 ++++---- .../scripts/qemu-smoke-dom0less-arm64.sh | 15 ++++----- automation/scripts/qubes-x86-64.sh | 32 +++++++------------ .../scripts/xilinx-smoke-dom0-x86_64.sh | 27 ++++++++-------- .../scripts/xilinx-smoke-dom0less-arm64.sh | 30 +++++++---------- 7 files changed, 61 insertions(+), 81 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c864..51229cbe561d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export =20 .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master =20 .qemu-arm64: @@ -243,7 +245,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: job: x86_64-kernel-linux-6.6.56 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master - project: xen-project/hardware/test-artifacts job: x86_64-argo-linux-6.6.56 diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/= qemu-alpine-x86_64.sh index 569bd766d31e..c7dd12197862 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. =20 -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root echo "name=3D\"domU\" @@ -60,9 +58,7 @@ xl -vvv create -c /root/domU.cfg =20 " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf -# rebuild Dom0 rootfs -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. =20 cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scrip= ts/qemu-smoke-dom0-arm64.sh index e8e49ded245a..c0cf61ff8f7b 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,15 +27,14 @@ cd initrd find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. =20 +# Dom0 rootfs +cp rootfs.cpio.gz dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root echo "name=3D\"domU\" @@ -56,8 +55,7 @@ xl -vvv create -c /root/domU.cfg =20 " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. =20 # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/s= cripts/qemu-smoke-dom0less-arm64.sh index f72d20936181..8e939f0b7214 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -114,16 +114,14 @@ cd initrd find . | cpio --create --format=3D'newc' | gzip > ../binaries/initrd cd .. =20 -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d =20 echo "#!/bin/bash =20 @@ -142,8 +140,7 @@ xl network-attach 1 type=3Dvif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index c4be71464246..e2376cb51cb4 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -164,16 +164,13 @@ ${domU_extra_config} " =20 if [ -n "$domU_check" ]; then - # DomU + # DomU rootfs + cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + + # test-local configuration mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman conta= iner - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz - mkdir proc - mkdir run - mkdir srv - mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh =20 echo 8 > /proc/sys/kernel/printk @@ -181,26 +178,22 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=3Dyes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) =20 " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../bina= ries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi =20 -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz -mkdir boot -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +230,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg =20 -echo "rc_verbose=3Dyes" >> etc/rc.conf echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +237,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries= /dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 =20 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 7e5382931b85..1fc52d78db16 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -80,6 +80,7 @@ argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () { + mkdir -p root usr/local/lib usr/local/bin cp "${WORKDIR}/binaries/xen-argo.ko" "root/" cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" @@ -89,12 +90,13 @@ else fatal "Unknown test: ${TEST}" fi =20 -# Set up domU rootfs. +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc run srv sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh set -x export LD_LIBRARY_PATH=3D/usr/local/lib @@ -102,22 +104,22 @@ PATH=3D/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) =20 " > etc/issue copy_domU_files -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs =20 -# Set up dom0 rootfs. +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir boot proc run srv sys -rm var/run +mkdir -p boot etc/local.d cp -ar ../binaries/dist/install/* . echo "#!/bin/bash set -x @@ -127,14 +129,13 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg -echo "rc_verbose=3Dyes" >> etc/rc.conf echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU copy_dom0_files -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 # Load software into TFTP server directory. @@ -147,7 +148,7 @@ echo " net_default_server=3D10.0.6.1 multiboot2 (tftp)/${TEST_BOARD}/xen ${XEN_CMDLINE} sync_console module2 (tftp)/${TEST_BOARD}/vmlinuz console=3Dhvc0 root=3D/dev/ram0 early= printk=3Dxen -module2 (tftp)/${TEST_BOARD}/initrd-dom0 +module2 --nounzip (tftp)/${TEST_BOARD}/initrd-dom0 boot " > ${TFTP}/${TEST_BOARD}/grub.cfg =20 diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation= /scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf93c..a3031ecab0dc 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -38,36 +38,31 @@ echo \"${passed}\" " fi =20 -# DomU +# DomU rootfs +cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh =20 ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs =20 -# DOM0 rootfs +# Dom0 rootfs +cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz + +# test-local configuration mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz -mkdir proc -mkdir run -mkdir srv -mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . =20 +mkdir -p etc/local.d echo "#!/bin/bash =20 export LD_LIBRARY_PATH=3D/usr/local/lib @@ -78,8 +73,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=3Dyes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 =20 --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628967; cv=none; d=zohomail.com; s=zohoarc; b=Hr34pdnmZHmm4A1lQ3v9xZDffHt7yGx6pRGtTrPfrhSBlzu9ttnrwBJne9cqdqtZeFUHTBOVkRTmCC0Mw6icZn8cn4rrxgp/p7kUBqyfrQv70HkMfsYZmj7diWSPt/D4O5n/YgIJI/Qroif5mQ5CJgQc9nc/gv/LqlDgVinJ7nI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628967; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MwMsxn6Jd7jyTrnz0TEyUCElfwL1OHRjwA8ZnK04oco=; b=lHjheU4yhCPqEx9AFy7k5aATdeStN4DaV0QJ17DgbvKYX/UOY7wsQPf0vAuRP6dRd4fqoBBsYHBmrz3GL7MoUw/HjNfhcQXrPoI62bEgoybpt9UrFGxbQZ6NJdogb5YjsWdoPGb5e5qbrxeub2674X+j4nSEd2UNAIWYg77CBqU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628967120886.2636591094476; Mon, 14 Apr 2025 04:09:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949713.1346210 (Exim 4.92) (envelope-from ) id 1u4Hgd-00012A-Vb; Mon, 14 Apr 2025 11:09:11 +0000 Received: by outflank-mailman (output) from mailman id 949713.1346210; Mon, 14 Apr 2025 11:09:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgd-00011r-Rz; Mon, 14 Apr 2025 11:09:11 +0000 Received: by outflank-mailman (input) for mailman id 949713; Mon, 14 Apr 2025 11:09:10 +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 1u4Hgc-0000MU-Dj for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:10 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e3718eb5-1920-11f0-9eae-5ba50f476ded; Mon, 14 Apr 2025 13:09:09 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so36430705e9.1 for ; Mon, 14 Apr 2025 04:09:09 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:08 -0700 (PDT) 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: e3718eb5-1920-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628949; x=1745233749; darn=lists.xenproject.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=MwMsxn6Jd7jyTrnz0TEyUCElfwL1OHRjwA8ZnK04oco=; b=LSJ8BL4q0PdPq0e/61LQ0TfrkCTEbfTt4jpJQk8S1aWELBcd/TZ+fumzvTS6+Dt+HQ grmsX7AC7A/mAmjI+lH5uvioNr3FN7004poOaqMVsFG0dTgT+Gqm2lBNXm0aTj2twMq/ WZNxOdW1aKGB7fLxnOzctwICQoHnsDM14X8g0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628949; x=1745233749; 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=MwMsxn6Jd7jyTrnz0TEyUCElfwL1OHRjwA8ZnK04oco=; b=EAnDZYzChRGqgYVEz4/kZfQ/eJkDWIQZOiuYL+5YzcKJnpmM0SPzb68RMG+DeII6iy j32PC4pf/U5p5N1pNeMZ5hO4xeZVJgMHexTgLorhLYyaPMP4t/b/4WSK62uFM/1QRzFE f0kqRBGCYBRXRo9ThyxmvEs39Q3HNsEO5Pvo7X8LYZTcjVb1wGi5hFR90T5i4P0OnbCX /CuPwZjmAsFHa7V+5tAu6atgyLwuXPw1q7UGo0nRQLlXteNxfEzrakzfmXmuwKDV96Z6 mvcXoVcmzwE7aErWdli2rRSldP6YkUXbCbh/QkD0VOlnA8tK8PWGL4V8mzK+rJNnQwWN oVaQ== X-Gm-Message-State: AOJu0YzR0l+Oe/1et2qurbW+JuVORaVwjCGAi4FyDKt4lrKbS9dGjqnl bEf9dJdzRIBwZ/eAAcwfpkutPa3/SF297QtHx89M2FQecMvGL7IMqIxB6jOOS4iEnsXxhjlG/q8 QbFQ= X-Gm-Gg: ASbGnctNatGbM70J+j7Nx6BS/Oo16ea4bkv3rH7urNJ1VythK9+7f27m6mDFHeSBwoc Q+AfKPFsSl4sQGZM4GN7PHjYu83Ja0hHH+tqj2SrKyLIHCW62Er1Fh2+18O/MkfFDNRz5bsMbY2 48jjDmKPCI9uKOdiy6HE+oKs9Ctzwa8KojkwM7N43zfDuxg59o1A8pbLzciIpxYWtsJJJlOH5os cCR2/pyN8aCe8H/ruYTjim/NAFP9n+Z9BEggMSAkOX11YlQiUlD4PwgWoBhCtGJoVXIiSeoNh26 sRfl9xd4hjKg0jXL5YDnIHdBMH6f0bQ56qWCO6HkuJlx1yfjoDFPUGvGNfMm1T9M8NuAZIIL+Tf mJ2YBLfgmn639Sg== X-Google-Smtp-Source: AGHT+IFnAY3HNdb1GkemiFAV4NeEsPcpgR1Y2eChTj17M0J4//b9qAZzHqAbfJ4PdYYIgohtWyCBrg== X-Received: by 2002:a05:600c:500d:b0:43c:ed61:2c26 with SMTP id 5b1f17b1804b1-43f3a959599mr121393665e9.17.1744628948708; Mon, 14 Apr 2025 04:09:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein Subject: [PATCH v3 3/6] CI: remove now unused alpine-3.18-arm64-rootfs job and its container Date: Mon, 14 Apr 2025 12:09:00 +0100 Message-Id: <20250414110903.2355303-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628969206019100 From: Marek Marczykowski-G=C3=B3recki This got moved to test-artifacts. Signed-off-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Andrew Cooper Acked-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki --- automation/gitlab-ci/build.yaml | 11 ---- .../alpine/3.18-arm64v8.dockerfile | 66 ------------------- 2 files changed, 77 deletions(-) delete mode 100644 automation/tests-artifacts/alpine/3.18-arm64v8.dockerfi= le diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index 40dcd31f1bce..1b82b359d01f 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -264,17 +264,6 @@ =20 # Arm test artifacts =20 -alpine-3.18-arm64-rootfs-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-a= rm64v8 - script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz - artifacts: - paths: - - binaries/initrd.tar.gz - tags: - - arm64 - qemu-system-aarch64-6.0.0-arm64-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-a= arch64:6.0.0-arm64v8 diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/au= tomation/tests-artifacts/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index a4542f703997..000000000000 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -# syntax=3Ddocker/dockerfile:1 -FROM --platform=3Dlinux/arm64/v8 alpine:3.18 -LABEL maintainer.name=3D"The Xen Project" \ - maintainer.email=3D"xen-devel@lists.xenproject.org" - -ENV USER root - -RUN mkdir /build -WORKDIR /build - -RUN \ - # apk - apk update && \ - \ - # xen runtime deps - apk add musl && \ - apk add openrc && \ - apk add busybox && \ - apk add sudo && \ - apk add dbus && \ - apk add bash && \ - apk add python3 && \ - apk add zlib && \ - apk add ncurses && \ - apk add yajl && \ - apk add libaio && \ - apk add xz && \ - apk add util-linux && \ - apk add argp-standalone && \ - apk add libfdt && \ - apk add glib && \ - apk add pixman && \ - apk add curl && \ - apk add udev && \ - \ - # Xen - cd / && \ - # Minimal ramdisk environment in case of cpio output - rc-update add udev && \ - rc-update add udev-trigger && \ - rc-update add udev-settle && \ - rc-update add networking sysinit && \ - rc-update add loopback sysinit && \ - rc-update add bootmisc boot && \ - rc-update add devfs sysinit && \ - rc-update add dmesg sysinit && \ - rc-update add hostname boot && \ - rc-update add hwclock boot && \ - rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ - rc-update add modules boot && \ - rc-update add mount-ro shutdown && \ - rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ - rc-update add local default && \ - cp -a /sbin/init /init && \ - echo "ttyS0" >> /etc/securetty && \ - echo "hvc0" >> /etc/securetty && \ - echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab = && \ - echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab &&= \ - passwd -d "root" root && \ - \ - # Create rootfs - cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr = var --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628972; cv=none; d=zohomail.com; s=zohoarc; b=KII7qbDCdubZ2X1LncGam20MMxqQxMSr4IVWMwk2SJ6v8PI2p4gVmpTH234O1LKYxkJrdHmk+Z9Kx3KMcBBlpd+7XDBl+agd0Dvx6dVzBf0jyV9uZhLA0Cyz2oWHKoL55YAxq8JQUfg1ta8zAR+x+O5W506tImQXGimq2yK6bHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628972; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=K6OWKMegtcc/0rp9IBds/PhWoddbHwcZW0/uLjS/za0=; b=CH7mkJ8DNsYHQSt3jFssI6XbBzR2kNf4ClxigsapmDjCqgrBiNLGMMWeGC2Y8lSCtLw1R1liLypOO5gf81k8gMOzLbBVz9oVVOuhXogr/gTk8D5Y/rWOXNGtCz5Xd22Um9O+pyZo/LWqLb0hd4+Pb7dWBeygkjrFFINsxDZw86I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628972055930.8751961692013; Mon, 14 Apr 2025 04:09:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949714.1346221 (Exim 4.92) (envelope-from ) id 1u4Hgf-0001Js-8L; Mon, 14 Apr 2025 11:09:13 +0000 Received: by outflank-mailman (output) from mailman id 949714.1346221; Mon, 14 Apr 2025 11:09:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgf-0001JY-4R; Mon, 14 Apr 2025 11:09:13 +0000 Received: by outflank-mailman (input) for mailman id 949714; Mon, 14 Apr 2025 11:09:12 +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 1u4Hgd-0000MT-Vn for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:11 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e3e1a086-1920-11f0-9ffb-bf95429c2676; Mon, 14 Apr 2025 13:09:10 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43edecbfb94so44840465e9.1 for ; Mon, 14 Apr 2025 04:09:10 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:09 -0700 (PDT) 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: e3e1a086-1920-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628949; x=1745233749; darn=lists.xenproject.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=K6OWKMegtcc/0rp9IBds/PhWoddbHwcZW0/uLjS/za0=; b=DkHRHtgFjFnFG7JIRxAqr9LgkWq6+kO7OeNPXn0KnezZjYAvdkDS4NrmK57tElfm46 vlVQRLQnZ26udef+UO2zR98b/WNSm1EfUvA6sc/0Uasfry3RTPbXrInNXjvJ0oQyFPFG XXRHMFrduUsIS8BR8dOVFmQg2Ere9kIpL6xac= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628949; x=1745233749; 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=K6OWKMegtcc/0rp9IBds/PhWoddbHwcZW0/uLjS/za0=; b=d4uC+p+do7keC3bW9Ipuw5/gtCcZn/jOTRZaknD1wEQ+xKKQ8x/sf2WR2NzPqfwbCK aLs/o2Sc5uPQDunZ6yVwM4GsDJqrlH0eyJOd0Vk+2KAPMsSFKpjI++NUQpKThwaGXV1p YIya7jDIZMlS0DofjJVT/2Atc56/flMjIFnlZH0dyyns2opXkRci88XzRvQHxw81nj88 r6N1PzqDu2n336/ebsbwyqcNtEw6bQIAti+AMZ8M6Ge69g7D6apQPUA2n82uMbUZYj/s Y8YKlUb970MN9U7kWSvLIZqLv0N02igNBe6Jh30/FMi2pYgMrzEM4UOK7/PHgU8YPP/Y Iwxw== X-Gm-Message-State: AOJu0Yxac0ogS5gKwVnC/ogrNo8bSGA0/h2/KZDqI4SU1bhIpadORP8r +6Wx0bZn7uXzE3aMWtTgoyt5+DvIQUQd9nItY1Oyup2h3muvh0LQj9XMu+nuhqVgJScGQ8tCEAY r8XU= X-Gm-Gg: ASbGncviCcgfVwQ9kOWLGf4x2hKtGjui9OPcxDrCH0gTBlc2LF4MMxBke+q0qKCasMe inBfMaxs2LHBh0EvJ4dTEFJOTHtmvIyYZcxcZPR3vHeq2YhXlm/0+3pSiR0Q02bCVHmWsksV7oB iq6ZPiI2dmjhBgltU02BpDVE2q3+w7wGYmzUtMv5yUb1IyF48o9GPKO2tGEmIShqztFXz/D+KYh 9qy1dnYdqydWlPwlE2t/j5q8qo7F7w1f/zCY6v6Tqv3AMAC2B1ovJGh7V4wE5239llWLgW5wokZ XeKwvombmumRmcbcYutGfyYjSCTgdkPgk0c7kojEcbdaXy/YDG+luDN/ev03TrGfNACMCvXsRLw MQBN49StEi6ESWg== X-Google-Smtp-Source: AGHT+IGtaACpohKN8NRqicAByAmOnMVvrogHealXG+qY91ryDFjecviPNuDE7Y7Pl6koWR/XwJnLwQ== X-Received: by 2002:a05:600c:46d0:b0:43c:eeee:b713 with SMTP id 5b1f17b1804b1-43f3a9afc34mr85923695e9.20.1744628949499; Mon, 14 Apr 2025 04:09:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jason Andryuk , "Daniel P . Smith" Subject: [PATCH v3 4/6] CI: Switch to new argo artefact Date: Mon, 14 Apr 2025 12:09:01 +0100 Message-Id: <20250414110903.2355303-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628973201019000 The argo artefact is now a cpio archive and can be appended to dom?-rootfs directly, rather than being part of of the overlay. Drop the copy_dom?_files() functions. xen-argo.ko has moved into the standard location, so update the insmod path. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Jason Andryuk CC: Daniel P. Smith v3: * Rebase over change to rootfs handling https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1766180593 --- automation/gitlab-ci/test.yaml | 2 +- .../scripts/xilinx-smoke-dom0-x86_64.sh | 22 +++++++------------ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 51229cbe561d..d46da1c43d05 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -242,7 +242,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: needs: - alpine-3.18-gcc-debug - project: xen-project/hardware/test-artifacts - job: x86_64-kernel-linux-6.6.56 + job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 1fc52d78db16..85007dcc290a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,8 +28,6 @@ extra =3D "root=3D/dev/ram0 console=3Dhvc0" memory =3D 512 ' DOMU_CFG_EXTRA=3D"" -copy_domU_files () { :; } -copy_dom0_files () { :; } =20 # Select test variant. if [ "${TEST}" =3D "ping" ]; then @@ -66,7 +64,7 @@ then PASS_MSG=3D"TEST: Message from DOMU" XEN_CMD_EXTRA=3D"argo=3D1,mac-permissive=3D1" DOMU_CMD=3D" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko until false do echo \"${PASS_MSG}\" @@ -74,24 +72,19 @@ do done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=3D" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " -copy_dom0_files () -{ - mkdir -p root usr/local/lib usr/local/bin - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" -} -copy_domU_files () { copy_dom0_files; } else fatal "Unknown test: ${TEST}" fi =20 # DomU rootfs cp binaries/rootfs.cpio.gz binaries/domU-rootfs.cpio.gz +if [[ "${TEST}" =3D=3D argo ]]; then + cat binaries/argo.cpio.gz >> binaries/domU-rootfs.cpio.gz +fi =20 # test-local configuration mkdir -p rootfs @@ -108,13 +101,15 @@ echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) =20 " > etc/issue -copy_domU_files find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs =20 # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +if [[ "${TEST}" =3D=3D argo ]]; then + cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz +fi =20 # test-local configuration mkdir -p rootfs @@ -134,7 +129,6 @@ echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -copy_dom0_files find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628972; cv=none; d=zohomail.com; s=zohoarc; b=L02vghBERIRkuFa/8H9CV7yKXf6gnOfWUGptRIwchz75/Pdo9baWQKulioAvGZLO/fKJsnRTiJpH5/6WorDGJcU/bWN7dU5gmA49ik/sByADmdUJwOP39cNgMMtcc8+nrOVDvNqc6y68U5RK4HQ0fgxyp7VNosSGWFXt1WzrHTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628972; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FqFVEiY9DHURRecOhH2xsVEyvFBLoIcTk7clcfsrv2I=; b=knCdaljEyaVks7ChJKpwpiQVBPh0sm+AXdTHFu+h3yWSZzm/gS29XUWTJSBZmzzmD9CkNQzFIJrtefupgXAdDdZeZ+wF4srEIh8amLXekBAAE2k8YfseYx6dTcJKOv/nIs2/17rdEyTp77r+rnkJ2afxYvP5a7s83Clti8FX5P0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628972881954.3311999481397; Mon, 14 Apr 2025 04:09:32 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949715.1346230 (Exim 4.92) (envelope-from ) id 1u4Hgg-0001Zv-KS; Mon, 14 Apr 2025 11:09:14 +0000 Received: by outflank-mailman (output) from mailman id 949715.1346230; Mon, 14 Apr 2025 11:09:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgg-0001Zi-Fk; Mon, 14 Apr 2025 11:09:14 +0000 Received: by outflank-mailman (input) for mailman id 949715; Mon, 14 Apr 2025 11:09:13 +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 1u4Hgf-0000MT-Pa for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:13 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e4ca6409-1920-11f0-9ffb-bf95429c2676; Mon, 14 Apr 2025 13:09:12 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43ce70f9afbso45295115e9.0 for ; Mon, 14 Apr 2025 04:09:12 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:10 -0700 (PDT) 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: e4ca6409-1920-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628951; x=1745233751; darn=lists.xenproject.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=FqFVEiY9DHURRecOhH2xsVEyvFBLoIcTk7clcfsrv2I=; b=WFmeiskp3+vsKPgOmZxUZ+uioA4706zkv90lQ1g3rxCwB6xFJiwRJdfBqYBHMDkVTt 0shTUdltmBw1wDbWpM0jJSpHou/FizX8J2a3wHhi1z6T+U3V1jyaOADai5IrvHcCE/3v lBk8Bh+6XIBCDulIGdTUmmoxnE/62l/wB8mIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628951; x=1745233751; 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=FqFVEiY9DHURRecOhH2xsVEyvFBLoIcTk7clcfsrv2I=; b=wN5NDPE4ft+Jgj2BcBhaDL4mpDIFG5eEhYecTsLQIAF+EZ82YY5B2GcsCbbEeegWPY AKyqknyuOSlCnMu4WDydimf8NOE2v5qMuIU40ipG0AZ2OBWI+ESK9VWrcdMAp7x2/BdF 9QETo1sZuxgn2RrsJToEt4MQXi2vhWBOY8XQHkcfno2/hHFQGAaoSDFhpJlXf8/JoBmq tTvmsUIKrw8uye/Xb6Ws/c01wRB64YWlhrTYdrb1MT9+gGRfcTaena7kBGANE6W94z/g qwug++P/hnRQNUHACr9K4OUQvjI61ezberobdkukzsSiq50KoMSkgkfCFWOz28XER7vG IG7g== X-Gm-Message-State: AOJu0YwdurIZbOC+pLO1LIUbM/N07fxgwwBX3mph0pZoISVktPyaFBVa lHsmiees+KGFfYBhR7TJWJMzFJ05xNbSQcdQfiYHp54QnlJkcz5o0djzKUeOvDgtXWjrUPIfB5x C6nI= X-Gm-Gg: ASbGnct2qpOOL2sGm9c6p1lFnPG6j4EVWUBJxwPFHmMQSglJs+Tu8QsfeM5a6pWlURb wG3XEWxN1vhMzuWKdky0qI7bYPhyCvlz4fYkwpcycPN7YXQKwviK1lhcESB7D+j65I4+7NRWLdz OCy5p9o+hxzTLzDC/bjai2LQ7m9jR1ky27UnrnIkJAYW0hHao7eSRPUGpB8ma6ooXtxtaEOCL/z tQTqGMYSGENWfI6McMnG9pjyi/v8qfB2qrbT8aTlLc4xyNOIOMwN9ncViu2OKuFbUy1AsZo/6QJ KtIo08EUMaSsrVNosoXtQq6qkr2nzeGzIPwlbYmFnHEakqlRZ3FFPberJDovZfAtEOYK8olPyfO I6uzJ5AsXfet8qA== X-Google-Smtp-Source: AGHT+IGZ04PS5HcN2fvZn8IhAhqmw+tj3+Yj7NHz+aAhUYPXM8WPANEqvuMs2cLjpgEIY8FQQffJ9A== X-Received: by 2002:a05:600c:1d09:b0:43b:ce3c:19d0 with SMTP id 5b1f17b1804b1-43f3a9bee1dmr64654355e9.29.1744628950945; Mon, 14 Apr 2025 04:09:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein Subject: [PATCH v3 5/6] CI: save toolstack artifact as cpio.gz Date: Mon, 14 Apr 2025 12:09:02 +0100 Message-Id: <20250414110903.2355303-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628976484019100 From: Marek Marczykowski-G=C3=B3recki This avoids the need to re-compress it in every test job. This saves minut= es of wallclock time. Signed-off-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki v3: * Rebase * Rename to xen-tools.cpio.gz to be more specific https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1766186423 --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 +++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 3 +-- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 522efe774ef3..51effec81ddd 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -108,7 +108,7 @@ else # Note: Some smoke tests depending on finding binaries/xen on a full b= uild # even though dist/ contains everything, while some containers don't e= ven # build Xen - cp -r dist binaries/ + (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.= cpio.gz cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/= qemu-alpine-x86_64.sh index c7dd12197862..fe86caa39304 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -30,11 +30,11 @@ cd .. =20 # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p root etc/local.d mv ../domU-rootfs.cpio.gz ./root cp ../bzImage ./root diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scrip= ts/qemu-smoke-dom0-arm64.sh index c0cf61ff8f7b..61dd24b9abef 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -29,11 +29,11 @@ cd .. =20 # Dom0 rootfs cp rootfs.cpio.gz dom0-rootfs.cpio.gz +cat xen-tools.cpio.gz >> dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../dist/install/* . mkdir -p etc/local.d root mv ../domU-rootfs.cpio.gz ./root cp ../Image ./root diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/s= cripts/qemu-smoke-dom0less-arm64.sh index 8e939f0b7214..58f11dd31038 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -116,11 +116,11 @@ cd .. =20 # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . mkdir -p etc/local.d =20 echo "#!/bin/bash diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index e2376cb51cb4..3947027d6e4d 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -189,12 +189,12 @@ fi =20 # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs cd rootfs mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ =20 @@ -228,8 +228,10 @@ else fi =20 chmod +x etc/local.d/xen.start +mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg =20 +mkdir -p etc/default echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 85007dcc290a..1f8cc172c630 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -107,6 +107,7 @@ rm -rf rootfs =20 # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" =3D=3D argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz fi @@ -114,8 +115,7 @@ fi # test-local configuration mkdir -p rootfs cd rootfs -mkdir -p boot etc/local.d -cp -ar ../binaries/dist/install/* . +mkdir -p boot etc/local.d etc/xen etc/default echo "#!/bin/bash set -x export LD_LIBRARY_PATH=3D/usr/local/lib diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation= /scripts/xilinx-smoke-dom0less-arm64.sh index a3031ecab0dc..59f3fe7edb3e 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -56,12 +56,11 @@ rm -rf rootfs =20 # Dom0 rootfs cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs cd rootfs -cp -ar ../binaries/dist/install/* . - mkdir -p etc/local.d echo "#!/bin/bash =20 --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744628970; cv=none; d=zohomail.com; s=zohoarc; b=DXPQEA6NOpL/B1hAKoxRhh0bkbvcN8ojBr4rTNLFZZpUXa0vnfXPboM9jaA0CLJf3W5fs2fwOpMSt7vrTMOoniSSV9J4MuWNZXcGFarlm7ZHouomppIZ3HW/iO1oCUjBhboUyOZHWSqzYGPRmmr8Tj9sOydiWOna6MP8nXv41mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744628970; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pEagS0fgW08lXFE5KITuwG+96XL/PoduvFNAXAg+C84=; b=Y+t5FBQNMqQsD7FqU/C4AeexXuFiMTmspwyfdnn8AHQd1zpgDeVQYdbpENbYfIDOBVvxmbrlBOzLjOnPW6EySQzqDznmQwqgBXHQoT7wcBq9csmn2PQAE4GIvKIIUrR+zcwASBVcYq7+n1EKOPgzJ2qEOVwxVrzfIFAuXjJdkso= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744628970742863.3154474914068; Mon, 14 Apr 2025 04:09:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.949716.1346241 (Exim 4.92) (envelope-from ) id 1u4Hgh-0001qV-St; Mon, 14 Apr 2025 11:09:15 +0000 Received: by outflank-mailman (output) from mailman id 949716.1346241; Mon, 14 Apr 2025 11:09:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4Hgh-0001ph-P6; Mon, 14 Apr 2025 11:09:15 +0000 Received: by outflank-mailman (input) for mailman id 949716; Mon, 14 Apr 2025 11:09:14 +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 1u4Hgg-0000MT-EG for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 11:09:14 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e556f221-1920-11f0-9ffb-bf95429c2676; Mon, 14 Apr 2025 13:09:12 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-391342fc0b5so3244828f8f.3 for ; Mon, 14 Apr 2025 04:09:12 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f205ecb8dsm176820405e9.7.2025.04.14.04.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 04:09:11 -0700 (PDT) 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: e556f221-1920-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744628952; x=1745233752; darn=lists.xenproject.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=pEagS0fgW08lXFE5KITuwG+96XL/PoduvFNAXAg+C84=; b=W3YsaCBNdUtOC/Z24z9X+rwO0FAHkqUPVDvyH+imojakKykAb9lO229uoPOnIlMkU+ B9vIH0YBK9rN/KgofhP9setHEpnLGxKdxXU8JQDPKWpSLBwSirXZf5H0+7t6eF0XyJzR 9bbb+GCn2uoHqhUMrPDlUBFC034M2qS/5jBBo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744628952; x=1745233752; 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=pEagS0fgW08lXFE5KITuwG+96XL/PoduvFNAXAg+C84=; b=s0IpUSoWmVxEda6mSYnj9JJk+cBcjP+pgoVAc2kD68iWpVoEsiRymQTylFQ/E+Gyde odnhOcS3SmPNV2gSBrTk2XGgphQv5e6FdKzyZnX4E6x7DpbKRxgLisqcy7/EIR8OLqpW 7oImwDC1gTo26NEr3SrJQ6NspmUpSnA4LspPVb6DALXUS6coAy2AnWxq69Z5EnTvv80Z y2lJJdZRxH728A6UxNJPGxx8EBwsLvimjxPw7UISO3aKXKcFwXzSppoqKNDzX4G+bNRP luFAgfd0jIvyknRX3r8uvTGxg5/Mm7F0B0byxr9ZFeYkT2MN+pzyEBawRGmx8TIxk0WM tbYA== X-Gm-Message-State: AOJu0YxWkGz4DLipFZeSGIJa0jg9SjggLDVWbm+otmfGiJFnH+VNyqdN Ta4dQj79hto72M+OVmlKybz2uvZU5TfQ1pL6L0Op6i+u2ULVGd3IJCK0jq8B4wHt1IIDnvDTrke bWUI= X-Gm-Gg: ASbGncuAYKTsZ2dq1Ra/iUTIKgue22nesCOADLYS+rviUFdW7bPRVXLj1aDtZSVltjj DzWlBEsAusPwh7Co74Ygxn2Bvw9iIF/53p2Uy71mp+8MlxHmUg+BYblLEQf0uCBgWWcRFTh3q9v aNxS06EoPSOhMvwUyL79TEAgTYIndPpk+LQYWLnpqS5CGWsb7vgyEjUkKR3wUtyTX89oIVFLErz LQdeuZxgviaXPEx7gbBB0AhHBM9XjisT3WeDA4/dj+lR7i6mPgp0OVh79MgwDf2QQocU0dCR6OG U948sGPCHQh1el/+bx5EcYXPnBKfrj5r4EEKqh48R4YdwqUWou9fRsWlWzwcFOA0dZVF3Dxafg2 XdhivnxhMjzRG6g== X-Google-Smtp-Source: AGHT+IHqhiI94sSItJXNuhdApx+sOZ72wahpooTvttJ5PFefRV8bjzL81523dZ8IAeMFWNO84vjWgQ== X-Received: by 2002:a05:6000:401f:b0:391:3f4f:a172 with SMTP id ffacd0b85a97d-39eaaed1ebbmr9018066f8f.49.1744628951981; Mon, 14 Apr 2025 04:09:11 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH v3 6/6] CI: Include microcode for x86 hardware jobs Date: Mon, 14 Apr 2025 12:09:03 +0100 Message-Id: <20250414110903.2355303-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744628971191019000 All the x86 hardware runners are out of date, to varying degrees, in terms = of microcode. Microcode must be uncompressed and prepended to the initrd in order for Xen= to be able to use it during early boot. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki v3: * New https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1766187024 --- automation/gitlab-ci/build.yaml | 1 + automation/gitlab-ci/test.yaml | 6 ++++++ automation/scripts/qubes-x86-64.sh | 3 ++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index 1b82b359d01f..ac5367874526 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=3Dy CONFIG_UBSAN=3Dy CONFIG_UBSAN_FATAL=3Dy + CONFIG_UCODE_SCAN_DEFAULT=3Dy CONFIG_XHCI=3Dy =20 debian-12-x86_64-gcc-debug: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d46da1c43d05..ef17def0120a 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -26,6 +26,9 @@ - project: xen-project/hardware/test-artifacts job: alpine-3.18-x86_64-rootfs ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86_64 + ref: master =20 .qemu-arm64: extends: .test-jobs-common @@ -250,6 +253,9 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: - project: xen-project/hardware/test-artifacts job: x86_64-argo-linux-6.6.56 ref: master + - project: xen-project/hardware/test-artifacts + job: microcode-x86_64 + ref: master =20 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 3947027d6e4d..1f90e7002c73 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -188,7 +188,8 @@ Kernel \r on an \m (\l) fi =20 # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz =20 # test-local configuration diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 1f8cc172c630..5bb44188dc3d 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -106,7 +106,8 @@ cd .. rm -rf rootfs =20 # Dom0 rootfs -cp binaries/rootfs.cpio.gz binaries/dom0-rootfs.cpio.gz +cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz if [[ "${TEST}" =3D=3D argo ]]; then cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz --=20 2.39.5 From nobody Mon Feb 9 14:04:22 2026 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=pass; 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=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744634862; cv=none; d=zohomail.com; s=zohoarc; b=aD0TQcsPvLpqjW7A/P1WC+brrGUhVzNiBiLwN2QFQUkRYrKgSlPCbOnnYzseOrzRdI1d6PTimUlTh//77t/wqfndz9PT1c6x1GaLjRMGCApkeDAQ7VedjFVZ2JQke6xPBnI4mNz83xWuKwq+jw3Vqpcpsn54foEGzynMiP1OHDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744634862; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Vs3IPx0ubAvNTGKDP4dRKmTeeyajfpGQqvzCmhAlrNc=; b=jjQcgMWcq0dLLQXKfnOXGJ462qIvm13yx4kAEW8uIchn71uKP78PE6CBso1w5pER4T7/ng5YDXIVwNeAW0e5EkUS/wJEEj+1o1qBylACf6CIEdOHtLrbuT4rrguYBgl47SC0wKnPKHJT5SGsqYHZurDd0nANP7LIXJTD/yb7ZpQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174463486278425.105951291926544; Mon, 14 Apr 2025 05:47:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.950132.1346530 (Exim 4.92) (envelope-from ) id 1u4JDe-0002zr-Th; Mon, 14 Apr 2025 12:47:22 +0000 Received: by outflank-mailman (output) from mailman id 950132.1346530; Mon, 14 Apr 2025 12:47:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u4JDe-0002zk-R0; Mon, 14 Apr 2025 12:47:22 +0000 Received: by outflank-mailman (input) for mailman id 950132; Mon, 14 Apr 2025 12:47:21 +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 1u4JDc-0002ze-Tc for xen-devel@lists.xenproject.org; Mon, 14 Apr 2025 12:47:20 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 998b11ca-192e-11f0-9ffb-bf95429c2676; Mon, 14 Apr 2025 14:47:18 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso43207805e9.1 for ; Mon, 14 Apr 2025 05:47:18 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f2075fc78sm180090265e9.27.2025.04.14.05.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 05:47:17 -0700 (PDT) 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: 998b11ca-192e-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744634838; x=1745239638; darn=lists.xenproject.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=Vs3IPx0ubAvNTGKDP4dRKmTeeyajfpGQqvzCmhAlrNc=; b=OZNdx8bA5JnJ/YAFT5LcETkGvbH0o3iAq5NOaIj8QQZtUpjEnSZZobMQ+38SEBByh/ +Mr93INpaKTBec6h7P+hgW1ZfoJBzA0yHIbEIzVlQtcZ2tAE4ejP5p+m3gtJ5ziNrIGx hkvhE9nzMl70Nyw8MVIMmvG+QWrMp9JVflLsk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744634838; x=1745239638; 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=Vs3IPx0ubAvNTGKDP4dRKmTeeyajfpGQqvzCmhAlrNc=; b=H1qoobz3+egPQX3lR5BaEuaDdZ+HOJkHHRPwV794yK5GSjSRcFEMMiz30cIpg9YdN4 TnEdMDswFxq7Bn5FY99D0JRaDZylhIFaJ7/4Cy5R7hrAutd6svIOlVCn5WPAe7/ENpFk F7QSgkRs5kiwcWFZCdn4FRwQdzxfoCVWV+STA8Gnjn7JzADJRK7iFbHP1VX9Rq/rlRm/ e46gyMFpF3n1Wn+gHxukRJ5UUZTl8ILu1df3V9Mf3a+bD9J9SmJPfWsCm4qQ6/5H21wS 2E0y8ivQfikML8hBTRxChAwzBFtoSnL5fLYzds3sG2ruOCwuP/yE/OH1CVTXuvTiowAW 6gJQ== X-Gm-Message-State: AOJu0Yy5O8qoQb4YZhEPLzm0koBE2fCUIkl5a14yGKfl3wbTQgv+KPSX y3scbR4LFTy/fS23j58CMIih2bmi3qlVekk2iL9ZF3xh6pSuBlGqRd8ctGtcteLO7fSpr/ybIRn WhQ8= X-Gm-Gg: ASbGnctme8e7uSoNAm63OFUTaYH7mE/Zz+quc8DAxJjNBu0k8LnwaYpgb+e36O/n6uz BuTFaAG8Ctyb7Ajcg4+l3VxqlzrB4XcnsHV4Lv3LhFMm2N8GEwTJG6+fjKB2JYXjl0KSEXw30r+ mQkmg/+6GTRHuBT1Q3YYVRcclWXVI/WMFas6aknkzgMPqJSsnvFlmsEQjdJJQsNoH6DkeWIA9pp tfaQ6DcX1PO/hEpsFXaTO0mV0v3+KXy3pYs/QezDUa2BPQEREehYP0N07OWIyuCFMMjcLyWMyuM +6uB6lPiFhf0l5/0sWDe0ZjMITFLH5ri6YO/uW80Pe4oCBdYQgFrdYHzVE4hIbTwmp9Z8KNSjvF zFWJR7Am0CvMLCOB1xi+2kqoB X-Google-Smtp-Source: AGHT+IE08BXgF9+pyb8u67iHj4m4DOnmtiVuA4OE8q2DgHvIDM7e10AqKTbORFgBKdPFgdsEXJ6zpA== X-Received: by 2002:a05:6000:2507:b0:39c:1257:cc25 with SMTP id ffacd0b85a97d-39eaaed2d1cmr10607975f8f.56.1744634837735; Mon, 14 Apr 2025 05:47:17 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH RFC 7/6] CI: Adjust how domU is packaged in dom0 Date: Mon, 14 Apr 2025 13:47:15 +0100 Message-Id: <20250414124715.2358883-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414110903.2355303-1-andrew.cooper3@citrix.com> References: <20250414110903.2355303-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744634864545019100 Package domU in /boot for dom0 and insert into the uncompressed part of dom= 0's rootfs, rather than recompressing it as part of the overlay. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki A little RFC. It wants extending to the other tests too. --- automation/scripts/qubes-x86-64.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 1f90e7002c73..7ce077dfeaee 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -185,10 +185,22 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) + mkdir -p rootfs/boot + cd rootfs + cp ../binaries/bzImage boot/vmlinuz + cp ../binaries/domU-rootfs.cpio.gz boot/ + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs fi =20 # Dom0 rootfs cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz +if [ -e binaries/domU-in-dom0.cpio ]; then + cat binaries/domU-in-dom0.cpio >> binaries/dom0-rootfs.cpio.gz +fi cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz =20 @@ -236,10 +248,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 --=20 2.39.5