[PATCH 1/2] CI: trusted services as a feature instead of a machine

[PATCH 1/2] CI: trusted services as a feature instead of a machine

[Jon Mason]

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%)

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
-- 
2.17.1

[PATCH 2/2] CI: cleanups for targets and removed tests

[Jon Mason]

Some of the removed tests are now working and some of the systems are
not testing against sato (as being done in base.yml).  Update these and
add some comments.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/clang.yml                | 6 ------
 ci/corstone1000-common.yml  | 4 +++-
 ci/corstone500.yml          | 1 +
 ci/qemu-generic-arm64.yml   | 2 +-
 ci/qemuarm64-secureboot.yml | 5 -----
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ci/clang.yml b/ci/clang.yml
index 80b9a4e3..a2063f19 100644
--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -8,9 +8,3 @@ repos:
 local_conf_header:
   clang: |
     TOOLCHAIN = "clang"
-    # Clang causes more binaries to have buildpaths in the debug symbols
-    # https://github.com/llvm/llvm-project/issues/56609
-    WARN_QA:remove = "buildpaths"
-
-target:
-  - core-image-base
diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml
index 6599d97a..970a87c9 100644
--- a/ci/corstone1000-common.yml
+++ b/ci/corstone1000-common.yml
@@ -3,11 +3,13 @@ header:
   includes:
     - ci/base.yml
     - ci/meta-openembedded.yml
+
 local_conf_header:
     perf: |
+    # Intentionally blank to prevent perf from being added to the image in base.yml
 
 distro: poky-tiny
 
 target:
-  - perf
   - corstone1000-image
+  - perf
diff --git a/ci/corstone500.yml b/ci/corstone500.yml
index ef78cacd..d51d45fb 100644
--- a/ci/corstone500.yml
+++ b/ci/corstone500.yml
@@ -8,6 +8,7 @@ local_conf_header:
     INHERIT += "fvpboot"
     IMAGE_FEATURES:remove = " ssh-server-dropbear"
   perf: |
+    # Intentionally blank to prevent perf from being added to the image in base.yml
 
 machine: corstone500
 
diff --git a/ci/qemu-generic-arm64.yml b/ci/qemu-generic-arm64.yml
index 87cbd2f8..32c4b981 100644
--- a/ci/qemu-generic-arm64.yml
+++ b/ci/qemu-generic-arm64.yml
@@ -10,5 +10,5 @@ local_conf_header:
 machine: qemu-generic-arm64
 
 target:
-  - core-image-base
+  - core-image-sato
   - sbsa-acs
diff --git a/ci/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml
index c3522e17..f617dfc5 100644
--- a/ci/qemuarm64-secureboot.yml
+++ b/ci/qemuarm64-secureboot.yml
@@ -5,11 +5,6 @@ header:
 
 machine: qemuarm64-secureboot
 
-local_conf_header:
-  failing_tests: |
-    # software IO TLB: Cannot allocate buffer
-    DEFAULT_TEST_SUITES:remove = "parselogs"
-
 target:
   - core-image-base
   - optee-examples
-- 
2.17.1

Re: [PATCH 1/2] CI: trusted services as a feature instead of a machine

[Jon Mason]

On Wed, 5 Oct 2022 09:46:59 -0400, Jon Mason wrote:
> Trusted services is a feature, not a unique machine.  Modify the setup
> to reflect this.

Applied, thanks!

[1/2] CI: trusted services as a feature instead of a machine
      commit: 09a3e899dcfaa30899a430daf45aa614be189ad8
[2/2] CI: cleanups for targets and removed tests
      commit: 1bc064e0209116586e15b98e23c0f6274d882b81

Best regards,
-- 
Jon Mason <jon.mason@arm.com>