From patchwork Fri Dec 16 15:44: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: 16860 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 5CC50C4332F for ; Fri, 16 Dec 2022 15:43:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.16140.1671205415672868255 for ; Fri, 16 Dec 2022 07:43:35 -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 15EB81042; Fri, 16 Dec 2022 07:44:16 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7988F3F5A1; Fri, 16 Dec 2022 07:43:34 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 1/2][kirkstone] CI: Add variables needed for k8s runners Date: Fri, 16 Dec 2022 15:44:22 +0000 Message-Id: <20221216154423.1525796-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:43:45 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58821 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 8d22654..03bd9c9 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:44: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: 16859 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 6109EC001B2 for ; Fri, 16 Dec 2022 15:43:45 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.16400.1671205419040355254 for ; Fri, 16 Dec 2022 07:43:39 -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 71FCA1042; Fri, 16 Dec 2022 07:44:19 -0800 (PST) Received: from e125920.arm.com (unknown [10.57.88.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BCEAA3F5A1; Fri, 16 Dec 2022 07:43:37 -0800 (PST) From: Peter Hoyes To: yocto@lists.yoctoproject.org Cc: Peter Hoyes , Ross Burton , Jon Mason Subject: [meta-zephyr][PATCH 2/2][kirkstone] CI: add tags to all jobs Date: Fri, 16 Dec 2022 15:44:23 +0000 Message-Id: <20221216154423.1525796-2-peter.hoyes@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221216154423.1525796-1-peter.hoyes@arm.com> References: <20221216154423.1525796-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:43:45 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58822 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 03bd9c9..e88d6e5 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