From 1590c21805e49d3f292e5973290850bb627e564a Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Fri, 22 Jul 2022 12:23:23 -0400
Subject: [PATCH] ci: do sato by default

Change to use sato by default.  Unfortunately, there are some bugs found
by this change.  For those systems, change it back to base until the
issues can be resolved.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/base.yml           | 5 ++++-
 ci/clang.yml          | 3 +++
 ci/edk2.yml           | 2 ++
 ci/fvp-base-arm32.yml | 2 ++
 ci/fvp-base.yml       | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ci/base.yml b/ci/base.yml
index 670d8986..eff466ed 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -44,7 +44,10 @@ local_conf_header:
     CORE_IMAGE_EXTRA_INSTALL += "perf"
   sshkeys: |
     CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
+  universally_failing_tests: |
+    TEST_SUITES:remove = "opkg"
+
 machine: unset
 
 target:
-  - core-image-base
+  - core-image-sato
diff --git a/ci/clang.yml b/ci/clang.yml
index 99ca8d43..80b9a4e3 100644
--- a/ci/clang.yml
+++ b/ci/clang.yml
@@ -11,3 +11,6 @@ local_conf_header:
     # 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/edk2.yml b/ci/edk2.yml
index 219ee28b..1261bf10 100644
--- a/ci/edk2.yml
+++ b/ci/edk2.yml
@@ -13,3 +13,5 @@ local_conf_header:
 
     QB_DEFAULT_BIOS = "QEMU_EFI.fd"
     WKS_FILE ?= "efi-disk.wks.in"
+  failing_tests: |
+    TEST_SUITES:remove = "xorg"
diff --git a/ci/fvp-base-arm32.yml b/ci/fvp-base-arm32.yml
index 85e56307..be4b0088 100644
--- a/ci/fvp-base-arm32.yml
+++ b/ci/fvp-base-arm32.yml
@@ -14,3 +14,5 @@ local_conf_header:
     # Tell testimage to connect to localhost:8122, and forward that to SSH in the FVP.
     TEST_TARGET_IP = "127.0.0.1:8122"
     FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8122=22"
+  failing_tests: |
+    TEST_SUITES:remove = "xorg"
diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml
index 037e36ef..fa2ddb3e 100644
--- a/ci/fvp-base.yml
+++ b/ci/fvp-base.yml
@@ -14,3 +14,5 @@ local_conf_header:
     # Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP.
     TEST_TARGET_IP = "localhost:8022"
     FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"
+  failing_tests: |
+    TEST_SUITES:remove = "xorg"