From patchwork Tue Mar 25 17:53:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35B40C3600B for ; Tue, 25 Mar 2025 17:54:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2289.1742925244259473423 for ; Tue, 25 Mar 2025 10:54:04 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A48F71756 for ; Tue, 25 Mar 2025 10:54:09 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5F05F3F58B for ; Tue, 25 Mar 2025 10:54:03 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] CI: use DEFAULT_TAG as the default ACS_TAG Date: Tue, 25 Mar 2025 17:53:57 +0000 Message-ID: <20250325175358.2562904-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Mar 2025 17:54:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6410 This stops the job being stuck if the runners will only take jobs that have been tagged. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48ce592f..f4b3262c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: # The default machine tag for the build jobs DEFAULT_TAG: "" # The machine tag for the ACS test jobs - ACS_TAG: "" + ACS_TAG: "$DEFAULT_TAG" # The directory to use as the persistent cache (the root for DL_DIR, SSTATE_DIR, etc) CACHE_DIR: $CI_BUILDS_DIR/persist # The container mirror to use From patchwork Tue Mar 25 17:53:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 337CEC36008 for ; Tue, 25 Mar 2025 17:54:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2290.1742925244919438768 for ; Tue, 25 Mar 2025 10:54:05 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4ABCF175A for ; Tue, 25 Mar 2025 10:54:10 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 10B2D3F58B for ; Tue, 25 Mar 2025 10:54:03 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm-system-ready/arm-systemready-ir-acs: add version to download filename Date: Tue, 25 Mar 2025 17:53:58 +0000 Message-ID: <20250325175358.2562904-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250325175358.2562904-1-ross.burton@arm.com> References: <20250325175358.2562904-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 25 Mar 2025 17:54:10 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6411 The download filename wasn't versioned so multiple versions would write to the same file on disk and conflict, causing repeated downloads and fetch failures. Add the PV to the filename on disk to resolve this. Signed-off-by: Ross Burton --- .../arm-systemready-acs/arm-systemready-ir-acs.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb index 83257b30..eef1c045 100644 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb +++ b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb @@ -49,9 +49,9 @@ PV = "2.0.0" PV_DATE = "23.03" FULL_PV = "v${PV_DATE}_${PV}" ARM_SYSTEMREADY_IR_ACS_BRANCH ?= "main" -IMAGE_FILENAME = "ir-acs-live-image-generic-arm64.wic" +IMAGE_FILENAME = "ir-acs-live-image-generic-arm64-${PV}.wic" SRC_URI = " \ - https://github.com/ARM-software/arm-systemready/raw/${ARM_SYSTEMREADY_IR_ACS_BRANCH}/IR/prebuilt_images/${FULL_PV}/${IMAGE_FILENAME}.xz;name=acs-img \ + https://github.com/ARM-software/arm-systemready/raw/${ARM_SYSTEMREADY_IR_ACS_BRANCH}/IR/prebuilt_images/${FULL_PV}/ir-acs-live-image-generic-arm64.wic.xz;name=acs-img;downloadfilename=${IMAGE_FILENAME}.xz \ git://git.gitlab.arm.com/systemready/systemready-ir-template.git;protocol=https;nobranch=1;destsuffix=systemready-ir-template;name=sr-ir-template \ " SRC_URI[acs-img.sha256sum] = "ea52f84dab44bde97de3e2d2224d883acaae35724dd8e2bdfb125de49040f9b3"