From nobody Sat Jun 13 07:34:23 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=1781305811; cv=none; d=zohomail.com; s=zohoarc; b=gqJKydoR1mZ0OGoseXgkRL46NWVDBYj51tMfqjq+IYhUAQ3Fb47J6QXhJ+5ga/KRvvIG7gQC+J+PXX9+/1hT6TnDNF1Cu/2uhZDqZR1Yyj7bAXkCpo8o1SuWWOoq83AVyzRHbTOaeRk4VqQ4Ecl08mKdTpXm4aaoAysm4nZH6QQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305811; 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=6698Uxcu0dfTevWQ4ApQH8lfT2iy2BjmmIOaPm7I/XA=; b=ggyqAoP1JT2HNtPKgomuRjyamYhxhb4BK6fyZGbcSDaZcxy9ffEgBoXzhp00SFQ/AnQ7IWsoJt608urVIbOoqOVa65NTyAno6n4ZUQr5Mwsm4w1CTrkzqhqrM3CJd2/SlvJBGvVTblZqB77/B93L827Z92lkoUA68LLCn4Z3vyo= 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 178130581117516.95114410085398; Fri, 12 Jun 2026 16:10:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337049.1598698 (Exim 4.92) (envelope-from ) id 1wYB0E-0001pw-Qu; Fri, 12 Jun 2026 23:09:30 +0000 Received: by outflank-mailman (output) from mailman id 1337049.1598698; Fri, 12 Jun 2026 23:09:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0E-0001pp-LE; Fri, 12 Jun 2026 23:09:30 +0000 Received: by outflank-mailman (input) for mailman id 1337049; Fri, 12 Jun 2026 23:09:29 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0D-0001me-OR for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:29 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0C-00HIs8-AQ for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:28 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c915b-5cb7-0a2a0a5109dd-0a2a4502ddb2-20 for ; Sat, 13 Jun 2026 01:09:28 +0200 Received: from [209.85.221.47] (helo=mail-wr1-f47.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91a8-af86-0a2a45020019-d155dd2fc5bd-3 for ; Sat, 13 Jun 2026 01:09:28 +0200 Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-45e9f4a3510so892972f8f.1 for ; Fri, 12 Jun 2026 16:09:28 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:27 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305768; x=1781910568; 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=6698Uxcu0dfTevWQ4ApQH8lfT2iy2BjmmIOaPm7I/XA=; b=FHmhUe9iJhgoXiULmSgrnvCKDrn4Z6yGd8KSl+CvE4v3MyeSgB4eXL+Y8vy85LkJzq SwR1yKwkp1eUI+tBndIBN5TH3o4R8TH8pogLbP844SPvb5rZ06eTOImpb6sGXTcCIUxz 3L6wmA3OOs+cCUOZOGmi/uSlVvZ8gGIzKlUEg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305768; x=1781910568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=6698Uxcu0dfTevWQ4ApQH8lfT2iy2BjmmIOaPm7I/XA=; b=ddOsXDa8wJ0aA9Lm2qTBeYawWbF2QK5ReVrdcs4DcK/EfdIlkWCCXGX4ktFaDTVu7b GivaJqMtYwZpyVtXFa6iU6A68K8NS3oo4IFRbDGOhnSARUOR0ahfrhNuUE5anVRoo/MS xi2pfNrSiPYc9g3kfzxTSJiH/5upHEtaXmyDzo5fYrzv37pPlRZgMCELd1CM0DyAqITQ sEG2D2i7xzCKGx05TPNh2DjU0b7gGvcjDolmiA8zvDifjrHSx+gHiBCFNzfgOwDdp1WC LAw0nPpC0t2ptJ+YRO908/EzDg5YoSdqgBi8o5LETRHfzsKvdaAB65ZUfASurQVOlsVb 8KiA== X-Gm-Message-State: AOJu0Yw3ozQbBv10/VFUOYzVmkeJvCaAZ8an9Q8XEYT8oTC07fooqeZR VN4YfpE+wyPLyNW4F+HfHFUwFN9ZpEFg4dgBcguL2o5jImSFEceAlFlMwvxB8oomPHJeOm3Pmpa N3loZ X-Gm-Gg: Acq92OH57ioApa+BL8zcXsQ6DiiGEl+QZ8a5retikHrwDo7VZL5c7I8AijauGJnQzdL Hi6iMGDjUlwI//K7AvqCRPSOujWV1aZApJIxGU0a25shmuL3UDBEJbgJR7hcRfiVbFD87dHSHCc 1uBnwv/7bFxfwTBrI58OGx6U9qSY/HjLNtPUxYVetLExLwgD6OCvGOt1B1Qjxf//5m36gRTK6dB +p0JRASkp0bwZaADzFLmu7lBJnpXyu2jSklsQ3qM85VfSOFTY/XiujrmQK5WipVOovntV/FTLXb Ekvn4HpqxR1dpJPg261dfM0BbcJZ0wcVc+BsIg7Tj3SvWObqUleoUqehunr6ny6mI44Ua+f35PL 9bsPoEDVLWUxZVTgEprXBHMykM9IEcoGDTYuWCt1jWL2gDafKWv63BWqLU9LMV0yzWyx2YdG8nH G/Ky47Lu2lIwGcjQ0qiNCwRFnxkkkkn3mLBk4rDS6f6kvUV81ecZ+KwMQV8bn93mJd0valQir2H O5c X-Received: by 2002:a05:6000:290e:b0:45d:3cb0:5ab1 with SMTP id ffacd0b85a97d-46074b8a30bmr1549717f8f.38.1781305767643; Fri, 12 Jun 2026 16:09:27 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 1/7] tools/xenalyze: Work around GCC-15 -Werror=nonnull false positive Date: Sat, 13 Jun 2026 00:09:18 +0100 Message-Id: <20260612230924.3181154-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1781305768-A9B70161-0D63E41E/10/73395122804 X-purgate-type: spam X-purgate-size: 1641 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305811969158500 Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko I don't particularly like this, but I see no better option. It's clearly s= ome kind of VRA failure, yet we don't see it with GCC 15 in other distros. I suspect that Musl (as opposed to glibc) might be relevant, and perhaps even= as simple as not realising that error() is terminal for a non-zero input. --- tools/xentrace/xenalyze.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index 876d59d42ca5..cec1354cf779 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -3789,6 +3789,17 @@ void update_io_address(struct io_address ** list, un= signed int pa, int dir, error(ERR_SYSTEM, NULL); } =20 + /* + * GCC 15.2 in Alpine Linux 3.24 fails with -Werror=3Dnonnull, + * complaining that we're calling bzero(NULL, 128). + * + * This looks to be a false positive as p being NULL will never re= ach + * here as the error() above will have called exit(). + * + * Work around this by hiding the NULL-ness of p from the compiler. + */ + asm ("" : "+r" (p)); + bzero(p, sizeof(*p)); =20 p->pa=3Dpa; --=20 2.39.5 From nobody Sat Jun 13 07:34:23 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=1781305802; cv=none; d=zohomail.com; s=zohoarc; b=H3fpZYXr/Rl2XgpAwTM/OUqRneCe8bdC5XPYesmBjnPEgc97DyROtDOZSVqfDYEv6t8Ny7tZDx/+xAYiYbHR2de2LGtm7qSweDI0blWpJ5pl27utpt37iBUYlYnvvk1F4waJ6RkibNHwnkIMIuQIHfwwQP/3sMw/Nge4RPtSr6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305802; 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=iHgMJ5pAsBWt/gfP5CP2XcHY/YX5Ol4rY08M9vS2knc=; b=KV0SR3Prd3Bu/QiSHMTNCbvD8OKF+bPsEhKdM4gSQh0dqmTlImdXBs6IS9jH8mNAWdGaQeQnTWociAlKnUyud7D3DXhLiDCOHPQyxqswQt5ZcUTlMdYp0PW6fBgOC5Ssw5gb4BYivLUFJXVakbCpDjitFDKNFQZSntbsjCI7BP0= 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 1781305802891117.44103079629315; Fri, 12 Jun 2026 16:10:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337050.1598704 (Exim 4.92) (envelope-from ) id 1wYB0F-0001vw-5L; Fri, 12 Jun 2026 23:09:31 +0000 Received: by outflank-mailman (output) from mailman id 1337050.1598704; Fri, 12 Jun 2026 23:09:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0E-0001vp-Uk; Fri, 12 Jun 2026 23:09:30 +0000 Received: by outflank-mailman (input) for mailman id 1337050; Fri, 12 Jun 2026 23:09:30 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0E-0001mf-0B for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:30 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0D-006h7V-DO for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:29 +0200 Received: from [10.42.69.6] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c9156-2eae-0a2a0a5409dd-0a2a4506c6f0-36 for ; Sat, 13 Jun 2026 01:09:29 +0200 Received: from [209.85.221.51] (helo=mail-wr1-f51.google.com) by tlsNG-16d1c6.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91a9-7371-0a2a45060019-d155dd33cce0-3 for ; Sat, 13 Jun 2026 01:09:29 +0200 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-45ef41adbc1so1129729f8f.0 for ; Fri, 12 Jun 2026 16:09:29 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:28 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305769; x=1781910569; 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=iHgMJ5pAsBWt/gfP5CP2XcHY/YX5Ol4rY08M9vS2knc=; b=jVhGXagrp83OVG74s+7K30m92Pr1HcxAtjAdfssafop5ofZqgnsxwcB8Hks7fTzz5G hu1XWq1TT1SttM3lOy1Gt2QAxwIHf/gZt8MPS9c9yz1orsuGb0dZU3d6GiC4UBpkOpKn 7YLFUxrJMEgaQaSeP1Ni7wgg8r/VATh23E1l4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305769; x=1781910569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iHgMJ5pAsBWt/gfP5CP2XcHY/YX5Ol4rY08M9vS2knc=; b=S38jrfOxxM+BwyX7oKh5Ze+eptzj6KpS/Kqjqf9IH9kbyCq672g9J0NnvcfrIlcjmI iLj4CdKci17EKVeZ1RW7t188le0xowJi5fEvAwRzyijcy1lH10FJq/0Vo9OCLx/+X+mi TAKJuXcXfxkyF9u6tE1UTxlw6QdVPvHEqJErYfxM7MULg6bMDEH827l72xvA4LzQpd/E op0h8TTg8N7OHTcH9kPCbQKCGzUz6RWEh8QpwsWiLbeXGBAg2k2vDvTZ5UYcJPS1evvL hTCM3eu+qYoPYLGD7O1sdY0/eFX/WjyTTKggnMKWzuQCWsV69P+kL/iNPJ4HKv1Efh+m iFkw== X-Gm-Message-State: AOJu0YwlQu56ep9tRQxYuQT8XFN/A91Cn08GA9//EfZS3dgC6KwIbz39 UvqaeeELfqe9oRAVerRKWA+PWaITaxSPd8I315HdCU02ouRlZmS1BtEAxKmAZHzR3ebqQI3ZVsn Ir9Wv X-Gm-Gg: Acq92OG33iIqUjhYVvaX/U0I/AMrB+6WALwRvXiT3IPEH/w61k7vyyHTf1eSKQPciY9 7SkNrleNntEQqAfxUiuDBJPK26j30QcvsRU8EFmuExl1ngmZsgeIsU+hUMNnsyMnotiIjIhf1EU ptUch9mKz6YFtgbHgYMmpORWOA2jWjAOIdTS7WlTgO0nACc/GP+xicjjdwE0jsGnA2YOxvGgl0/ UfetaZyFdfLH4IOdwWriva1TvKJkV9x0L/HLQ5wLxKymtvwIpVTVyC7zO1X2LxAkzg4UwMfYNth ezqP71IudL7UdfcD0nHbPDlE8INxYAsIv8fYiysCnXw+L3SGRppJLIvIKH+FxVZ2a68Hbxm+OZf YaR2rJc+XLa6kd76LCR8siabfnL03SAIXNgkRQnRsZVri061n/a5AhTOlu5nIOrsM9o5nyQGmTI s/Dn/p0O4DZEzabCyMac1tVp6ZGRZT2t30rrrDfNF04CDWQ5Htonkefsw2Jxl895pZCl5s82I9P vSb X-Received: by 2002:a05:6000:4615:b0:45e:f381:cd8c with SMTP id ffacd0b85a97d-4607e90eab5mr1337429f8f.30.1781305768402; Fri, 12 Jun 2026 16:09:28 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 2/7] Config.mk: Update QEMU to include pip-25.2 bugfix Date: Sat, 13 Jun 2026 00:09:19 +0100 Message-Id: <20260612230924.3181154-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-16d1c6/1781305769-86369D75-3B12E332/10/73395122804 X-purgate-type: spam X-purgate-size: 1690 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305803875158501 Specifically: commit 6ad034e71232c2929ed546304c9d249312bb632f Author: Sv. Lockal Date: Mon Aug 11 20:01:59 2025 mkvenv: Support pip 25.2 Fix compilation with pip-25.2 due to missing distlib.version Bug: https://gitlab.com/qemu-project/qemu/-/issues/3062 which cherrypicks cleanly onto qemu-xen.git master Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko This needs putting into main qemu-xen.git first, and then the override of QEMU_UPSTREAM_URL dropping. --- Config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 86a4999246d1..11fb39154b73 100644 --- a/Config.mk +++ b/Config.mk @@ -213,8 +213,8 @@ endif OVMF_UPSTREAM_URL ?=3D https://xenbits.xen.org/git-http/ovmf.git OVMF_UPSTREAM_REVISION ?=3D ba91d0292e593df8528b66f99c1b0b14fadc8e16 =20 -QEMU_UPSTREAM_URL ?=3D https://xenbits.xen.org/git-http/qemu-xen.git -QEMU_UPSTREAM_REVISION ?=3D e064f42c80be6f6ff8c12dcb2a663bdf70f965f6 +QEMU_UPSTREAM_URL ?=3D https://xenbits.xen.org/git-http/people/andrewcoop/= qemu-xen.git +QEMU_UPSTREAM_REVISION ?=3D 8ac4f8f52db8943ca389f6040d61d4d98a4c072c =20 MINIOS_UPSTREAM_URL ?=3D https://xenbits.xen.org/git-http/mini-os.git MINIOS_UPSTREAM_REVISION ?=3D b6f79f5f44cf69044079c042b88fe9d75367642e --=20 2.39.5 From nobody Sat Jun 13 07:34:23 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=1781305798; cv=none; d=zohomail.com; s=zohoarc; b=U1JhEvW0ifXdFt7H7RAOu5oivDCaRQ0TVLFHJ0F7Q+k1tVGb5Te09fVFUpdx3d1/jaxppkKS9ofUuxEFO62Wn5kKd47v5veDgx9E7HSl/CjcpRbnlFdA/4k0wQSx1Uzdq42L+vx60OfdabF6Cacy03zWCB1YWq9Rggqnel6sEKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305798; 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=9f8AM+tsFx7VUeIRhpy35Zn5mtNfQ2vEL4QF0LSn/Hk=; b=EeW5OVlgiwyvK2sJM59nxdeKqp52ssysbmuB8A4ksVoBkcq1aZYbju9LV+kkLUfcQ2dFJZ9IVBlyHrmjq5XvjOEaXwxstG9DHcNdBQjofQG9OpcVT1Pd4o42W/xhVY7FOmQNO4BCdT1fN4GKoDZfoZYH816hy5lDxQfYsOcp33A= 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 1781305798868236.77106326092155; Fri, 12 Jun 2026 16:09:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337051.1598711 (Exim 4.92) (envelope-from ) id 1wYB0F-00029e-KU; Fri, 12 Jun 2026 23:09:31 +0000 Received: by outflank-mailman (output) from mailman id 1337051.1598711; Fri, 12 Jun 2026 23:09:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0F-00028S-Fb; Fri, 12 Jun 2026 23:09:31 +0000 Received: by outflank-mailman (input) for mailman id 1337051; Fri, 12 Jun 2026 23:09:30 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0E-0001mu-Ax for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:30 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0D-00HIs8-O7 for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:29 +0200 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c91a7-5cb7-0a2a0a5109dd-0a2a45098b92-2 for ; Sat, 13 Jun 2026 01:09:29 +0200 Received: from [209.85.128.45] (helo=mail-wm1-f45.google.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91a9-2497-0a2a45090019-d155802dc002-3 for ; Sat, 13 Jun 2026 01:09:29 +0200 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-490c1915793so12536025e9.2 for ; Fri, 12 Jun 2026 16:09:29 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:28 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305769; x=1781910569; 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=9f8AM+tsFx7VUeIRhpy35Zn5mtNfQ2vEL4QF0LSn/Hk=; b=gBVZ1GUDE1eULvlgNBoZBsEp9EHW8ZZVKYIrdOHdfkVqjFIKqXkldSWYe+kJBhtqAL 7jPNULD243vm99avT3QDuFe7KyL3XObGkMDKbBdKs9C3raWQvigLRHXS+4xSWsmchRWz vjkn+XBj9NzBDyYGZ9D4djkkxXTcQblNI9330= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305769; x=1781910569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9f8AM+tsFx7VUeIRhpy35Zn5mtNfQ2vEL4QF0LSn/Hk=; b=N9Kdj5b8bgWuMWlkFOMErhshHB2M6KB06icSHhpfrHuiu+c0ipWUkpAjMT3H3hwEam XpDlTEHxGjBgAnlEvNd4XQzMlhWuNZWqGFoI9mMvBJq++/muObgzNoEXzWbuLJNv7lVz CvkdJH96vGe3BT4fL4EPx3oZxDZX6NBLJgMz2DX7he/hM6RbTtsNhK0NdvKTOboNEidb t331iPSZkHMKROBYweUKBO3NbGVQ6e3CqmRv1LlPjvJeujpsniplEWHXwqFx/ZwAqVIS Uh3BtfO9bVM6+UzmWfIwu6FWJqqGUCTmW3Ywg1vL0oLEROZaJNQQ9oBHP8vnL15Xhu50 IGLQ== X-Gm-Message-State: AOJu0Yz8w8s+y31gzWxmQaWD/aVoaPHIaK3sp222VbDke7ihd1KeWfDh fZq02axkCnH/kFH72fHuiVU+yyiLczhDqcJmBXxVeNU67xen626W9agrMzSAVwos/gft6OJutUN Al6co X-Gm-Gg: Acq92OFLom6Wz74CQXhRjnCuzbxumTfMaM65le122eAvvo26nXHylXcIzkLf1Xe2f5b qzWMIVHVvuR9oTT0DU0qjM/8jyxHDxeyr0KZDumBG4XRgseeGuWoTGHpSyMQP1AQjhWC++tke0+ jlKVD+u303zidAUYEmQaSm6BBgzAKZv8frHQG6SmMR+hkUO2fUFpJ+VylrNOCFtVv8JVwigRBSI 1JoaDe1pVNX6b1cGiDhs9Dcn3KoYc4cI5JyLV1NplsLzspVD7kZJc0ntVHMGW6KZKh+Dbp3HfRD MaVdweLQPiEaqzakTTApDWWu6L34AVhz5zQ11JCelKBpoXzRPyqhh9JBab27SA2QK4RxlVfwY8y u7c8yTdVUy2MnW9mYVIz4VBzSNqrkDov7RZqnJZB7YCsCoDTzwAR+/fra67Y2ia5w08dNUL1ilY bx8InwU8wGp+puPX+OP/EXImw/0hBkHML7FyLpBGQWKvwKRifpyZOh+0cvg085JzuMkg/qfAoLA 3PX X-Received: by 2002:a05:600c:c107:b0:490:e196:eaee with SMTP id 5b1f17b1804b1-490ec509c52mr69174555e9.10.1781305769100; Fri, 12 Jun 2026 16:09:29 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 3/7] CI: Introduce new qubes-hw-runner.dockerfile Date: Sat, 13 Jun 2026 00:09:20 +0100 Message-Id: <20260612230924.3181154-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1781305769-8816CA53-0008AE5E/10/63158204843 X-purgate-type: spam X-purgate-size: 2351 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305799913158500 This container is tied to gitlab-runner environment in the RPis driving the test systems, not a specific version of Alpine. Intentionally give it a generic name so it need not change in the future. Switch to Alpine 3.24 right away, as it doesn't interact with the 3.18 buil= ds under test. The container needs to remain a root container. By no longer using the arm64v8 build container for dual-purpose, we can finally make the build containers be non-root. No practical change. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko Posted previously, part of the prior CI series. --- .../build/alpine/qubes-hw-runner.dockerfile | 21 +++++++++++++++++++ automation/gitlab-ci/test.yaml | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 automation/build/alpine/qubes-hw-runner.dockerfile diff --git a/automation/build/alpine/qubes-hw-runner.dockerfile b/automatio= n/build/alpine/qubes-hw-runner.dockerfile new file mode 100644 index 000000000000..8b111648721d --- /dev/null +++ b/automation/build/alpine/qubes-hw-runner.dockerfile @@ -0,0 +1,21 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/arm64/v8 alpine:3.24 +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash + +RUN < (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 1781305815742134.86028754201493; Fri, 12 Jun 2026 16:10:15 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337052.1598728 (Exim 4.92) (envelope-from ) id 1wYB0G-0002cP-SP; Fri, 12 Jun 2026 23:09:32 +0000 Received: by outflank-mailman (output) from mailman id 1337052.1598728; Fri, 12 Jun 2026 23:09:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0G-0002bd-Or; Fri, 12 Jun 2026 23:09:32 +0000 Received: by outflank-mailman (input) for mailman id 1337052; Fri, 12 Jun 2026 23:09:32 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0F-00029X-NH for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:31 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0F-00HIs8-3w for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:31 +0200 Received: from [10.42.69.2] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c915b-5cb7-0a2a0a5109dd-0a2a4502ddb2-22 for ; Sat, 13 Jun 2026 01:09:31 +0200 Received: from [209.85.221.44] (helo=mail-wr1-f44.google.com) by tlsNG-720697.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91aa-af86-0a2a45020019-d155dd2ca954-3 for ; Sat, 13 Jun 2026 01:09:31 +0200 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-45ee5cdbd28so1556248f8f.1 for ; Fri, 12 Jun 2026 16:09:31 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:29 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305770; x=1781910570; 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=mNdU35BttH64TZdXrpZk6Pea4Pf1aJ80D0BD0gDbtew=; b=RmYL127n0BEpxndNEtFRg/keMW495qiSX/GwTPGq66Rfx9obRxn4FJ/lD1VFZpog0N JVwkUfCiOuy0mco39svRfNppNm+VFNu5piYuVo5HbuZrmKSSZlDM1mqEHn8GBm3whK/k d+Lo6cUWhhUoSGheE4nAOEKx0LTPtKeGryAHg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305770; x=1781910570; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=mNdU35BttH64TZdXrpZk6Pea4Pf1aJ80D0BD0gDbtew=; b=IWf+LeiYjBvKvninzhCXSdMUtAmZ2P4c64Ks52dMvVQdmwIWCFxH0Ia2eapK3uHygR dSr5esztzg0sgOfB9Bg9v9tM8ueEhom09FiQ7NQ+oEiKIPFZYZeEfBI+KlVcy2DHBfL8 aSLasfxuLiGO9udYblKYHuFd9jIOZ6Up1wos76xCgsAQ/VRAH3QeEZ36h09G1q0tzSRp 8QqtqopSmrUiPU+kZOkRTuEqYIjXM0xsbMRA8Sv41g18F95wfnwa3zy04UOTXlLj1CmQ PVMyEdl3NCvLTpJhiuOfhhgXSHkZeEjbrirHuwN5TQBI0PTKKR7/5wGC3RqcudjqoPHM K+hg== X-Gm-Message-State: AOJu0YzG9yNPH0Q4Ux7qQtvnatopT7KC0F2R8legAtSxtNfUQfbWtojD RMJwRV4zSHEoGIOxGCiCGDQVIuTtxu4ms3GEaxJKcBLlvawLzmwlpDIPPWeDlTcXbL+53QxF/Wy KxG77 X-Gm-Gg: Acq92OEvysOQGEczuSeqSMu0dAkw189/C7akp7ig/tdN5oIviYHStPCMslKY7QT27Lr yFJs26PoKSjPlWfuJ7sQwkNvDbO3CJB7Kt8e94AUmdb2cJaRKPmuuY97GF5ZSKRpjc3WKsTYiPp tBt1n/KJXgVFb8Xyqahw7stjSb1i1qRvkzYMGm/H88nkmxDTImlwelAfFSUmaYBq5Qwgua+P2y1 aQJrT1NVPvXc6K7EI343wbFMRFBsJDVuQPf26F2R9OFybhmn9k9ltSFx0VErftQNa8gMpTrf4sN ufLaspa7rpbm19lvvT3FdeZMV8uy/pFK2Mw/qffHe99KLdL67v7HDAoENg19u5ZYf/RXfFry69J wuZBdS9yt9gWvi+sA9W504Lj+MQuNH4YZuUbP8pyShRk4LpCEP3P+glMtemn8nDd+6jp1aiINyb XRq3XvUahIeBIz9tZC1XVR5PTBNJPorFtHfT1+U//wMQc/KIhpaMZpqfK+Aj3o5VVZD2iLNwilS UrdMpgQAT/YrCY= X-Received: by 2002:a5d:64cd:0:b0:460:395c:7404 with SMTP id ffacd0b85a97d-4606f25dd0dmr6094805f8f.20.1781305770305; Fri, 12 Jun 2026 16:09:30 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 4/7] CI: Update the Alpine x86_64 container to 3.24 Date: Sat, 13 Jun 2026 00:09:21 +0100 Message-Id: <20260612230924.3181154-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-720697/1781305771-8256B161-373B2C2A/10/63158204843 X-purgate-type: spam X-purgate-size: 15246 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305815890158500 Perform standard syntax cleanup and make it a non-root container. Switch y= ajl for json-c given the deprecation of the former. Add an x86_64 suffix for naming consistency with everything else. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko Requires the test-artefacts change to add alpine-3.24-x86_64-rootfs --- automation/build/alpine/3.18.dockerfile | 52 --------------- .../build/alpine/3.24-x86_64.dockerfile | 65 ++++++++++++++++++ automation/gitlab-ci/build.yaml | 16 ++--- automation/gitlab-ci/test.yaml | 66 +++++++++---------- automation/scripts/containerize | 2 +- 5 files changed, 107 insertions(+), 94 deletions(-) delete mode 100644 automation/build/alpine/3.18.dockerfile create mode 100644 automation/build/alpine/3.24-x86_64.dockerfile diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alp= ine/3.18.dockerfile deleted file mode 100644 index 263e9e90d888..000000000000 --- a/automation/build/alpine/3.18.dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# syntax=3Ddocker/dockerfile:1 -FROM --platform=3Dlinux/amd64 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 - -# build depends -RUN apk --no-cache add \ - \ - # xen build deps - argp-standalone \ - autoconf \ - bash \ - bison \ - clang \ - curl \ - dev86 \ - flex \ - g++ \ - gcc \ - git \ - grep \ - iasl \ - libaio-dev \ - libc6-compat \ - linux-headers \ - make \ - musl-dev \ - ncurses-dev \ - ocaml \ - ocaml-findlib \ - patch \ - python3-dev \ - py3-setuptools \ - texinfo \ - util-linux-dev \ - xz-dev \ - yajl-dev \ - zlib-dev \ - \ - # qemu build deps - glib-dev \ - libattr \ - libcap-ng-dev \ - ninja \ - pixman-dev \ - # livepatch-tools deps - elfutils-dev \ diff --git a/automation/build/alpine/3.24-x86_64.dockerfile b/automation/bu= ild/alpine/3.24-x86_64.dockerfile new file mode 100644 index 000000000000..f93158e0186d --- /dev/null +++ b/automation/build/alpine/3.24-x86_64.dockerfile @@ -0,0 +1,65 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/amd64 alpine:3.24 +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash + +RUN <&1 | tee ${L= OGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 xilinx-smoke-dom0-x86_64-gcc-debug-argo: extends: .xilinx-x86_64 script: - ./automation/scripts/xilinx-smoke-dom0-x86_64.sh argo 2>&1 | tee ${L= OGFILE} needs: - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug - project: xen-project/hardware/test-artifacts job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: alpine-3.18-x86_64-rootfs + job: alpine-3.24-x86_64-rootfs ref: master - project: xen-project/hardware/test-artifacts job: microcode-x86 @@ -260,7 +260,7 @@ adl-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-smoke-x86-64-dom0pvh-gcc-debug: extends: .adl-x86-64 @@ -268,7 +268,7 @@ adl-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: extends: .adl-x86-64 @@ -276,7 +276,7 @@ adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-suspend-x86-64-gcc-debug: extends: .adl-x86-64 @@ -284,7 +284,7 @@ adl-suspend-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-pci-pv-x86-64-gcc-debug: extends: .adl-x86-64 @@ -292,7 +292,7 @@ adl-pci-pv-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-pci-hvm-x86-64-gcc-debug: extends: .adl-x86-64 @@ -300,7 +300,7 @@ adl-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-pvshim-x86-64-gcc-debug: extends: .adl-x86-64 @@ -308,7 +308,7 @@ adl-pvshim-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-tools-tests-pv-x86-64-gcc-debug: extends: .adl-x86-64 @@ -319,7 +319,7 @@ adl-tools-tests-pv-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 adl-tools-tests-pvh-x86-64-gcc-debug: extends: .adl-x86-64 @@ -330,7 +330,7 @@ adl-tools-tests-pvh-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-smoke-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -338,7 +338,7 @@ kbl-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-smoke-x86-64-dom0pvh-gcc-debug: extends: .kbl-x86-64 @@ -346,7 +346,7 @@ kbl-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: extends: .kbl-x86-64 @@ -354,7 +354,7 @@ kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-suspend-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -362,7 +362,7 @@ kbl-suspend-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-pci-pv-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -370,7 +370,7 @@ kbl-pci-pv-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-pci-hvm-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -378,7 +378,7 @@ kbl-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-pvshim-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -386,7 +386,7 @@ kbl-pvshim-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-tools-tests-pv-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -397,7 +397,7 @@ kbl-tools-tests-pv-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 kbl-tools-tests-pvh-x86-64-gcc-debug: extends: .kbl-x86-64 @@ -408,7 +408,7 @@ kbl-tools-tests-pvh-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen2-smoke-x86-64-gcc-debug: extends: .zen2-x86-64 @@ -416,7 +416,7 @@ zen2-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen2-suspend-x86-64-gcc-debug: extends: .zen2-x86-64 @@ -424,7 +424,7 @@ zen2-suspend-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -432,7 +432,7 @@ zen3p-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-smoke-x86-64-dom0pvh-gcc-debug: extends: .zen3p-x86-64 @@ -440,7 +440,7 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: extends: .zen3p-x86-64 @@ -448,7 +448,7 @@ zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -456,7 +456,7 @@ zen3p-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-pvshim-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -464,7 +464,7 @@ zen3p-pvshim-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-tools-tests-pv-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -475,7 +475,7 @@ zen3p-tools-tests-pv-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 zen3p-tools-tests-pvh-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -486,7 +486,7 @@ zen3p-tools-tests-pvh-x86-64-gcc-debug: junit: tests-junit.xml needs: - *x86-64-test-needs - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 @@ -654,7 +654,7 @@ qemu-alpine-x86_64-gcc: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.18-gcc + - alpine-3.24-x86_64-gcc =20 qemu-smoke-x86-64-gcc: extends: .qemu-smoke-x86-64 @@ -698,7 +698,7 @@ qemu-xtf-argo-x86_64-gcc-debug: script: - ./automation/scripts/qemu-xtf.sh x86-64 pv64 argo 2>&1 | tee ${LOGFI= LE} needs: - - alpine-3.18-gcc-debug + - alpine-3.24-x86_64-gcc-debug =20 qemu-smoke-riscv64-gcc: extends: .qemu-riscv64 diff --git a/automation/scripts/containerize b/automation/scripts/container= ize index aea842e1ff2d..e9b2f6122ff1 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -24,7 +24,7 @@ die() { # BASE=3D"registry.gitlab.com/xen-project/xen" case "_${CONTAINER}" in - _alpine) CONTAINER=3D"${BASE}/alpine:3.18" ;; + _alpine) CONTAINER=3D"${BASE}/alpine:3.24-x86_64" ;; _alpine-arm64v8) CONTAINER=3D"${BASE}/alpine:3.18-arm64v8" ;; _archlinux|_arch) CONTAINER=3D"${BASE}/archlinux:current-x86_64" ;; _fedora) CONTAINER=3D"${BASE}/fedora:43-x86_64";; --=20 2.39.5 From nobody Sat Jun 13 07:34:23 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=1781305809; cv=none; d=zohomail.com; s=zohoarc; b=TxXRkA6HQQW8BPo2d3Ntr9IqRdQQYWFdqhTEBeMKwpDB+Uy/+ih/yFU41KeSmblzm8mb2ajfqV/lndDGhTFMSDL/Hti98gBt4KXzCzuaCC2usFvwxdE+zZSItm0lLsDvjBW8ce4K5u7t4SnQXi8hCl67EFYXbck3JtkP+0+S5zM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305809; 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=Kcf/WI93RAFHfmUF0my5rnSxM7s1K4C7gOFPv+zFjeM=; b=T3+N8XG2lQYCICPNsM0Bnz49L5YE0KG8KZgNQLNDqk54MyL965dW7NtXXmsCoCytPQAsBDPTDGHrgxNgSTa5yz0iAHWU/kh3ZRwO4GoHmyvKecnS+xcg7SWBTH6QVqjlh79ldy8M7mZY+zhrb9gWWjqEPEUF9ohqdKeT5AQkhR0= 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 1781305809730694.7922601825566; Fri, 12 Jun 2026 16:10:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337053.1598738 (Exim 4.92) (envelope-from ) id 1wYB0I-0002qz-8c; Fri, 12 Jun 2026 23:09:34 +0000 Received: by outflank-mailman (output) from mailman id 1337053.1598738; Fri, 12 Jun 2026 23:09:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0I-0002qb-4l; Fri, 12 Jun 2026 23:09:34 +0000 Received: by outflank-mailman (input) for mailman id 1337053; Fri, 12 Jun 2026 23:09:32 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0G-0002Rh-Dp for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:32 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0F-00HQFu-R8 for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:31 +0200 Received: from [10.42.69.12] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c91aa-bab6-0a2a0a5309dd-0a2a450cdf7e-2 for ; Sat, 13 Jun 2026 01:09:31 +0200 Received: from [209.85.128.41] (helo=mail-wm1-f41.google.com) by tlsNG-d25034.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91ab-62f1-0a2a450c0019-d1558029c58b-3 for ; Sat, 13 Jun 2026 01:09:31 +0200 Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490ae94a89eso12816255e9.1 for ; Fri, 12 Jun 2026 16:09:31 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:30 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305771; x=1781910571; 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=Kcf/WI93RAFHfmUF0my5rnSxM7s1K4C7gOFPv+zFjeM=; b=t5PFUODQ9910psNrkjzf0LLsLSa/X3p+v1S2Uw4bx9i2zSafY7R9LYgoJE/4eNYVz1 pYSVAqVs6nr/r0r2/7YVRlQGs+Md9pE/VIKPhEwViF2JWDYkAA7VdvZIdN5wSpreZpnk L0Xe0g7nO5yKdZPyfTuhF0o0jrUDofTjIOytM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305771; x=1781910571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Kcf/WI93RAFHfmUF0my5rnSxM7s1K4C7gOFPv+zFjeM=; b=aXlCoOljVLgTUm8Z43kVD7gqj9X1yCF7ky6CplFafRLROl646ho6fLHJFe0LlaXlNi xzH7P4V9ZNgJuulDFdfwqccOFQShrTOhOAFPyb50pv5tTjLYUU30a0PcaxkZKVNXdX+Q fzn78sf5iOD3DjuNxb6xPK0z6enFzTQAqQKEm11i96TO8Cs4PeJKVz8f6k0SvpQld0fM VyDgeYkGT6oFucIjYjf5iWCVCdwcDVW4XIOYyi9AqNOzWNRJmy4+LyInUc7D6eRQ86U2 ZfHu1IGtCmYf3SiRaaJfZxWElsdXfAcZHmLCWQtj3nBmtNFugahHrsGrmpl84ImSfEdX AY+Q== X-Gm-Message-State: AOJu0YxO1Nk4vRLvvQfgnA6HM8/uQ5Mm2R5utfrttk/QP2uDHZ+OOxxm RjSPT3inAUexrIuI6lhNKmrKMap1DAPD1RVks9LRa+ct8Ot/rTXueOSU9I5OcNpx0Zk82lrvsKV KjCAW X-Gm-Gg: Acq92OG22lo1hXSDbj/NZVPT1oDPVmQL6oe3H+AOwsUQS3vEEclAM7EJRK3RNOFtFE0 X/jg2uggDPxbJ2Lb7b8n9Eg7imGfLcRt3k8uchSFnwwo7o6WIQjHxbQwUzi3CiGCIIj583EK872 QjWupJo0VRzBadx4MXg2q6zyQWyyV0ADhBmbJgOKk0j2EM/qv++47hzxErGL5Jen0e9sfIaLtGV fposQ5ki3NcT8NIFc1rBLojhy/mjN5lntIMZExrmLEKJ0cBJLLfkirrSWufQ3mn/suOrTq7HGNG /KjnFXbXJwHJlvbPFOb6VpdnsQTYypDzbx7qV4ox/X3tap1ogySztOxxIyCp3uYnmO3cNzNp02s 9WmHOuy/XqK1qPsfiNFFEngzPKH793Efii/JgEAat8p8Nm6cgQ4Lob0HZ5q5a2NYM4HcdptPavq goLaMhA9lQ1s/kZG5PabSoXJLClpd6dDCBAj6RySM4s3Pu2Sy3JHuQLJuwrq0trkAfsXgHpLWip crK X-Received: by 2002:a05:600c:47d3:b0:490:d354:bcf4 with SMTP id 5b1f17b1804b1-492200e2409mr9061075e9.27.1781305771094; Fri, 12 Jun 2026 16:09:31 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 5/7] CI: Update the Alpine arm64 container to 3.24 Date: Sat, 13 Jun 2026 00:09:22 +0100 Message-Id: <20260612230924.3181154-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-d25034/1781305771-E0F62CF5-3A5A4768/10/63158204843 X-purgate-type: spam X-purgate-size: 11574 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305810101158500 Perform standard syntax cleanup and make it a non-root container. Switch y= ajl for json-c given the deprecation of the former. Drop dev86 which is an x86-only dependency, and QEMU dependencies as we don't build QEMU in this environment any more. When updating the job names, also rename some for consistency so the arm64 fragment comes before the compiler. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko Requires the test-artefacts change to add alpine-3.24-arm64-rootfs --- .../build/alpine/3.18-arm64v8.dockerfile | 51 ------------------ .../build/alpine/3.24-arm64v8.dockerfile | 53 +++++++++++++++++++ automation/gitlab-ci/build.yaml | 32 +++++------ automation/gitlab-ci/test.yaml | 30 +++++------ 4 files changed, 84 insertions(+), 82 deletions(-) delete mode 100644 automation/build/alpine/3.18-arm64v8.dockerfile create mode 100644 automation/build/alpine/3.24-arm64v8.dockerfile diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/b= uild/alpine/3.18-arm64v8.dockerfile deleted file mode 100644 index b8482d5bf43f..000000000000 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ /dev/null @@ -1,51 +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 - -# build depends -RUN apk --no-cache add \ - \ - # xen build deps - argp-standalone \ - autoconf \ - bash \ - bison \ - curl \ - dev86 \ - dtc-dev \ - flex \ - gcc \ - git \ - iasl \ - libaio-dev \ - libfdt \ - linux-headers \ - make \ - musl-dev \ - ncurses-dev \ - ocaml \ - ocaml-findlib \ - patch \ - python3-dev \ - py3-setuptools \ - texinfo \ - util-linux-dev \ - xz-dev \ - yajl-dev \ - zlib-dev \ - \ - # qemu build deps - glib-dev \ - libattr \ - libcap-ng-dev \ - pixman-dev \ - # qubes test deps - openssh-client \ - fakeroot \ - expect \ diff --git a/automation/build/alpine/3.24-arm64v8.dockerfile b/automation/b= uild/alpine/3.24-arm64v8.dockerfile new file mode 100644 index 000000000000..5b28d874efae --- /dev/null +++ b/automation/build/alpine/3.24-arm64v8.dockerfile @@ -0,0 +1,53 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/arm64/v8 alpine:3.24 +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash + +RUN <&1 | tee ${LOG= FILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough: extends: .xilinx-arm64 @@ -228,7 +228,7 @@ xilinx-smoke-dom0less-arm64-gcc-debug-gem-passthrough: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough = 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 xilinx-smoke-dom0-x86_64-gcc-debug: extends: .xilinx-x86_64 @@ -494,7 +494,7 @@ qemu-smoke-dom0-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.24-arm64-gcc =20 qemu-smoke-dom0-arm64-gcc-debug: extends: .qemu-arm64 @@ -502,7 +502,7 @@ qemu-smoke-dom0-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 qemu-smoke-dom0less-arm64-gcc: extends: .qemu-arm64 @@ -510,7 +510,7 @@ qemu-smoke-dom0less-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFI= LE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.24-arm64-gcc =20 qemu-smoke-dom0less-arm64-gcc-debug: extends: .qemu-arm64 @@ -518,7 +518,7 @@ qemu-smoke-dom0less-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFI= LE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 qemu-smoke-dom0less-arm64-gcc-debug-gicv3: extends: .qemu-arm64 @@ -526,7 +526,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-gicv3: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh gicv3 2>&1 | tee $= {LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 qemu-smoke-dom0less-arm64-gcc-debug-staticmem: extends: .qemu-arm64 @@ -534,7 +534,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticmem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-staticmem + - alpine-3.24-arm64-gcc-debug-staticmem =20 qemu-smoke-dom0less-arm64-gcc-debug-staticheap: extends: .qemu-arm64 @@ -542,7 +542,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticheap: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: extends: .qemu-arm64 @@ -550,7 +550,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem = 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-static-shared-mem + - alpine-3.24-arm64-gcc-debug-static-shared-mem =20 qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: extends: .qemu-arm64 @@ -558,7 +558,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1= | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-boot-cpupools + - alpine-3.24-arm64-gcc-debug-boot-cpupools =20 qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk: extends: .qemu-arm64 @@ -566,7 +566,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-earlyprintk: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh earlyprintk 2>&1 |= tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64-earlyprintk + - alpine-3.24-arm64-gcc-debug-earlyprintk =20 qemu-xtf-dom0less-arm64-gcc-hyp-xen-version: extends: .qemu-arm64 @@ -574,7 +574,7 @@ qemu-xtf-dom0less-arm64-gcc-hyp-xen-version: - ./automation/scripts/qemu-xtf.sh arm64 mmu64le hyp-xen-version 2>&1 = | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-arm64 + - alpine-3.24-arm64-gcc =20 qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: extends: .qemu-arm64 @@ -582,7 +582,7 @@ qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: - ./automation/scripts/qemu-xtf.sh arm64 mmu64le hyp-xen-version 2>&1 = | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.18-gcc-debug-arm64 + - alpine-3.24-arm64-gcc-debug =20 qemu-smoke-dom0-arm32-gcc: extends: .qemu-arm32 --=20 2.39.5 From nobody Sat Jun 13 07:34:23 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=1781305812; cv=none; d=zohomail.com; s=zohoarc; b=XcrA/BR9NJ8IkVYZzhj1eQYAifXN6eZi7OXX8TcqDLRurN12/SpO0WSAXfJiExTstqnxXR/EXtl4CSMwl7AM7Zgs6zVJIdeCEqsfPJQcgXd+Xfkh9D8tD4IGRCj/JZmLD5TCvem2N2Gtq4WMUxr2sZH62yxqtAxlLFK99UtfThU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305812; 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=KFyw1G28LeeEU4Gr9TD1kO3R30BodTfCNqazb+xAagQ=; b=OZPbOQXpo2GsUhmygAM0EiGh9wyFq5IU1sYO9wxxu0jFE9uEvNo3/srO4GQOH2Mss1/MGPo3yvnrBilvwo3k++P0LfaogzincI3IzwzNk2EDT9ln3IhnHUhlBgGNsoyRXUIomia25I/zapOYWngJTMIxetG+FlR2mNdqiDdoedI= 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 1781305812069925.462408184548; Fri, 12 Jun 2026 16:10:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337055.1598756 (Exim 4.92) (envelope-from ) id 1wYB0K-0003KZ-PQ; Fri, 12 Jun 2026 23:09:36 +0000 Received: by outflank-mailman (output) from mailman id 1337055.1598756; Fri, 12 Jun 2026 23:09:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0K-0003KQ-Lc; Fri, 12 Jun 2026 23:09:36 +0000 Received: by outflank-mailman (input) for mailman id 1337055; Fri, 12 Jun 2026 23:09:34 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0I-0002qs-Ak for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:34 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0H-00HQFu-O0 for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:33 +0200 Received: from [10.42.69.12] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c91aa-bab6-0a2a0a5309dd-0a2a450cdf7e-4 for ; Sat, 13 Jun 2026 01:09:33 +0200 Received: from [209.85.128.45] (helo=mail-wm1-f45.google.com) by tlsNG-d25034.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91ad-62f1-0a2a450c0019-d155802dc82e-3 for ; Sat, 13 Jun 2026 01:09:33 +0200 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-490a76757e5so11219995e9.2 for ; Fri, 12 Jun 2026 16:09:33 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:31 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305772; x=1781910572; 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=KFyw1G28LeeEU4Gr9TD1kO3R30BodTfCNqazb+xAagQ=; b=dy3gqzy6rZpRMjzKbSEbsxYqFsbDBjFrJOV0cb+erwj4lD2UY3bzh3YffjyLp7vovD PbONU4LQ1Hv+pNF8kvtpUnKYRAk07OoNIa/1Cu46BD6UTsWQMFgjP8gBorSPC7UFyNvf bobQQken0J6+RxQJgFfXnpC2RT7LjuD8rntk0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305772; x=1781910572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KFyw1G28LeeEU4Gr9TD1kO3R30BodTfCNqazb+xAagQ=; b=CEvJhngwmlI/i64vXDCPPgpTJRZpB1+oCmhMp2Bf9u14QWAEf7d7CTnDsn8EYf+Cs2 ls8lvBtXvAvPvtuVZSZIF2XQhi4PwGqxzkAHzpQMo2YxWDLhG4a2BhZYUcvIh6qXRFsD krMePttQTTwaBdFxwtDuOHwCfFmFydxewovapPLIhuSHChpob4ojWL7seTL7hk7YYLJP unvBBkdj53RQpttUY4hbbjERJvo2uZ0kOoJ70fxqnnZsxC266n3+58fw1Ak1l+xxCzmB djzbUhQVH6ZxwHbhe2XFVSgtDFnS+q+l9nalqI4IESw0QywImpkaTrM8wTWzA6aoXSRn KyMA== X-Gm-Message-State: AOJu0Yxk0a5lQ2UeXG7mQs491PHF2Ij/Y5MUPr6sCyBIMI+dwbFBjxsw OICyG15zrFxdyHPIw4iPsaGTaOceWiq6IiRvwI/8QmeR8acEylfdatz7bohs7AL5c1nAHL+GSZI W3bvJ X-Gm-Gg: Acq92OH28l7DetbtFqa7Jdx6ppQKkxpJfR0XUXdII3ACRHHaDVWoEb0bJN3nqWPPVW3 M95+rzWWqQyzFR5Rx8qXgUN8r3cwTQiKD/UmpnIqExh320rF9TR7DIOIyl1fu3c+yiK21e04Ow+ rC/iYq2Rw/ZP9EzXErvFpGwkBK539cEXHU4OPwhQ79acJg3VuxdLe8uIIN/OR13USV/9QOrp6t/ s0sfkcSG2DjTxxP+kmL7clM0EnTMEEbi8+83rn5kbRe8vqwo5e5V8yUo67ZTHtt1BDMWkLNt21Y XyXF02fYKRowOEcq4u+FFhhYPa3ZkfUpiec2H5cATEsZGiy0oxeinG1igTyLFuwncEZ+QhZ3tIV rq5QfAzvHz0tF03b0726icLLA1hyQ1Ryo70KAxWzOTy7yBunPSZ5VB9MIgQgeU/EWxgwe5Ev0lI HJ4RUZyhOFpU3xtpoyJSOoXyYsYrePOnwLREle1lxKUMWnepXFzcE9QpXx9gljF9dx06AEmLm/s ZeJ X-Received: by 2002:a05:600c:348b:b0:490:e5c1:b89e with SMTP id 5b1f17b1804b1-49220061e38mr15308485e9.10.1781305771866; Fri, 12 Jun 2026 16:09:31 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 6/7] CI: Fix inconsistent use of x86-{64,32} vs x86_{64,32} Date: Sat, 13 Jun 2026 00:09:23 +0100 Message-Id: <20260612230924.3181154-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-d25034/1781305773-DA577CF5-ACB945E7/10/73395122804 X-purgate-type: spam X-purgate-size: 29389 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305813917158500 The configuration uses a mix of dashes and underscores, which is irritating= to develop for. Switch to using the underscore form consistently; it is the m= ore common form and it has the benefit that it allows splitting on dashes to wo= rk sensibly. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko This also removes an artefact from Cody's Gitlab status page, which does use simple splitting on dashes, and ends up with a mix of "x86" and "x86_64". I've left Yocto alone. They have bigger problems than just underscores, and the jobs have bitrotted while they've been off. --- automation/gitlab-ci/build.yaml | 154 +++++----- automation/gitlab-ci/test.yaml | 280 +++++++++--------- .../{xtf-x86-64-config =3D> xtf-x86_64-config} | 0 ...86-64-efi-config =3D> xtf-x86_64-efi-config} | 0 .../include/{xtf-x86-64 =3D> xtf-x86_64} | 0 .../{xtf-x86-64-efi =3D> xtf-x86_64-efi} | 0 .../{qubes-x86-64.sh =3D> qubes-x86_64.sh} | 0 7 files changed, 217 insertions(+), 217 deletions(-) rename automation/scripts/include/configs/{xtf-x86-64-config =3D> xtf-x86_= 64-config} (100%) rename automation/scripts/include/configs/{xtf-x86-64-efi-config =3D> xtf-= x86_64-efi-config} (100%) rename automation/scripts/include/{xtf-x86-64 =3D> xtf-x86_64} (100%) rename automation/scripts/include/{xtf-x86-64-efi =3D> xtf-x86_64-efi} (10= 0%) rename automation/scripts/{qubes-x86-64.sh =3D> qubes-x86_64.sh} (100%) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index fa054a82800b..d5929e34ecaa 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -36,77 +36,77 @@ CXX: clang++ clang: y =20 -.x86-64-build-tmpl: +.x86_64-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_64 tags: - x86_64 =20 -.x86-64-build: - extends: .x86-64-build-tmpl +.x86_64-build: + extends: .x86_64-build-tmpl variables: debug: n =20 -.x86-64-build-debug: - extends: .x86-64-build-tmpl +.x86_64-build-debug: + extends: .x86_64-build-tmpl variables: debug: y =20 -.x86-32-build-tmpl: +.x86_32-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_32 tags: - x86_32 =20 -.x86-32-build: - extends: .x86-32-build-tmpl +.x86_32-build: + extends: .x86_32-build-tmpl variables: debug: n =20 -.x86-32-build-debug: - extends: .x86-32-build-tmpl +.x86_32-build-debug: + extends: .x86_32-build-tmpl variables: debug: y =20 -.gcc-x86-64-build: - extends: .x86-64-build +.gcc-x86_64-build: + extends: .x86_64-build variables: <<: *gcc =20 -.gcc-x86-64-build-debug: - extends: .x86-64-build-debug +.gcc-x86_64-build-debug: + extends: .x86_64-build-debug variables: <<: *gcc =20 -.gcc-x86-32-build: - extends: .x86-32-build +.gcc-x86_32-build: + extends: .x86_32-build variables: <<: *gcc =20 -.gcc-x86-32-build-debug: - extends: .x86-32-build-debug +.gcc-x86_32-build-debug: + extends: .x86_32-build-debug variables: <<: *gcc =20 -.clang-x86-64-build: - extends: .x86-64-build +.clang-x86_64-build: + extends: .x86_64-build variables: <<: *clang =20 -.clang-x86-64-build-debug: - extends: .x86-64-build-debug +.clang-x86_64-build-debug: + extends: .x86_64-build-debug variables: <<: *clang =20 -.clang-x86-32-build: - extends: .x86-32-build +.clang-x86_32-build: + extends: .x86_32-build variables: <<: *clang =20 -.clang-x86-32-build-debug: - extends: .x86-32-build-debug +.clang-x86_32-build-debug: + extends: .x86_32-build-debug variables: <<: *clang =20 @@ -244,25 +244,25 @@ tags: - arm64 =20 -.yocto-test-x86-64: +.yocto-test-x86_64: extends: .yocto-test tags: - x86_64 =20 -.x86-64-cross-build-tmpl: +.x86_64-cross-build-tmpl: <<: *build variables: XEN_TARGET_ARCH: x86_64 tags: - arm64 =20 -.x86-64-cross-build: - extends: .x86-64-cross-build-tmpl +.x86_64-cross-build: + extends: .x86_64-cross-build-tmpl variables: debug: n =20 -.gcc-x86-64-cross-build: - extends: .x86-64-cross-build +.gcc-x86_64-cross-build: + extends: .x86_64-cross-build variables: <<: *gcc =20 @@ -271,13 +271,13 @@ # Build jobs needed for tests =20 alpine-3.24-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build <<: *build-test variables: CONTAINER: alpine:3.24-x86_64 =20 alpine-3.24-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug <<: *build-test variables: CONTAINER: alpine:3.24-x86_64 @@ -292,13 +292,13 @@ alpine-3.24-x86_64-gcc-debug: CONFIG_XHCI=3Dy =20 debian-13-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug <<: *build-test variables: CONTAINER: debian:13-x86_64 =20 debian-13-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug <<: *build-test variables: CONTAINER: debian:13-x86_64 @@ -482,14 +482,14 @@ yocto-qemuarm: YOCTO_OUTPUT: --copy-output =20 yocto-qemux86-64: - extends: .yocto-test-x86-64 + extends: .yocto-test-x86_64 variables: YOCTO_BOARD: qemux86-64 =20 # Cppcheck analysis jobs =20 debian-12-x86_64-gcc-cppcheck: - extends: .gcc-x86-64-cross-build + extends: .gcc-x86_64-cross-build variables: CONTAINER: debian:12-arm64v8-cppcheck CROSS_COMPILE: /usr/bin/x86_64-linux-gnu- @@ -514,29 +514,29 @@ debian-12-arm64-gcc-cppcheck: # Build jobs not needed for tests =20 alpine-3.24-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: alpine:3.24-x86_64 =20 alpine-3.24-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: alpine:3.24-x86_64 =20 archlinux-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: archlinux:current-x86_64 allow_failure: true =20 archlinux-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: archlinux:current-x86_64 allow_failure: true =20 debian-12-x86_64-gcc-ibt: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:12-x86_64-gcc-ibt RANDCONFIG: y @@ -544,42 +544,42 @@ debian-12-x86_64-gcc-ibt: CONFIG_XEN_IBT=3Dy =20 debian-12-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:12-x86_64 =20 debian-12-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: debian:12-x86_64 =20 debian-12-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:12-x86_64 =20 debian-12-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: debian:12-x86_64 =20 debian-12-x86_32-clang-debug: - extends: .clang-x86-32-build-debug + extends: .clang-x86_32-build-debug variables: CONTAINER: debian:12-x86_32 =20 debian-12-x86_32-gcc-debug: - extends: .gcc-x86-32-build-debug + extends: .gcc-x86_32-build-debug variables: CONTAINER: debian:12-x86_32 =20 debian-13-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:13-x86_64 =20 debian-13-x86_64-clang-randconfig: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: debian:13-x86_64 RANDCONFIG: y @@ -587,136 +587,136 @@ debian-13-x86_64-clang-randconfig: CONFIG_COVERAGE=3Dn # Disable coverage otherwise build times out. =20 debian-13-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:13-x86_64 =20 debian-13-x86_64-gcc-randconfig: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: debian:13-x86_64 RANDCONFIG: y =20 debian-13-x86_32-clang-debug: - extends: .clang-x86-32-build-debug + extends: .clang-x86_32-build-debug variables: CONTAINER: debian:13-x86_32 =20 debian-13-x86_32-gcc-debug: - extends: .gcc-x86-32-build-debug + extends: .gcc-x86_32-build-debug variables: CONTAINER: debian:13-x86_32 =20 fedora-43-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: fedora:43-x86_64 =20 fedora-43-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: fedora:43-x86_64 =20 ubuntu-18.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:18.04-x86_64 =20 ubuntu-18.04-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: ubuntu:18.04-x86_64 =20 ubuntu-20.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:20.04-x86_64 =20 ubuntu-22.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:22.04-x86_64 =20 ubuntu-22.04-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: ubuntu:22.04-x86_64 =20 ubuntu-22.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:22.04-x86_64 =20 ubuntu-24.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:24.04-x86_64 =20 ubuntu-24.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:24.04-x86_64 =20 ubuntu-26.04-x86_64-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: ubuntu:26.04-x86_64 =20 ubuntu-26.04-x86_64-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: ubuntu:26.04-x86_64 =20 ubuntu-26.04-x86_64-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: ubuntu:26.04-x86_64 =20 ubuntu-26.04-x86_64-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: ubuntu:26.04-x86_64 =20 opensuse-leap-16.0-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: opensuse:leap-16.0-x86_64 =20 opensuse-leap-16.0-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: opensuse:leap-16.0-x86_64 =20 opensuse-leap-16.0-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: opensuse:leap-16.0-x86_64 =20 opensuse-leap-16.0-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: opensuse:leap-16.0-x86_64 =20 opensuse-tumbleweed-clang: - extends: .clang-x86-64-build + extends: .clang-x86_64-build variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true =20 opensuse-tumbleweed-clang-debug: - extends: .clang-x86-64-build-debug + extends: .clang-x86_64-build-debug variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true =20 opensuse-tumbleweed-gcc: - extends: .gcc-x86-64-build + extends: .gcc-x86_64-build variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true =20 opensuse-tumbleweed-gcc-debug: - extends: .gcc-x86-64-build-debug + extends: .gcc-x86_64-build-debug variables: CONTAINER: opensuse:tumbleweed-x86_64 allow_failure: true diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 2a7a0e513e72..fa3f776fc785 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -21,7 +21,7 @@ job: microcode-x86 ref: $ARTIFACTS_BRANCH =20 -.x86-64-test-needs: &x86-64-test-needs +.x86_64-test-needs: &x86_64-test-needs - project: $ARTIFACTS_REPO job: $LINUX_JOB_X86_64 ref: $ARTIFACTS_BRANCH @@ -58,11 +58,11 @@ tags: - arm64 =20 -.qemu-x86-64: +.qemu-x86_64: extends: .test-jobs-common variables: CONTAINER: debian:13-x86_64 - LOGFILE: qemu-smoke-x86-64.log + LOGFILE: qemu-smoke-x86_64.log artifacts: paths: - smoke.serial @@ -71,8 +71,8 @@ tags: - x86_64 =20 -.qemu-smoke-x86-64: - extends: .qemu-x86-64 +.qemu-smoke-x86_64: + extends: .qemu-x86_64 variables: TEST_TIMEOUT_OVERRIDE: 120 =20 @@ -141,7 +141,7 @@ tags: - xilinx =20 -.adl-x86-64: +.adl-x86_64: extends: .test-jobs-common variables: # the test controller runs on RPi4 @@ -164,9 +164,9 @@ tags: - qubes-hw2 =20 -.kbl-x86-64: +.kbl-x86_64: # it's really similar to the ADL one - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "00:1f.6" PCIDEV_INTR: "MSI" @@ -175,9 +175,9 @@ tags: - qubes-hw3 =20 -.zen2-x86-64: +.zen2-x86_64: # it's really similar to the above - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" @@ -186,9 +186,9 @@ tags: - qubes-hw1 =20 -.zen3p-x86-64: +.zen3p-x86_64: # it's really similar to the above - extends: .adl-x86-64 + extends: .adl-x86_64 variables: PCIDEV: "01:00.0" PCIDEV_INTR: "MSI-X" @@ -235,7 +235,7 @@ xilinx-smoke-dom0-x86_64-gcc-debug: script: - ./automation/scripts/xilinx-smoke-dom0-x86_64.sh ping 2>&1 | tee ${L= OGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 xilinx-smoke-dom0-x86_64-gcc-debug-argo: @@ -254,238 +254,238 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: job: microcode-x86 ref: master =20 -adl-smoke-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-smoke-x86-64-dom0pvh-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-dom0pvh-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .adl-x86-64 +adl-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-suspend-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-suspend-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-pci-pv-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pci-pv-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-pci-hvm-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pci-hvm-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-pvshim-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-pvshim-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-tools-tests-pv-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-tools-tests-pv-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -adl-tools-tests-pvh-x86-64-gcc-debug: - extends: .adl-x86-64 +adl-tools-tests-pvh-x86_64-gcc-debug: + extends: .adl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-smoke-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-smoke-x86-64-dom0pvh-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-dom0pvh-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .kbl-x86-64 +kbl-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-suspend-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-suspend-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-pci-pv-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pci-pv-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-pci-hvm-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pci-hvm-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-pvshim-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-pvshim-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-tools-tests-pv-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-tools-tests-pv-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -kbl-tools-tests-pvh-x86-64-gcc-debug: - extends: .kbl-x86-64 +kbl-tools-tests-pvh-x86_64-gcc-debug: + extends: .kbl-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen2-smoke-x86-64-gcc-debug: - extends: .zen2-x86-64 +zen2-smoke-x86_64-gcc-debug: + extends: .zen2-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen2-suspend-x86-64-gcc-debug: - extends: .zen2-x86-64 +zen2-suspend-x86_64-gcc-debug: + extends: .zen2-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh s3 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-smoke-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pv 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pv 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-smoke-x86-64-dom0pvh-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-dom0pvh-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-smoke-x86-64-dom0pvh-hvm-gcc-debug: - extends: .zen3p-x86-64 +zen3p-smoke-x86_64-dom0pvh-hvm-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} + - ./automation/scripts/qubes-x86_64.sh dom0pvh-hvm 2>&1 | tee ${LOGFIL= E} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-pci-hvm-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-pci-hvm-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-pvshim-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-pvshim-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh pvshim 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qubes-x86_64.sh pvshim 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-tools-tests-pv-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-tools-tests-pv-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pv 2>&1 | tee ${LOG= FILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 -zen3p-tools-tests-pvh-x86-64-gcc-debug: - extends: .zen3p-x86-64 +zen3p-tools-tests-pvh-x86_64-gcc-debug: + extends: .zen3p-x86_64 script: - - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} + - ./automation/scripts/qubes-x86_64.sh tools-tests-pvh 2>&1 | tee ${LO= GFILE} artifacts: reports: junit: tests-junit.xml needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc-debug =20 qemu-smoke-dom0-arm64-gcc: @@ -649,54 +649,54 @@ qemu-smoke-dom0less-arm32-gcc-debug-earlyprintk: - debian-12-arm32-gcc-debug-earlyprintk =20 qemu-alpine-x86_64-gcc: - extends: .qemu-x86-64 + extends: .qemu-x86_64 script: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: - - *x86-64-test-needs + - *x86_64-test-needs - alpine-3.24-x86_64-gcc =20 -qemu-smoke-x86-64-gcc: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LO= GFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LO= GFILE} needs: - debian-13-x86_64-gcc-debug =20 -qemu-smoke-x86-64-clang: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-clang: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LO= GFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 example 2>&1 | tee ${LO= GFILE} needs: - debian-13-x86_64-clang-debug =20 -qemu-smoke-x86-64-gcc-pvh: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc-pvh: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${L= OGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${L= OGFILE} needs: - debian-13-x86_64-gcc-debug =20 -qemu-smoke-x86-64-clang-pvh: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-clang-pvh: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${L= OGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64 hvm64 example 2>&1 | tee ${L= OGFILE} needs: - debian-13-x86_64-clang-debug =20 -qemu-smoke-x86-64-gcc-efi: - extends: .qemu-smoke-x86-64 +qemu-smoke-x86_64-gcc-efi: + extends: .qemu-smoke-x86_64 script: - - ./automation/scripts/qemu-xtf.sh x86-64-efi pv64 example 2>&1 | tee = ${LOGFILE} + - ./automation/scripts/qemu-xtf.sh x86_64-efi pv64 example 2>&1 | tee = ${LOGFILE} needs: - debian-13-x86_64-gcc-debug =20 qemu-xtf-argo-x86_64-gcc-debug: - extends: .qemu-smoke-x86-64 + extends: .qemu-smoke-x86_64 variables: TEST_TIMEOUT_OVERRIDE: 60 script: - - ./automation/scripts/qemu-xtf.sh x86-64 pv64 argo 2>&1 | tee ${LOGFI= LE} + - ./automation/scripts/qemu-xtf.sh x86_64 pv64 argo 2>&1 | tee ${LOGFI= LE} needs: - alpine-3.24-x86_64-gcc-debug =20 diff --git a/automation/scripts/include/configs/xtf-x86-64-config b/automat= ion/scripts/include/configs/xtf-x86_64-config similarity index 100% rename from automation/scripts/include/configs/xtf-x86-64-config rename to automation/scripts/include/configs/xtf-x86_64-config diff --git a/automation/scripts/include/configs/xtf-x86-64-efi-config b/aut= omation/scripts/include/configs/xtf-x86_64-efi-config similarity index 100% rename from automation/scripts/include/configs/xtf-x86-64-efi-config rename to automation/scripts/include/configs/xtf-x86_64-efi-config diff --git a/automation/scripts/include/xtf-x86-64 b/automation/scripts/inc= lude/xtf-x86_64 similarity index 100% rename from automation/scripts/include/xtf-x86-64 rename to automation/scripts/include/xtf-x86_64 diff --git a/automation/scripts/include/xtf-x86-64-efi b/automation/scripts= /include/xtf-x86_64-efi similarity index 100% rename from automation/scripts/include/xtf-x86-64-efi rename to automation/scripts/include/xtf-x86_64-efi diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86_64.sh similarity index 100% rename from automation/scripts/qubes-x86-64.sh rename to automation/scripts/qubes-x86_64.sh --=20 2.39.5 From nobody Sat Jun 13 07:34:23 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=1781305809; cv=none; d=zohomail.com; s=zohoarc; b=SVs/QshMxf/sS4RvXG/eRH5uQRAGTkZcUa09+Pd5tLFHX5225ghMCN5nAb5rMqbUf2iWATGV+oUTDFobJE9l2cPAlnBRwlpuP3I1hI8nEBjV6MgX7cjbYIWTm0gQ4Zt5d2fQ0ZcsXdsW6d4iZbvF7bToJ2Xv6WGUaTHntMtuPE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1781305809; 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=Mc80mIuKgxZeSbtKq/Po/qNpxB8HPK61c4YM83MbXes=; b=SZztq5pdYfkT/XZGTpFE524oXoPPHrdYW94R/3l3UkkZk0ajIfeJWJWM/ebvMlx6drfZJuVVsbSO7Dp/hxt0wknaN9TrBqHfkem5/N8gm14VGRYDljV99UqNuNB/jAwJaEVy00eddl26U6zCgfCb4Ywez/LYvoq1eBHxnHsPzV8= 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 1781305809016504.06980945130135; Fri, 12 Jun 2026 16:10:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1337054.1598747 (Exim 4.92) (envelope-from ) id 1wYB0J-00035P-HH; Fri, 12 Jun 2026 23:09:35 +0000 Received: by outflank-mailman (output) from mailman id 1337054.1598747; Fri, 12 Jun 2026 23:09:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wYB0J-00035F-CO; Fri, 12 Jun 2026 23:09:35 +0000 Received: by outflank-mailman (input) for mailman id 1337054; Fri, 12 Jun 2026 23:09:33 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) id 1wYB0H-0002mH-Ni for xen-devel@lists.xenproject.org; Fri, 12 Jun 2026 23:09:33 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wYB0H-00HIs8-4i for xen-devel@lists.xenproject.org; Sat, 13 Jun 2026 01:09:33 +0200 Received: from [10.42.69.9] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a2c91a7-5cb7-0a2a0a5109dd-0a2a45098b92-4 for ; Sat, 13 Jun 2026 01:09:33 +0200 Received: from [209.85.221.49] (helo=mail-wr1-f49.google.com) by tlsNG-bad1c0.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 6a2c91ac-2497-0a2a45090019-d155dd31d98c-3 for ; Sat, 13 Jun 2026 01:09:33 +0200 Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-45fd464d51fso833554f8f.3 for ; Fri, 12 Jun 2026 16:09:33 -0700 (PDT) Received: from localhost.localdomain (host-78-146-242-105.as13285.net. [78.146.242.105]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4606f2b0d28sm10035907f8f.20.2026.06.12.16.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2026 16:09:32 -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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=google header.d=citrix.com header.i="@citrix.com" header.h="Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1781305772; x=1781910572; 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=Mc80mIuKgxZeSbtKq/Po/qNpxB8HPK61c4YM83MbXes=; b=VjLFMpBfqmD8FUFjju2iNN+pkMxOL/5I3PQILWqgrclVm6Dix/Vu5AxqIl5nbBDpy3 /eCQjY5oySoHMPhD2dinIoXWAHIQ0ekcj6555BzmW/VhwEfM+xn0tsCTfwY0iwVbtSTp XWrLkcF9vC7iUtZrjRP/WSjyAr6JHOy2naO14= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781305772; x=1781910572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Mc80mIuKgxZeSbtKq/Po/qNpxB8HPK61c4YM83MbXes=; b=HiDsHGjf9HEzUsbvqA3nOwtJzHYfbFztHiPM70NEyWisnpV43j7Zm2Y+9q8n2TvOTM V+43mGnfuk0FHOfHUD2V8vFOZPjRQwXjqMZcFKJ3fiWnQl6WGg7s1t0/JSz+4eyiMJse tfKwSZdLy3VSDA355+KhHx7CwjXG5MXf2jWjmMuDVgOFceQcBe6DrBr694+j1TMqwe7v LiPGQ3uJ8aEGIlT/BIFICgpng+S/pn7I4b7FPruVn75TcCof8n+qS8wdwbIPQWJOKQHy YzULs8icf5irUFXrfOqBTaepetJz3mdH79peI0jfFgvLSpY3SK6aObdw5YV3mPTgCHbT +48A== X-Gm-Message-State: AOJu0Yzp1Xg+Xz5iNvg/X+B1kvYW50lAGJomZdIZFo+/Q8BBdadYA/ln rNxhA1NWwhMleN/P/qGy5BCmgyYCficRtuaTS3VCxKqVH9ni5YGU9Mlhxym9YHBItyB/AMXg/9X gPmxv X-Gm-Gg: Acq92OHLXIhfKhrYoZI084pYC9cPlUaPfekeNUNL1hHYciwEH+CumFbTOkOwz4nU+Ld WVQjI3XzhE5IdJ+Z0MZtlhMxpnpsN9gUsoa39ZhTWxW2+0hoHOsm4kq03kgx25MbHW7TBWUWjtV Rz58c3yHwCajXb61fkI7+nCT01xm+MNDHAwXUnyw7intvQhcqSrQoPys0xJ8qjtvQTRJrr4qrlD thLX3hVpnWcAlSMSKefe+PMDlvER/4Nc+Oi6o4UA1fN5ze+f601OJsEm7wCRWEOFAU6yBikbolW 7rL8C4i7/LQ1NpQ6P+xmvlGzHAytIQgIp/wtseESAsfuAbffIxqo+8QfBm2Qc7oAyULqO8vnBPs 317kfZxVa7DDXik7N0q2QeC+Ak1SV8YPIVezzHeKsK+2dZWMjFpvcgkhJktVwCDezSocer43DDs zuAdwcgItSkZUmutiDqqyefpPSND78NnKQRt3jKxAkUXibLProduxBw6hb30rxhhnShi0FhcC10 2VO X-Received: by 2002:a05:6000:4602:b0:460:edd:ca89 with SMTP id ffacd0b85a97d-460769303demr1212047f8f.26.1781305772429; Fri, 12 Jun 2026 16:09:32 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Oleksii Kurochko Subject: [PATCH 7/7] CI: Remove x86 microcode from arm32 jobs Date: Sat, 13 Jun 2026 00:09:24 +0100 Message-Id: <20260612230924.3181154-8-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260612230924.3181154-1-andrew.cooper3@citrix.com> References: <20260612230924.3181154-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-purgate-ID: tlsNG-bad1c0/1781305773-42B70A53-B74FE3B7/10/73395122804 X-purgate-type: spam X-purgate-size: 1270 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1781305809925158500 All build containers are non-root now. Complete the todo by dropping the workaround. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin =20 --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Roger Pau Monn=C3=A9 CC: Marek Marczykowski-G=C3=B3recki CC: Oleksii Kurochko --- automation/gitlab-ci/test.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index fa3f776fc785..4d5831f9ffcf 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -14,12 +14,7 @@ ref: $ARTIFACTS_BRANCH =20 .arm32-test-needs: &arm32-test-needs - # Bodge to ensure binaries/ is non-root. Can be any artefact which comes - # from a non-root container, and microcode-x86 is the smallest. Remove = when - # all build containers have become non-root. - - project: $ARTIFACTS_REPO - job: microcode-x86 - ref: $ARTIFACTS_BRANCH + - =20 .x86_64-test-needs: &x86_64-test-needs - project: $ARTIFACTS_REPO --=20 2.39.5