From 302cdd0a026bdf09c2508f24c4ec93427c375d87 Mon Sep 17 00:00:00 2001
From: Anusmita Dutta Mazumder <anusmita.duttamazumder@arm.com>
Date: Fri, 1 Sep 2023 17:36:26 +0100
Subject: [PATCH] CI: Build custom image for N1SDP optee-xtest

Build a custom N1SDP image with only optee-xtests as part of the image. A fresh custom image build is necessary to include the relevant test suite for running the xtests.

Signed-off-by: Anusmita Dutta Mazumder <anusmita.duttamazumder@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml     |  1 +
 ci/n1sdp-optee.yml | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 ci/n1sdp-optee.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 548b8e76..a2af8716 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,6 +154,7 @@ n1sdp:
   parallel:
     matrix:
       - TS: [none, n1sdp-ts]
+      - OPTEE: [none, n1sdp-optee]
 
 qemu-generic-arm64:
   extends: .build
diff --git a/ci/n1sdp-optee.yml b/ci/n1sdp-optee.yml
new file mode 100644
index 00000000..f2b50abf
--- /dev/null
+++ b/ci/n1sdp-optee.yml
@@ -0,0 +1,12 @@
+header:
+  version: 14
+
+# Config specific for the optee-xtests
+local_conf_header:
+  optee-test: |
+    # Include ARM FFA
+    MACHINE_FEATURES:append = " arm-ffa"
+    # Include trusted services
+    TEST_SUITES:append = " trusted_services"
+    # Include Optee xtests
+    IMAGE_INSTALL:append = " optee-test"