From patchwork Fri Dec 16 15:37:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16847 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 7F764C4332F for ; Fri, 16 Dec 2022 15:36:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15918.1671205004808346805 for ; Fri, 16 Dec 2022 07:36:44 -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 2A6771042; Fri, 16 Dec 2022 07:37:25 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6674E3F5A1; Fri, 16 Dec 2022 07:36:43 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 1/5] CI: Add variables needed for k8s runners Date: Fri, 16 Dec 2022 15:37:19 +0000 Message-Id: <20221216153723.1522131-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:36:45 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58811 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:37:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16848 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 40C06C001B2 for ; Fri, 16 Dec 2022 15:36:55 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15920.1671205012277892825 for ; Fri, 16 Dec 2022 07:36:52 -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 ADE851042; Fri, 16 Dec 2022 07:37:32 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BBA083F5A1; Fri, 16 Dec 2022 07:36:50 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 2/5] CI: add tags to all jobs Date: Fri, 16 Dec 2022 15:37:20 +0000 Message-Id: <20221216153723.1522131-2-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216153723.1522131-1-peter.hoyes@arm.com> References: <20221216153723.1522131-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:36:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58812 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:37:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16849 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 444A8C4167B for ; Fri, 16 Dec 2022 15:36:55 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15921.1671205014204505750 for ; Fri, 16 Dec 2022 07:36:54 -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 A474C1042; Fri, 16 Dec 2022 07:37:34 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3730C3F5A1; Fri, 16 Dec 2022 07:36:53 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 3/5] zephyr-core/zephyr-kernel: Use layer-relative require for version file Date: Fri, 16 Dec 2022 15:37:21 +0000 Message-Id: <20221216153723.1522131-3-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216153723.1522131-1-peter.hoyes@arm.com> References: <20221216153723.1522131-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:36:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58813 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 aa299e0..a19d074 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.2.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:37:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16850 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 45AD5C4332F for ; Fri, 16 Dec 2022 15:37:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16160.1671205015763512666 for ; Fri, 16 Dec 2022 07:36: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 2CD7D1042; Fri, 16 Dec 2022 07:37:36 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E53D33F5A1; Fri, 16 Dec 2022 07:36:54 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 4/5] zephyr-core/zephyr-kernel: Inhibit packaging steps with the Zephyr SDK Date: Fri, 16 Dec 2022 15:37:22 +0000 Message-Id: <20221216153723.1522131-4-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216153723.1522131-1-peter.hoyes@arm.com> References: <20221216153723.1522131-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:37:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58814 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" From patchwork Fri Dec 16 15:37:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hoyes X-Patchwork-Id: 16851 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 4854CC4167B for ; Fri, 16 Dec 2022 15:37:05 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.15927.1671205018795997329 for ; Fri, 16 Dec 2022 07:36:58 -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 7D2A81042; Fri, 16 Dec 2022 07:37:38 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ACD823F5A1; Fri, 16 Dec 2022 07:36:56 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes Subject: [meta-zephyr][PATCH 5/5] zephyr-core: Add addpylib declaration Date: Fri, 16 Dec 2022 15:37:23 +0000 Message-Id: <20221216153723.1522131-5-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216153723.1522131-1-peter.hoyes@arm.com> References: <20221216153723.1522131-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:37:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58815 From: Peter Hoyes OE-core 4901c9d471cab99d52876842980222ce271b66e4 "base: Switch to use addpylib directive and BB_GLOBAL_PYMODULES" means that ${LAYERDIR}/lib is no longer searched by default when loading test controllers. meta-zephyr-core defines some custom test controllers for testing FVPs, so add an addpylib directive to meta-zephyr-core/conf/layer.conf to fix testimage. Signed-off-by: Peter Hoyes --- meta-zephyr-core/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf index 3d1e57b..2b1c821 100644 --- a/meta-zephyr-core/conf/layer.conf +++ b/meta-zephyr-core/conf/layer.conf @@ -20,3 +20,5 @@ LAYERSERIES_COMPAT_zephyrcore = "dunfell gatesgarth hardknott honister kirkstone X86_TUNE_DIR = "${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'honister kirkstone langdale', 'include/x86', 'include', d)}" PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages" + +addpylib ${LAYERDIR}/lib oeqa