From 09a3e899dcfaa30899a430daf45aa614be189ad8 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Wed, 5 Oct 2022 09:46:59 -0400 Subject: [PATCH] CI: trusted services as a feature instead of a machine Trusted services is a feature, not a unique machine. Modify the setup to reflect this. Signed-off-by: Jon Mason --- .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%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 491ccebb..60c6ed91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/ci/qemuarm64-secureboot-ts.yml b/ci/trusted-services.yml similarity index 61% rename from ci/qemuarm64-secureboot-ts.yml rename to ci/trusted-services.yml index 66a27c68..433ec78b 100644 --- a/ci/qemuarm64-secureboot-ts.yml +++ b/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