diff mbox series

[yocto-autobuilder2,3/3] config: Fix riscv build triggering

Message ID 20260226124724.717336-3-richard.purdie@linuxfoundation.org
State New
Headers show
Series [yocto-autobuilder2,1/3] config: Drop meta-mingw from builds as a default test target | expand

Commit Message

Richard Purdie Feb. 26, 2026, 12:47 p.m. UTC 
Having builds added to 'master' like this is problematic as it doesn't work when
we branch for releases. Rework the code to remove riscv on the older releases
where this was never tested instead.

This does mean the builds will be added back to whinlatter where it was accidentally
missing. Take the opportunity to add fast ptests to a-quick for riscv too.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 config.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/config.py b/config.py
index 947b15f2..f68f1207 100644
--- a/config.py
+++ b/config.py
@@ -74,6 +74,7 @@  trigger_builders_wait_shared = [
     "qemuarm64", "qemuarm64-alt",
     "qemux86", "qemux86-alt",
     "qemux86-64", "qemux86-64-alt",
+    "qemuriscv64",
     "qemuarm-oecore",
     "qemux86-64-x32", "qemux86-world",
     "multilib",
@@ -94,7 +95,7 @@  trigger_builders_wait_shared = [
 ]
 
 trigger_builders_wait_quick = trigger_builders_wait_shared + [
-    "oe-selftest", "qemux86-64-ptest-fast", "qemuarm64-ptest-fast"
+    "oe-selftest", "qemux86-64-ptest-fast", "qemuarm64-ptest-fast", "qemuriscv64-ptest-fast"]
 ]
 
 trigger_builders_wait_full = trigger_builders_wait_shared + [
@@ -104,25 +105,28 @@  trigger_builders_wait_full = trigger_builders_wait_shared + [
     "meta-intel", "meta-arm", "meta-aws", "meta-agl-core", "meta-virt", "meta-qcom",
     "qemuarmv5",
     "qemuarm-tc", "qemuarm64-tc", "qemux86-tc", "qemux86-64-tc"
+    "qemuriscv64-tc", "qemuriscv64-ptest",
 ]
 
+trigger_builders_wait_quick_noriscv = [x for x in trigger_builders_wait_quick if 'riscv' not in x]
+
 trigger_builders_wait_quick_releases = {
     "master" : trigger_builders_wait_quick,
-    "styhead" : trigger_builders_wait_quick + ["qemumips", "qemumips64", "qemuppc"],
-    "scarthgap" : trigger_builders_wait_quick + ["qemumips", "qemumips64", "qemuppc"],
-    "kirkstone" : trigger_builders_wait_quick + ["edgerouter", "non-gpl", "qemumips", "qemumips64", "qemuppc"],
+    "styhead" : trigger_builders_wait_quick_noriscv + ["qemumips", "qemumips64", "qemuppc"],
+    "scarthgap" : trigger_builders_wait_quick_noriscv + ["qemumips", "qemumips64", "qemuppc"],
+    "kirkstone" : trigger_builders_wait_quick_noriscv + ["edgerouter", "non-gpl", "qemumips", "qemumips64", "qemuppc"],
 }
 
 old_arch_full = ["qemumips", "qemumips-alt", "qemumips64", "qemuppc", "qemuppc-alt", "qemumips-tc", "qemumips64-tc", "qemuppc-tc", "meta-mingw"]
-riscv = ["qemuriscv64", "qemuriscv64-tc", "qemuriscv64-ptest"]
+trigger_builders_wait_full_noriscv = [x for x in trigger_builders_wait_full if 'riscv' not in x]
 
 trigger_builders_wait_full_releases = {
-    "master" : trigger_builders_wait_full + riscv,
+    "master" : trigger_builders_wait_full,
     "whinlatter" : trigger_builders_wait_full + ["meta-mingw"],
-    "walnascar" : trigger_builders_wait_full + ["meta-mingw"],
-    "styhead" : trigger_builders_wait_full + old_arch_full,
-    "scarthgap" : trigger_builders_wait_full + old_arch_full,
-    "kirkstone" : trigger_builders_wait_full + ["edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full,
+    "walnascar" : trigger_builders_wait_full_noriscv + ["meta-mingw"],
+    "styhead" : trigger_builders_wait_full_noriscv + old_arch_full,
+    "scarthgap" : trigger_builders_wait_full_noriscv + old_arch_full,
+    "kirkstone" : trigger_builders_wait_full_noriscv + ["edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full,
 }
 
 trigger_builders_wait_perf = ["buildperf-debian11", "buildperf-alma8"]