From patchwork Fri Dec 16 15:41:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16855 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 652ABC46467 for ; Fri, 16 Dec 2022 15:41:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16037.1671205255567792656 for ; Fri, 16 Dec 2022 07:40:55 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 EB4DB1042; Fri, 16 Dec 2022 07:41:35 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7BB753F5A1; Fri, 16 Dec 2022 07:40:54 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 1/5][langdale] CI: Add variables needed for k8s runners Date: Fri, 16 Dec 2022 15:41:43 +0000 Message-Id: <20221216154147.1524548-1-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 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 ; Fri, 16 Dec 2022 15:41:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58816 From: Peter Hoyes The Kas container needs to use the entrypoint as that is where the user changes from root to a normal user. Also set the KUBERNETES_CPU_REQUEST to the variable CPU_REQUEST as this needs to be tuned per-deployment. CPU_REQUEST has no value outside of Arm Corp. Gitlab CI allows for variables to be overridden by default. So, we can give it a default value of NULL/empty and have everything work internally and externally by default. Signed-off-by: Ross Burton Signed-off-by: Jon Mason Signed-off-by: Peter Hoyes Tested-by: Jon Mason --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f0e319..616626a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,12 @@ image: ghcr.io/siemens/kas/kas:latest-release +variables: + CPU_REQUEST: "" + # These are needed as the k8s executor doesn't respect the container + # entrypoint by default + FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0 + FF_KUBERNETES_HONOR_ENTRYPOINT: 1 + stages: - prep - build @@ -24,6 +31,8 @@ stages: # Generalised fragment to do a Kas build .build: extends: .setup + variables: + KUBERNETES_CPU_REQUEST: $CPU_REQUEST script: - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME") - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf' From patchwork Fri Dec 16 15:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16853 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 63CF0C4167B for ; Fri, 16 Dec 2022 15:41:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16281.1671205260809969324 for ; Fri, 16 Dec 2022 07:41:00 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 4336F1042; Fri, 16 Dec 2022 07:41:41 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C07A33F5A1; Fri, 16 Dec 2022 07:40:59 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 2/5][langdale] CI: add tags to all jobs Date: Fri, 16 Dec 2022 15:41:44 +0000 Message-Id: <20221216154147.1524548-2-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216154147.1524548-1-peter.hoyes@arm.com> References: <20221216154147.1524548-1-peter.hoyes@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 ; Fri, 16 Dec 2022 15:41:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58817 From: Peter Hoyes Tag all jobs with the DEFAULT_TAG variable so each instance can control what tags the jobs have. Signed-off-by: Ross Burton Signed-off-by: Jon Mason Signed-off-by: Peter Hoyes --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 616626a..7ec0bd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: ghcr.io/siemens/kas/kas:latest-release variables: CPU_REQUEST: "" + DEFAULT_TAG: "" # These are needed as the k8s executor doesn't respect the container # entrypoint by default FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0 @@ -13,6 +14,8 @@ stages: # Common job fragment to get a worker ready .setup: + tags: + - $DEFAULT_TAG stage: build interruptible: true variables: @@ -65,7 +68,8 @@ machine-coverage: script: - ./ci/check-machine-coverage coverage: '/Coverage: \d+/' - + tags: + - $DEFAULT_TAG # # Build stage, the actual build jobs From patchwork Fri Dec 16 15:41:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16854 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 5E7CCC4332F for ; Fri, 16 Dec 2022 15:41:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16287.1671205263784912251 for ; Fri, 16 Dec 2022 07:41:03 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 343E01042; Fri, 16 Dec 2022 07:41:44 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D6E943F5A1; Fri, 16 Dec 2022 07:41:02 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 3/5][langdale] CI: Set default branch to langdale Date: Fri, 16 Dec 2022 15:41:45 +0000 Message-Id: <20221216154147.1524548-3-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216154147.1524548-1-peter.hoyes@arm.com> References: <20221216154147.1524548-1-peter.hoyes@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 ; Fri, 16 Dec 2022 15:41:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58818 From: Peter Hoyes Signed-off-by: Peter Hoyes --- ci/base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/base.yml b/ci/base.yml index 70adac1..7b2203e 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -7,7 +7,7 @@ distro: zephyr defaults: repos: - refspec: master + refspec: langdale repos: meta-zephyr: From patchwork Fri Dec 16 15:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16857 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 4677EC4332F for ; Fri, 16 Dec 2022 15:41:15 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16289.1671205266212383429 for ; Fri, 16 Dec 2022 07:41:06 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 926031042; Fri, 16 Dec 2022 07:41:46 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 52A2D3F5A1; Fri, 16 Dec 2022 07:41:05 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 4/5][langdale] zephyr-core/zephyr-kernel: Use layer-relative require for version file Date: Fri, 16 Dec 2022 15:41:46 +0000 Message-Id: <20221216154147.1524548-4-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216154147.1524548-1-peter.hoyes@arm.com> References: <20221216154147.1524548-1-peter.hoyes@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 ; Fri, 16 Dec 2022 15:41:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58819 From: Peter Hoyes The inclusion of the Zephyr version-specific .inc file is currently using a local include. Change to be layer-relative to support including files in other layers. Change to use 'require' instead of 'include' so that an earlier error is printed if the file does not exist. Signed-off-by: Peter Hoyes --- .../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index f28d1d4..3383894 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -13,4 +13,4 @@ S = "${WORKDIR}/git" # Default to a stable version PREFERRED_VERSION_zephyr-kernel ??= "3.1.0" -include zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc +require recipes-kernel/zephyr-kernel/zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc From patchwork Fri Dec 16 15:41:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16856 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 49FEDC001B2 for ; Fri, 16 Dec 2022 15:41:15 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16048.1671205271005723043 for ; Fri, 16 Dec 2022 07:41:11 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: peter.hoyes@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 6B6291042; Fri, 16 Dec 2022 07:41:51 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 35C143F5A1; Fri, 16 Dec 2022 07:41:10 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 5/5][langdale] zephyr-core/zephyr-kernel: Inhibit packaging steps with the Zephyr SDK Date: Fri, 16 Dec 2022 15:41:47 +0000 Message-Id: <20221216154147.1524548-5-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216154147.1524548-1-peter.hoyes@arm.com> References: <20221216154147.1524548-1-peter.hoyes@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 ; Fri, 16 Dec 2022 15:41:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58820 From: Peter Hoyes The packaging step includes post-processing of elf files using objcopy and strip from the Yocto toolchain. When using the Zephyr SDK, the Yocto toolchain is explicitly not built so it is not possible to run these steps. Therefore, inhibit them in zephyr-toolchain-zephyr.inc Signed-off-by: Peter Hoyes --- .../recipes-kernel/zephyr-kernel/zephyr-toolchain-zephyr.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-zephyr.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-zephyr.inc index 9987e3c..a193314 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-zephyr.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-toolchain-zephyr.inc @@ -13,3 +13,7 @@ deltask generate_toolchain_file # Provide a suitable location to store the toolchain capabilites cache ZEPHYR_USER_CACHE_DIR = "${B}/.cache" EXTRA_OECMAKE:append = " -DUSER_CACHE_DIR=${ZEPHYR_USER_CACHE_DIR}" + +# Inhibit packaging steps that require the Yocto toolchain +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1"