summaryrefslogtreecommitdiff
path: root/meta-arm/ci
diff options
context:
space:
mode:
Diffstat (limited to 'meta-arm/ci')
-rw-r--r--meta-arm/ci/corstone500.yml12
-rw-r--r--meta-arm/ci/fvps.yml1
-rwxr-xr-xmeta-arm/ci/jobs-to-kas2
-rw-r--r--meta-arm/ci/n1sdp-optee.yml12
4 files changed, 13 insertions, 14 deletions
diff --git a/meta-arm/ci/corstone500.yml b/meta-arm/ci/corstone500.yml
deleted file mode 100644
index 2172bc1f55..0000000000
--- a/meta-arm/ci/corstone500.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-header:
- version: 14
- includes:
- - ci/base.yml
- - ci/fvp.yml
- - ci/poky-tiny.yml
-
-local_conf_header:
- fvp-config: |
- IMAGE_FEATURES:remove = " ssh-server-dropbear"
-
-machine: corstone500
diff --git a/meta-arm/ci/fvps.yml b/meta-arm/ci/fvps.yml
index cf4103edb1..1bced2994e 100644
--- a/meta-arm/ci/fvps.yml
+++ b/meta-arm/ci/fvps.yml
@@ -15,7 +15,6 @@ local_conf_header:
target:
- nativesdk-fvp-base-a-aem
- - nativesdk-fvp-corstone500
- nativesdk-fvp-corstone1000
- nativesdk-fvp-n1-edge
- nativesdk-fvp-sgi575
diff --git a/meta-arm/ci/jobs-to-kas b/meta-arm/ci/jobs-to-kas
index b8615a5ff5..eea6e4635b 100755
--- a/meta-arm/ci/jobs-to-kas
+++ b/meta-arm/ci/jobs-to-kas
@@ -3,7 +3,7 @@
# This script is expecting an input of machine name, optionally followed by a
# colon and a list of one or more parameters separated by commas between
# brackets. For example, the following are acceptable:
-# corstone500
+# corstone1000-mps3
# fvp-base: [testimage]
# qemuarm64-secureboot: [clang, glibc, testimage]
#
diff --git a/meta-arm/ci/n1sdp-optee.yml b/meta-arm/ci/n1sdp-optee.yml
new file mode 100644
index 0000000000..f2b50abf49
--- /dev/null
+++ b/meta-arm/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"