[PATCH 1/3] ci/qemu-cortex-m3: remove common test

[PATCH 1/3] ci/qemu-cortex-m3: remove common test

[Jon Mason]

The common test has a timing issue, causing it to intermittently fail.
Since it is not unique to our environment, remove it to prevent false
positive regressions.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 ci/qemu-cortex-m3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/qemu-cortex-m3.yml b/ci/qemu-cortex-m3.yml
index 6f892a9e..f45cb9e1 100644
--- a/ci/qemu-cortex-m3.yml
+++ b/ci/qemu-cortex-m3.yml
@@ -13,7 +13,7 @@ local_conf_header:
   tclibc: |
     TCLIBC = "newlib"
   nonbuilding_tests: |
-    ZEPHYRTESTS:remove = "context pending poll sleep"
+    ZEPHYRTESTS:remove = "common context pending poll sleep"
   qemu_opts: |
     QB_OPT_APPEND = "-icount shift=3,align=off,sleep=on -rtc clock=vm"
 
-- 
2.17.1

[PATCH 2/3] CI: use uboot instead of none for juno

[Jon Mason]

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3ca24d3..36cf61ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,6 +67,7 @@ update-repos:
 # Available options for building are
 #  TOOLCHAINS: [gcc, clang, armgcc, external-gccarm]
 #  TCLIBC: [glibc, musl]
+#  FIRMWARE: [uboot, edk2]
 #  VIRT: [none, xen]
 #  TESTING: testimage
 
@@ -134,7 +135,7 @@ juno:
   parallel:
     matrix:
       - TOOLCHAINS: [gcc, clang]
-        FIRMWARE: [none, edk2]
+        FIRMWARE: [uboot, edk2]
 
 microbit-v1:
   extends: .build_and_test
-- 
2.17.1

[PATCH 3/3] ci: do sato by default

[Jon Mason]

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

Re: [PATCH 1/3] ci/qemu-cortex-m3: remove common test

[Jon Mason]

On Fri, 22 Jul 2022 12:23:21 -0400, Jon Mason wrote:
> The common test has a timing issue, causing it to intermittently fail.
> Since it is not unique to our environment, remove it to prevent false
> positive regressions.

Applied, thanks!

[1/3] ci/qemu-cortex-m3: remove common test
      commit: 2ae5842553b19d6d4cd26feb3daf500f8541a9b5
[2/3] CI: use uboot instead of none for juno
      commit: da044c88cd2b57f14fb847b6cda1e5736fc24636
[3/3] ci: do sato by default
      commit: 1590c21805e49d3f292e5973290850bb627e564a

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