Skip to contentSkip to conversation

ci/qemu-cortex-m3: remove common test

PATCH Applied Jon Mason 2 participants 4 messages Jul 22, 2022 – Jul 26, 2022

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

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

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.

---
 ci/qemu-cortex-m3.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ci/qemu-cortex-m3.yml +1 -1
index 6f892a9e..f45cb9e1 100644
@@ -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"
 
Signature · 1 line
2.17.1
author
#1 lore raw

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

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
.gitlab-ci.yml +2 -1
index f3ca24d3..36cf61ac 100644
@@ -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
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 ci: do sato by default

In reply to 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.

---
 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(-)
ci/base.yml +4 -1
index 670d8986..eff466ed 100644
@@ -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
ci/clang.yml +3 -0
index 99ca8d43..80b9a4e3 100644
@@ -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
ci/edk2.yml +2 -0
index 219ee28b..1261bf10 100644
@@ -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"
ci/fvp-base-arm32.yml +2 -0
index 85e56307..be4b0088 100644
@@ -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"
ci/fvp-base.yml +2 -0
index 037e36ef..fa2ddb3e 100644
@@ -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"
Signature · 1 line
2.17.1
Applied
#3 lore raw
In reply to Jon Mason
Quoted 3 lines · 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.

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,

Signature · 1 line
Jon Mason <[email protected]>