@@ -151,14 +151,7 @@ qemuarm64-secureboot:
matrix:
- TOOLCHAINS: [gcc, clang]
TCLIBC: [glibc, musl]
- TESTING: testimage
-
-qemuarm64-secureboot-ts:
- extends: .build
- parallel:
- matrix:
- - TOOLCHAINS: [gcc, clang]
- TCLIBC: [glibc, musl]
+ TS: [none, trusted-services]
TESTING: testimage
qemuarm64:
similarity index 61%
rename from ci/qemuarm64-secureboot-ts.yml
rename to ci/trusted-services.yml
@@ -1,20 +1,9 @@
-# Build qemuarm64-secureboot machine with
-# Trusted Services secure partition included into optee-os image.
-#
-# Run Trustes Services OEQA tests.
-
header:
version: 11
includes:
- - ci/base.yml
- ci/meta-openembedded.yml
-machine: qemuarm64-secureboot
-
local_conf_header:
- failing_tests: |
- # software IO TLB: Cannot allocate buffer
- DEFAULT_TEST_SUITES:remove = "parselogs"
trusted_services: |
TEST_SUITES:append = " trusted_services"
# Include TS Crypto, Storage, ITS, Attestation and SMM-Gateway SPs into optee-os image
@@ -23,6 +12,3 @@ local_conf_header:
IMAGE_INSTALL:append = " packagegroup-ts-tests"
# Include TS PSA Arch tests into image
IMAGE_INSTALL:append = " packagegroup-ts-tests-psa"
-
-target:
- - core-image-base
Trusted services is a feature, not a unique machine. Modify the setup to reflect this. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .gitlab-ci.yml | 9 +-------- ...rm64-secureboot-ts.yml => trusted-services.yml} | 14 -------------- 2 files changed, 1 insertion(+), 22 deletions(-) rename ci/{qemuarm64-secureboot-ts.yml => trusted-services.yml} (61%)