Skip to content

A
angle
Commit 6bfb64ae by Jamie Madill Committed by Commit Bot
Options

infra: Add trace tests to CQ conditionally.

This will add the trace tests with the "libANGLE/capture/" folder changes. This will prevent slow trace tests from clogging the CQ on unrelated changes, while still providing some regression testing. Bug: angleproject:5530 Change-Id: I76361aaa51c49c84dab8be7d74f4bad0db7d2419 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2686438 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 0e8f7727
Showing with 33 additions and 21 deletions
infra/config/generated/commit-queue.cfg
...@@ -33,6 +33,10 @@ config_groups { ...@@ -33,6 +33,10 @@ config_groups {
name: "angle/try/linux-clang-rel" name: "angle/try/linux-clang-rel"
} }
builders { builders {
name: "angle/try/linux-trace-rel"
location_regexp: ".+/[+]/src/libANGLE/capture/.+"
}
builders {
name: "angle/try/mac-dbg" name: "angle/try/mac-dbg"
} }
builders { builders {
...@@ -67,6 +71,10 @@ config_groups { ...@@ -67,6 +71,10 @@ config_groups {
name: "angle/try/win-msvc-x86-rel" name: "angle/try/win-msvc-x86-rel"
} }
builders { builders {
name: "angle/try/win-trace-rel"
location_regexp: ".+/[+]/src/libANGLE/capture/.+"
}
builders {
name: "angle/try/winuwp-x64-dbg" name: "angle/try/winuwp-x64-dbg"
} }
builders { builders {
......
infra/config/main.star
...@@ -116,7 +116,7 @@ def get_os_from_name(name): ...@@ -116,7 +116,7 @@ def get_os_from_name(name):
return os.MAC return os.MAC
# Adds both the CI and Try standalone builders. # Adds both the CI and Try standalone builders.
def angle_standalone_builder(name, clang, debug, cpu, uwp, trace_tests): def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests = False):
properties = { properties = {
"debug": debug, "debug": debug,
"target_cpu": cpu, "target_cpu": cpu,
...@@ -177,10 +177,13 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp, trace_tests): ...@@ -177,10 +177,13 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp, trace_tests):
build_numbers = True, build_numbers = True,
) )
# Trace tests are only included automatically if files in the capture folder change.
if trace_tests: if trace_tests:
config = "trace" config = "trace"
location_regexp = ".+/[+]/src/libANGLE/capture/.+"
else: else:
config = "angle" config = "angle"
location_regexp = None
if clang: if clang:
compiler = "clang" compiler = "clang"
...@@ -208,11 +211,12 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp, trace_tests): ...@@ -208,11 +211,12 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp, trace_tests):
builder = "try/" + name, builder = "try/" + name,
) )
# Include all bots in the CQ by default except trace tests and GCC configs. # Include all bots in the CQ by default except GCC configs.
if not trace_tests and compiler != "gcc": if compiler != "gcc":
luci.cq_tryjob_verifier( luci.cq_tryjob_verifier(
cq_group = 'master', cq_group = 'master',
builder = "angle:try/" + name, builder = "angle:try/" + name,
location_regexp = [location_regexp] if location_regexp else None,
) )
...@@ -268,24 +272,24 @@ luci.gitiles_poller( ...@@ -268,24 +272,24 @@ luci.gitiles_poller(
) )
# name, clang, debug, cpu, uwp, trace_tests # name, clang, debug, cpu, uwp, trace_tests
angle_standalone_builder("linux-clang-dbg", True, True, "x64", False, False) angle_standalone_builder("linux-clang-dbg", clang = True, debug = True, cpu = "x64")
angle_standalone_builder("linux-clang-rel", True, False, "x64", False, False) angle_standalone_builder("linux-clang-rel", clang = True, debug = False, cpu = "x64")
angle_standalone_builder("linux-gcc-dbg", False, True, "x64", False, False) angle_standalone_builder("linux-gcc-dbg", clang = False, debug = True, cpu = "x64")
angle_standalone_builder("linux-gcc-rel", False, False, "x64", False, False) angle_standalone_builder("linux-gcc-rel", clang = False, debug = False, cpu = "x64")
angle_standalone_builder("linux-trace-rel", True, False, "x64", False, True) angle_standalone_builder("linux-trace-rel", clang = True, debug = False, cpu = "x64", trace_tests = True)
angle_standalone_builder("mac-dbg", True, True, "x64", False, False) angle_standalone_builder("mac-dbg", clang = True, debug = True, cpu = "x64")
angle_standalone_builder("mac-rel", True, False, "x64", False, False) angle_standalone_builder("mac-rel", clang = True, debug = False, cpu = "x64")
angle_standalone_builder("win-clang-x86-dbg", True, True, "x86", False, False) angle_standalone_builder("win-clang-x86-dbg", clang = True, debug = True, cpu = "x86")
angle_standalone_builder("win-clang-x86-rel", True, False, "x86", False, False) angle_standalone_builder("win-clang-x86-rel", clang = True, debug = False, cpu = "x86")
angle_standalone_builder("win-clang-x64-dbg", True, True, "x64", False, False) angle_standalone_builder("win-clang-x64-dbg", clang = True, debug = True, cpu = "x64")
angle_standalone_builder("win-clang-x64-rel", True, False, "x64", False, False) angle_standalone_builder("win-clang-x64-rel", clang = True, debug = False, cpu = "x64")
angle_standalone_builder("win-msvc-x86-dbg", False, True, "x86", False, False) angle_standalone_builder("win-msvc-x86-dbg", clang = False, debug = True, cpu = "x86")
angle_standalone_builder("win-msvc-x86-rel", False, False, "x86", False, False) angle_standalone_builder("win-msvc-x86-rel", clang = False, debug = False, cpu = "x86")
angle_standalone_builder("win-msvc-x64-dbg", False, True, "x64", False, False) angle_standalone_builder("win-msvc-x64-dbg", clang = False, debug = True, cpu = "x64")
angle_standalone_builder("win-msvc-x64-rel", False, False, "x64", False, False) angle_standalone_builder("win-msvc-x64-rel", clang = False, debug = False, cpu = "x64")
angle_standalone_builder("win-trace-rel", True, False, "x64", False, True) angle_standalone_builder("win-trace-rel", clang = True, debug = False, cpu = "x64", trace_tests = True)
angle_standalone_builder("winuwp-x64-dbg", False, True, "x64", True, False) angle_standalone_builder("winuwp-x64-dbg", clang = False, debug = True, cpu = "x64", uwp = True)
angle_standalone_builder("winuwp-x64-rel", False, False, "x64", True, False) angle_standalone_builder("winuwp-x64-rel", clang = False, debug = False, cpu = "x64", uwp = True)
# Views # Views
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment