From patchwork Wed Mar 26 18:12:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59998 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 3C5AAC3600E for ; Wed, 26 Mar 2025 18:12:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.29792.1743012732141222851 for ; Wed, 26 Mar 2025 11:12:12 -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 E5A821424 for ; Wed, 26 Mar 2025 11:12:16 -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 08AD03F58B for ; Wed, 26 Mar 2025 11:12:10 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] CI: use canonical git.yoctoproject.org URLs Date: Wed, 26 Mar 2025 18:12:03 +0000 Message-ID: <20250326181206.1287342-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 ; Wed, 26 Mar 2025 18:12:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6414 The canonical repository URLs don't use /git/. Signed-off-by: Ross Burton --- ci/base.yml | 2 +- ci/update-repos | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index d1c933d0..fc182092 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -17,7 +17,7 @@ repos: meta-arm-toolchain: poky: - url: https://git.yoctoproject.org/git/poky + url: https://git.yoctoproject.org/poky layers: meta: meta-poky: diff --git a/ci/update-repos b/ci/update-repos index 069a94ea..ef69ee45 100755 --- a/ci/update-repos +++ b/ci/update-repos @@ -20,9 +20,9 @@ def repo_shortname(url): .replace('*', '.')) repositories = ( - "https://git.yoctoproject.org/git/poky", + "https://git.yoctoproject.org/poky", "https://git.openembedded.org/meta-openembedded", - "https://git.yoctoproject.org/git/meta-virtualization", + "https://git.yoctoproject.org/meta-virtualization", "https://github.com/kraj/meta-clang", ) From patchwork Wed Mar 26 18:12:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59996 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 3ADBDC36008 for ; Wed, 26 Mar 2025 18:12:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.29793.1743012732367031532 for ; Wed, 26 Mar 2025 11:12:12 -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 8BE3F14BF for ; Wed, 26 Mar 2025 11:12:17 -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 AD94B3F58B for ; Wed, 26 Mar 2025 11:12:11 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] ci: forward the exit code from update-repos Date: Wed, 26 Mar 2025 18:12:04 +0000 Message-ID: <20250326181206.1287342-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250326181206.1287342-1-ross.burton@arm.com> References: <20250326181206.1287342-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 ; Wed, 26 Mar 2025 18:12:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6415 If update-repos fails with status 128 then that means it failed to fetch the remote repositories. This should result in a warning not a failure but flock was just returning status 1. Save the exit code and if it returns 128 continue but exit with it later, so the lockfile generation still occurs but the job doesn't fail. Also, only call the update-repos script if KAS_REPO_REF_DIR has been set. Signed-off-by: Ross Burton --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4b3262c..08f6a388 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,13 @@ update-repos: exit_codes: 128 script: - | - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos + exit_code=0 + if [ -n "$KAS_REPO_REF_DIR" ]; then + flock --verbose --timeout 60 $KAS_REPO_REF_DIR --command ./ci/update-repos || exit_code=$? + # Exit now if that failed, unless the status was 128 (fetch failed) + test $exit_code != 0 -a $exit_code != 128 && exit 1 + fi + # Only generate if doesn't already exist, to allow feature branches to drop one in. if test -f lockfile.yml; then echo Using existing lockfile.yml @@ -104,6 +110,7 @@ update-repos: # Be sure that this is the complete list of layers being fetched kas dump --lock --update ci/qemuarm64.yml:ci/meta-openembedded.yml:ci/clang.yml:ci/meta-virtualization.yml | tee lockfile.yml fi + exit $exit_code artifacts: name: "lockfile" paths: From patchwork Wed Mar 26 18:12:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59995 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 3ECA4C36011 for ; Wed, 26 Mar 2025 18:12:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.29795.1743012733105792436 for ; Wed, 26 Mar 2025 11:12:13 -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 3C0661424 for ; Wed, 26 Mar 2025 11:12:18 -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 54C7F3F58B for ; Wed, 26 Mar 2025 11:12:12 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] ci: show KAS_PREMIRRORS in preamble Date: Wed, 26 Mar 2025 18:12:05 +0000 Message-ID: <20250326181206.1287342-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250326181206.1287342-1-ross.burton@arm.com> References: <20250326181206.1287342-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 ; Wed, 26 Mar 2025 18:12:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6416 Signed-off-by: Ross Burton --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08f6a388..6d613e45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,7 @@ stages: - echo KAS_WORK_DIR = $KAS_WORK_DIR - echo SSTATE_DIR = $SSTATE_DIR - echo DL_DIR = $DL_DIR + - echo KAS_PREMIRRORS = $KAS_PREMIRRORS - rm -rf $KAS_WORK_DIR - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR From patchwork Wed Mar 26 18:12:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59997 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 592ABC36010 for ; Wed, 26 Mar 2025 18:12:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.29776.1743012733725526986 for ; Wed, 26 Mar 2025 11:12:13 -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 E066C1424 for ; Wed, 26 Mar 2025 11:12:18 -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 04F483F58B for ; Wed, 26 Mar 2025 11:12:12 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] ci/update-repos: always pass the latest URL Date: Wed, 26 Mar 2025 18:12:06 +0000 Message-ID: <20250326181206.1287342-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250326181206.1287342-1-ross.burton@arm.com> References: <20250326181206.1287342-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 ; Wed, 26 Mar 2025 18:12:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6417 Instead of assuming that the repository was created with the latest URL, fetch the repository explicitly when fetching. Signed-off-by: Ross Burton --- ci/update-repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/update-repos b/ci/update-repos index ef69ee45..c44246cc 100755 --- a/ci/update-repos +++ b/ci/update-repos @@ -44,7 +44,7 @@ if __name__ == "__main__": if repodir.exists(): try: print("Updating %s..." % repo) - subprocess.run(["git", "-C", repodir, "-c", "gc.autoDetach=false", "fetch"], check=True) + subprocess.run(["git", "-C", repodir, "-c", "gc.autoDetach=false", "fetch", repo], check=True) except subprocess.CalledProcessError as e: print(e) failed = True