From 1bc064e0209116586e15b98e23c0f6274d882b81 Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Wed, 5 Oct 2022 09:47:00 -0400
Subject: [PATCH] CI: cleanups for targets and removed tests

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