config/schedulers: Only run performance builders in a-full in release builds

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-11-08 13:55:31 +00:00
parent 9fa3dee873
commit 8aaae51aa9
2 changed files with 11 additions and 5 deletions

View File

@ -77,8 +77,7 @@ trigger_builders_wait_quick = trigger_builders_wait_shared + [
trigger_builders_wait_full = trigger_builders_wait_shared + [ trigger_builders_wait_full = trigger_builders_wait_shared + [
"qemumips-alt", "edgerouter-alt", "mpc8315e-rdb-alt", "qemuppc-alt", "qemux86-world-alt", "qemumips-alt", "edgerouter-alt", "mpc8315e-rdb-alt", "qemuppc-alt", "qemux86-world-alt",
"oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-fedora", "oe-selftest-centos", "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-fedora", "oe-selftest-centos",
"qemux86-64-ptest", "buildperf-ubuntu1604", "buildperf-centos7", "qemux86-64-ltp", "qemux86-64-ptest", "qemux86-64-ltp", "qemuarm64-ptest", "qemuarm64-ltp", "meta-intel", "meta-arm"
"qemuarm64-ptest", "qemuarm64-ltp", "meta-intel", "meta-arm"
] ]
trigger_builders_wait_releases = { trigger_builders_wait_releases = {
@ -86,6 +85,8 @@ trigger_builders_wait_releases = {
"oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-centos"] "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-centos"]
} }
trigger_builders_wait_perf = ["buildperf-ubuntu1604", "buildperf-centos7"]
# Builders which are individually triggered # Builders which are individually triggered
builders_others = [ builders_others = [
"meta-oe", "meta-virt", "meta-oe", "meta-virt",
@ -94,7 +95,7 @@ builders_others = [
"auh" "auh"
] ]
subbuilders = list(set(trigger_builders_wait_quick + trigger_builders_wait_full + builders_others)) subbuilders = list(set(trigger_builders_wait_quick + trigger_builders_wait_full + trigger_builders_wait_perf + builders_others))
builders = ["a-quick", "a-full", "docs"] + subbuilders builders = ["a-quick", "a-full", "docs"] + subbuilders
# ## Cluster configuration # ## Cluster configuration

View File

@ -105,12 +105,17 @@ def builderNamesFromConfig(props):
#log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props))) #log.msg("builderNames: Sourcestamp %s, props %s" % (str(props.sourcestamps), str(props)))
yp_branch = props.sourcestamps[0]['branch'] yp_branch = props.sourcestamps[0]['branch']
builders = config.trigger_builders_wait_full
for b in config.trigger_builders_wait_releases: for b in config.trigger_builders_wait_releases:
if yp_branch and yp_branch.startswith(b): if yp_branch and yp_branch.startswith(b):
log.msg("builderNames: Filtering branch %s due to entry %s" % (str(yp_branch), str(b))) log.msg("builderNames: Filtering branch %s due to entry %s" % (str(yp_branch), str(b)))
return config.trigger_builders_wait_releases[b] builders = config.trigger_builders_wait_releases[b]
return config.trigger_builders_wait_full # Only run performance runs on release builds
if props.getProperty("is_release", False):
builders = builders + trigger_builders_wait_perf
return builders
# Upstream Triggerable class will rasise NotImplementedError() which will mean triggers abort upon reconfig # Upstream Triggerable class will rasise NotImplementedError() which will mean triggers abort upon reconfig
# Hack to intercept and ignore this, we'd rather they just survive in our case. # Hack to intercept and ignore this, we'd rather they just survive in our case.