From 655124426ab7dbef9d37461ed32876df8efbd505 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Wed, 14 Dec 2022 10:45:01 +0000
Subject: [PATCH] CI: add variables needed for k8s runners

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.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 134b50a2..f75fc3d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,11 @@
 image: ghcr.io/siemens/kas/kas:latest-release
 
-  # First do a common bootstrap, and then build all the targets
+# These are needed as the k8s executor doesn't respect the container entrypoint
+# by default
+variables:
+  FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0
+  FF_KUBERNETES_HONOR_ENTRYPOINT: 1
+
 stages:
   - prep
   - bootstrap
@@ -26,6 +31,8 @@ stages:
 # Generalised fragment to do a Kas build
 .build:
   extends: .setup
+  variables:
+    KUBERNETES_CPU_REQUEST: $CPU_REQUEST
   interruptible: true
   script:
     - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)