From 784602f3745b0def08bab8ea50c2a5de8cdf12d3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Mar 2025 22:24:07 +0000 Subject: [PATCH] config: Merge selftest jobs into deb and rpm based rather than distro We currently have 4 different selftests running but they now rarely show host specific differences. Merge the four into two, calling them "fedora" and "debian" simply to avoid renaming all the target names in helper. Since opensuse is rpm based and the fedora group has slightly fewer workers, add opensuse to that pool. This means builds going forward will run one arm and two x86 based selftests which should be more than sufficient. The change is applying to all releases. Signed-off-by: Richard Purdie --- config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 9e493fe..e07e558 100644 --- a/config.py +++ b/config.py @@ -104,7 +104,7 @@ trigger_builders_wait_quick = trigger_builders_wait_shared + [ trigger_builders_wait_full = trigger_builders_wait_shared + [ "qemux86-world-alt", - "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-fedora", "oe-selftest-centos", + "oe-selftest-debian", "oe-selftest-fedora", "qemux86-64-ptest", "qemux86-64-ltp", "qemuarm64-ptest", "qemuarm64-ltp", "meta-intel", "meta-arm", "meta-aws", "meta-agl-core", "meta-virt", "qemuarmv5", "qemuarm-tc", "qemuarm64-tc", "qemux86-tc", "qemux86-64-tc" @@ -131,7 +131,7 @@ trigger_builders_wait_full_releases = { "zeus" : trigger_builders_wait_full + ["mpc8315e-rdb", "mpc8315e-rdb-alt", "edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full, "thud" : trigger_builders_wait_full + ["mpc8315e-rdb", "mpc8315e-rdb-alt", "edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full, "sumo" : trigger_builders_wait_shared + ["qemumips-alt", "edgerouter-alt", "mpc8315e-rdb-alt", "qemuppc-alt", "qemux86-world-alt", - "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-centos"] + "oe-selftest-fedora", "oe-selftest-debian"] } trigger_builders_wait_perf = ["buildperf-debian11", "buildperf-alma8"] @@ -159,6 +159,7 @@ builders_others = [ "meta-oe-mirror", "auh", "auh-meta-oe", "edgerouter", "edgerouter-alt", + "oe-selftest-ubuntu", "oe-selftest-centos", "oe-selftest-opensuse", "non-gpl3", "meta-webosose" ] + old_arch_full @@ -224,9 +225,9 @@ notify_on_missing = None builder_to_workers = { "bringup": workers_bringup + workers, "bringup-fast": workers_bringup + workers, + "oe-selftest-debian": workers_debian + workers_ubuntu, + "oe-selftest-fedora": workers_fedora + workers_centos + workers_opensuse, "oe-selftest-ubuntu": workers_ubuntu, - "oe-selftest-debian": workers_debian, - "oe-selftest-fedora": workers_fedora, "oe-selftest-opensuse": workers_opensuse, "oe-selftest-centos": workers_centos, "oe-selftest-armhost": workers_arm,