From 0c7018a596b4fe3940690671e4c7aa09762e8567 Mon Sep 17 00:00:00 2001 From: Jamie Madill Date: Tue, 12 Oct 2021 13:43:20 -0400 Subject: [PATCH] infra: Update bot naming scheme. Old names: use config pairs when they can vary, e.g. android-arm-dbg android-arm64-rel linux-clang-dbg win-clang-x64-rel win-msvc-x86-dbg win-trace-rel New names: use config names when they differ from the the default test config for a system, and suffix with -compile and -test for compile-only and compile-and-test bots. For Android configs, we keep the full target arch. e.g. android-arm-dbg-compile android-arm64-test linux-dbg-compile win-test win-msvc-x86-dbg-compile win-trace The new naming scheme prioritizes having short names to avoid redundant or implicitly understood information. This should reduce the mental load when looking at a set of test results. This also adds SwiftShader win10-x64 configs so we can add these to the CI easily. Also the plan is to turn off the GCC configs for now. If we ever support GCC properly we can re- enable them. This CL adds the new configs to CI, then a following CL will add them to CQ and remove the old configs at the same time. Bug: angleproject:6496 Change-Id: I0ecdcd392c4d7067d6b180664f160ba7c048d16d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3219590 Commit-Queue: Jamie Madill Reviewed-by: Yuly Novikov Reviewed-by: Ian Elliott Reviewed-by: Shahbaz Youssefi --- .gitattributes | 1 + infra/config/generated/cr-buildbucket.cfg | 1656 +++++++++++++++++ infra/config/generated/luci-milo.cfg | 194 +- infra/config/generated/luci-scheduler.cfg | 220 +++ infra/config/main.star | 41 +- infra/specs/angle.json | 412 ++++ infra/specs/angle_mb_config.pyl | 19 + infra/specs/waterfalls.pyl | 10 + .../Test_spec_JSON.json | 4 +- 9 files changed, 2532 insertions(+), 25 deletions(-) diff --git a/.gitattributes b/.gitattributes index 7e383faa5..65c5a245d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,6 +10,7 @@ *.gn eol=lf *.gni eol=lf *.star eol=lf +infra/config/generated/*.cfg eol=lf src/compiler/preprocessor/preprocessor_*.* eol=lf src/compiler/translator/glslang_*.* eol=lf diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index b6d37cece..7df2821b2 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -14,6 +14,46 @@ buckets { identity: "user:angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } swarming { + builders { + name: "android-arm-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -54,6 +94,46 @@ buckets { enable: true } } + builders { + name: "android-arm-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm-rel" swarming_host: "chromium-swarm.appspot.com" @@ -134,6 +214,46 @@ buckets { enable: true } } + builders { + name: "android-arm64-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm64-rel" swarming_host: "chromium-swarm.appspot.com" @@ -174,6 +294,46 @@ buckets { enable: true } } + builders { + name: "android-arm64-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-pixel4-perf" swarming_host: "chromium-swarm.appspot.com" @@ -298,6 +458,48 @@ buckets { enable: true } } + builders { + name: "linux-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "linux-gcc-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -466,6 +668,90 @@ buckets { enable: true } } + builders { + name: "linux-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "linux-trace" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "trace_tests",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "linux-trace-rel" swarming_host: "chromium-swarm.appspot.com" @@ -548,6 +834,46 @@ buckets { enable: true } } + builders { + name: "mac-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Mac" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "mac",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "mac-rel" swarming_host: "chromium-swarm.appspot.com" @@ -588,6 +914,46 @@ buckets { enable: true } } + builders { + name: "mac-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Mac" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "mac",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-clang-x64-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -756,6 +1122,132 @@ buckets { enable: true } } + builders { + name: "win-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-msvc-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-msvc-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x64-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -840,6 +1332,48 @@ buckets { enable: true } } + builders { + name: "win-msvc-x86-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x86-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -882,6 +1416,48 @@ buckets { enable: true } } + builders { + name: "win-msvc-x86-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x86-rel" swarming_host: "chromium-swarm.appspot.com" @@ -924,6 +1500,90 @@ buckets { enable: true } } + builders { + name: "win-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-trace" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "trace_tests",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-trace-rel" swarming_host: "chromium-swarm.appspot.com" @@ -966,6 +1626,90 @@ buckets { enable: true } } + builders { + name: "win-x86-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-x86-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win10-intel-hd630-perf" swarming_host: "chromium-swarm.appspot.com" @@ -1050,6 +1794,90 @@ buckets { enable: true } } + builders { + name: "winuwp-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "winuwp-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "winuwp-x64-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1150,6 +1978,46 @@ buckets { group: "service-account-cq" } swarming { + builders { + name: "android-arm-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1190,6 +2058,46 @@ buckets { enable: true } } + builders { + name: "android-arm-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm-rel" swarming_host: "chromium-swarm.appspot.com" @@ -1270,6 +2178,46 @@ buckets { enable: true } } + builders { + name: "android-arm64-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "android-arm64-rel" swarming_host: "chromium-swarm.appspot.com" @@ -1310,6 +2258,46 @@ buckets { enable: true } } + builders { + name: "android-arm64-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "android",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "linux-clang-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1394,6 +2382,48 @@ buckets { enable: true } } + builders { + name: "linux-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "linux-gcc-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1478,6 +2508,90 @@ buckets { enable: true } } + builders { + name: "linux-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "linux-trace" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Ubuntu" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "linux",' + ' "recipe": "angle",' + ' "test_mode": "trace_tests",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "linux-trace-rel" swarming_host: "chromium-swarm.appspot.com" @@ -1560,6 +2674,46 @@ buckets { enable: true } } + builders { + name: "mac-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Mac" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "mac",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "mac-rel" swarming_host: "chromium-swarm.appspot.com" @@ -1600,6 +2754,46 @@ buckets { enable: true } } + builders { + name: "mac-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "os:Mac" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "mac",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "presubmit" swarming_host: "chromium-swarm.appspot.com" @@ -1802,6 +2996,132 @@ buckets { enable: true } } + builders { + name: "win-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-msvc-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-msvc-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x64-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1886,6 +3206,48 @@ buckets { enable: true } } + builders { + name: "win-msvc-x86-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x86-dbg" swarming_host: "chromium-swarm.appspot.com" @@ -1928,6 +3290,48 @@ buckets { enable: true } } + builders { + name: "win-msvc-x86-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-msvc-x86-rel" swarming_host: "chromium-swarm.appspot.com" @@ -1970,6 +3374,90 @@ buckets { enable: true } } + builders { + name: "win-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-trace" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "trace_tests",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "win-trace-rel" swarming_host: "chromium-swarm.appspot.com" @@ -2012,6 +3500,174 @@ buckets { enable: true } } + builders { + name: "win-x86-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "win-x86-test" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_and_test",' + ' "toolchain": "clang"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "winuwp-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } + builders { + name: "winuwp-dbg-compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "os:Windows" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "recipes" + } + properties: + '{' + ' "$build/goma": {' + ' "enable_ats": true,' + ' "rpc_extra_params": "?prod",' + ' "server_host": "goma.chromium.org"' + ' },' + ' "$recipe_engine/resultdb/test_presentation": {' + ' "column_keys": [' + ' "v.gpu"' + ' ],' + ' "grouping_keys": [' + ' "status",' + ' "v.test_suite"' + ' ]' + ' },' + ' "builder_group": "angle",' + ' "platform": "win",' + ' "recipe": "angle",' + ' "test_mode": "compile_only",' + ' "toolchain": "msvc"' + '}' + build_numbers: YES + service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.use_realms" + value: 100 + } + resultdb { + enable: true + } + } builders { name: "winuwp-x64-dbg" swarming_host: "chromium-swarm.appspot.com" diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index 2e3012e4c..58d1ed8bd 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg @@ -10,11 +10,21 @@ consoles { repo_url: "https://chromium.googlesource.com/angle/angle" refs: "regexp:refs/heads/master" manifest_name: "REVISION" + builders { + name: "buildbucket/luci.angle.ci/android-arm-compile" + category: "angle|android|clang|arm" + short_name: "rel" + } builders { name: "buildbucket/luci.angle.ci/android-arm-dbg" category: "angle|android|clang|arm" short_name: "dbg" } + builders { + name: "buildbucket/luci.angle.ci/android-arm-dbg-compile" + category: "angle|android|clang|arm" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/android-arm-rel" category: "angle|android|clang|arm" @@ -25,11 +35,21 @@ consoles { category: "angle|android|clang|arm64" short_name: "dbg" } + builders { + name: "buildbucket/luci.angle.ci/android-arm64-dbg-compile" + category: "angle|android|clang|arm64" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/android-arm64-rel" category: "angle|android|clang|arm64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/android-arm64-test" + category: "angle|android|clang|arm64" + short_name: "rel" + } builders { name: "buildbucket/luci.angle.ci/linux-clang-dbg" category: "angle|linux|clang|x64" @@ -40,6 +60,11 @@ consoles { category: "angle|linux|clang|x64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/linux-dbg-compile" + category: "angle|linux|clang|x64" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/linux-gcc-dbg" category: "angle|linux|gcc|x64" @@ -50,24 +75,29 @@ consoles { category: "angle|linux|gcc|x64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/linux-test" + category: "angle|linux|clang|x64" + short_name: "rel" + } builders { name: "buildbucket/luci.angle.ci/mac-dbg" category: "angle|mac|clang|x64" short_name: "dbg" } + builders { + name: "buildbucket/luci.angle.ci/mac-dbg-compile" + category: "angle|mac|clang|x64" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/mac-rel" category: "angle|mac|clang|x64" short_name: "rel" } builders { - name: "buildbucket/luci.angle.ci/win-clang-x86-dbg" - category: "angle|win|clang|x86" - short_name: "dbg" - } - builders { - name: "buildbucket/luci.angle.ci/win-clang-x86-rel" - category: "angle|win|clang|x86" + name: "buildbucket/luci.angle.ci/mac-test" + category: "angle|mac|clang|x64" short_name: "rel" } builders { @@ -81,15 +111,30 @@ consoles { short_name: "rel" } builders { - name: "buildbucket/luci.angle.ci/win-msvc-x86-dbg" - category: "angle|win|msvc|x86" + name: "buildbucket/luci.angle.ci/win-clang-x86-dbg" + category: "angle|win|clang|x86" short_name: "dbg" } builders { - name: "buildbucket/luci.angle.ci/win-msvc-x86-rel" - category: "angle|win|msvc|x86" + name: "buildbucket/luci.angle.ci/win-clang-x86-rel" + category: "angle|win|clang|x86" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/win-dbg-compile" + category: "angle|win|clang|x64" + short_name: "dbg" + } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-compile" + category: "angle|win|msvc|x64" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-dbg-compile" + category: "angle|win|msvc|x64" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/win-msvc-x64-dbg" category: "angle|win|msvc|x64" @@ -100,6 +145,51 @@ consoles { category: "angle|win|msvc|x64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-x86-compile" + category: "angle|win|msvc|x86" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-x86-dbg" + category: "angle|win|msvc|x86" + short_name: "dbg" + } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-x86-dbg-compile" + category: "angle|win|msvc|x86" + short_name: "dbg" + } + builders { + name: "buildbucket/luci.angle.ci/win-msvc-x86-rel" + category: "angle|win|msvc|x64" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/win-test" + category: "angle|win|clang|x64" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/win-x86-dbg-compile" + category: "angle|win|clang|x86" + short_name: "dbg" + } + builders { + name: "buildbucket/luci.angle.ci/win-x86-test" + category: "angle|win|clang|x86" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/winuwp-compile" + category: "angle|winuwp|msvc|x64" + short_name: "rel" + } + builders { + name: "buildbucket/luci.angle.ci/winuwp-dbg-compile" + category: "angle|winuwp|msvc|x64" + short_name: "dbg" + } builders { name: "buildbucket/luci.angle.ci/winuwp-x64-dbg" category: "angle|winuwp|msvc|x64" @@ -110,11 +200,21 @@ consoles { category: "angle|winuwp|msvc|x64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/linux-trace" + category: "trace|linux|clang|x64" + short_name: "rel" + } builders { name: "buildbucket/luci.angle.ci/linux-trace-rel" category: "trace|linux|clang|x64" short_name: "rel" } + builders { + name: "buildbucket/luci.angle.ci/win-trace" + category: "trace|win|clang|x64" + short_name: "rel" + } builders { name: "buildbucket/luci.angle.ci/win-trace-rel" category: "trace|win|clang|x64" @@ -149,41 +249,59 @@ consoles { consoles { id: "try" name: "ANGLE Try Builders" + builders { + name: "buildbucket/luci.angle.try/android-arm-compile" + } builders { name: "buildbucket/luci.angle.try/android-arm-dbg" } + builders { + name: "buildbucket/luci.angle.try/android-arm-dbg-compile" + } builders { name: "buildbucket/luci.angle.try/android-arm-rel" } builders { name: "buildbucket/luci.angle.try/android-arm64-dbg" } + builders { + name: "buildbucket/luci.angle.try/android-arm64-dbg-compile" + } builders { name: "buildbucket/luci.angle.try/android-arm64-rel" } + builders { + name: "buildbucket/luci.angle.try/android-arm64-test" + } builders { name: "buildbucket/luci.angle.try/linux-clang-dbg" } builders { name: "buildbucket/luci.angle.try/linux-clang-rel" } + builders { + name: "buildbucket/luci.angle.try/linux-dbg-compile" + } builders { name: "buildbucket/luci.angle.try/linux-gcc-dbg" } builders { name: "buildbucket/luci.angle.try/linux-gcc-rel" } + builders { + name: "buildbucket/luci.angle.try/linux-test" + } builders { name: "buildbucket/luci.angle.try/mac-dbg" } + builders { + name: "buildbucket/luci.angle.try/mac-dbg-compile" + } builders { name: "buildbucket/luci.angle.try/mac-rel" } builders { - name: "buildbucket/luci.angle.try/win-clang-x86-dbg" - } - builders { - name: "buildbucket/luci.angle.try/win-clang-x86-rel" + name: "buildbucket/luci.angle.try/mac-test" } builders { name: "buildbucket/luci.angle.try/win-clang-x64-dbg" @@ -192,10 +310,19 @@ consoles { name: "buildbucket/luci.angle.try/win-clang-x64-rel" } builders { - name: "buildbucket/luci.angle.try/win-msvc-x86-dbg" + name: "buildbucket/luci.angle.try/win-clang-x86-dbg" } builders { - name: "buildbucket/luci.angle.try/win-msvc-x86-rel" + name: "buildbucket/luci.angle.try/win-clang-x86-rel" + } + builders { + name: "buildbucket/luci.angle.try/win-dbg-compile" + } + builders { + name: "buildbucket/luci.angle.try/win-msvc-compile" + } + builders { + name: "buildbucket/luci.angle.try/win-msvc-dbg-compile" } builders { name: "buildbucket/luci.angle.try/win-msvc-x64-dbg" @@ -203,15 +330,48 @@ consoles { builders { name: "buildbucket/luci.angle.try/win-msvc-x64-rel" } + builders { + name: "buildbucket/luci.angle.try/win-msvc-x86-compile" + } + builders { + name: "buildbucket/luci.angle.try/win-msvc-x86-dbg" + } + builders { + name: "buildbucket/luci.angle.try/win-msvc-x86-dbg-compile" + } + builders { + name: "buildbucket/luci.angle.try/win-msvc-x86-rel" + } + builders { + name: "buildbucket/luci.angle.try/win-test" + } + builders { + name: "buildbucket/luci.angle.try/win-x86-dbg-compile" + } + builders { + name: "buildbucket/luci.angle.try/win-x86-test" + } + builders { + name: "buildbucket/luci.angle.try/winuwp-compile" + } + builders { + name: "buildbucket/luci.angle.try/winuwp-dbg-compile" + } builders { name: "buildbucket/luci.angle.try/winuwp-x64-dbg" } builders { name: "buildbucket/luci.angle.try/winuwp-x64-rel" } + builders { + name: "buildbucket/luci.angle.try/linux-trace" + } builders { name: "buildbucket/luci.angle.try/linux-trace-rel" } + builders { + name: "buildbucket/luci.angle.try/win-trace" + } builders { name: "buildbucket/luci.angle.try/win-trace-rel" } diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 3d1c61b7a..12043ed8b 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg @@ -4,6 +4,16 @@ # For the schema of this file, see ProjectConfig message: # https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg +job { + id: "android-arm-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "android-arm-compile" + } +} job { id: "android-arm-dbg" realm: "ci" @@ -14,6 +24,16 @@ job { builder: "android-arm-dbg" } } +job { + id: "android-arm-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "android-arm-dbg-compile" + } +} job { id: "android-arm-rel" realm: "ci" @@ -34,6 +54,16 @@ job { builder: "android-arm64-dbg" } } +job { + id: "android-arm64-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "android-arm64-dbg-compile" + } +} job { id: "android-arm64-rel" realm: "ci" @@ -44,6 +74,16 @@ job { builder: "android-arm64-rel" } } +job { + id: "android-arm64-test" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "android-arm64-test" + } +} job { id: "android-pixel4-perf" realm: "ci" @@ -74,6 +114,16 @@ job { builder: "linux-clang-rel" } } +job { + id: "linux-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "linux-dbg-compile" + } +} job { id: "linux-gcc-dbg" realm: "ci" @@ -114,6 +164,26 @@ job { builder: "linux-nvidia-p400-perf" } } +job { + id: "linux-test" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "linux-test" + } +} +job { + id: "linux-trace" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "linux-trace" + } +} job { id: "linux-trace-rel" realm: "ci" @@ -134,6 +204,16 @@ job { builder: "mac-dbg" } } +job { + id: "mac-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "mac-dbg-compile" + } +} job { id: "mac-rel" realm: "ci" @@ -144,6 +224,16 @@ job { builder: "mac-rel" } } +job { + id: "mac-test" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "mac-test" + } +} job { id: "win-clang-x64-dbg" realm: "ci" @@ -184,6 +274,36 @@ job { builder: "win-clang-x86-rel" } } +job { + id: "win-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-dbg-compile" + } +} +job { + id: "win-msvc-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-msvc-compile" + } +} +job { + id: "win-msvc-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-msvc-dbg-compile" + } +} job { id: "win-msvc-x64-dbg" realm: "ci" @@ -204,6 +324,16 @@ job { builder: "win-msvc-x64-rel" } } +job { + id: "win-msvc-x86-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-msvc-x86-compile" + } +} job { id: "win-msvc-x86-dbg" realm: "ci" @@ -214,6 +344,16 @@ job { builder: "win-msvc-x86-dbg" } } +job { + id: "win-msvc-x86-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-msvc-x86-dbg-compile" + } +} job { id: "win-msvc-x86-rel" realm: "ci" @@ -224,6 +364,26 @@ job { builder: "win-msvc-x86-rel" } } +job { + id: "win-test" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-test" + } +} +job { + id: "win-trace" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-trace" + } +} job { id: "win-trace-rel" realm: "ci" @@ -234,6 +394,26 @@ job { builder: "win-trace-rel" } } +job { + id: "win-x86-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-x86-dbg-compile" + } +} +job { + id: "win-x86-test" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "win-x86-test" + } +} job { id: "win10-intel-hd630-perf" realm: "ci" @@ -254,6 +434,26 @@ job { builder: "win10-nvidia-p400-perf" } } +job { + id: "winuwp-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "winuwp-compile" + } +} +job { + id: "winuwp-dbg-compile" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "luci.angle.ci" + builder: "winuwp-dbg-compile" + } +} job { id: "winuwp-x64-dbg" realm: "ci" @@ -279,31 +479,51 @@ trigger { realm: "ci" schedule: "with 10s interval" acl_sets: "ci" + triggers: "android-arm-compile" triggers: "android-arm-dbg" + triggers: "android-arm-dbg-compile" triggers: "android-arm-rel" triggers: "android-arm64-dbg" + triggers: "android-arm64-dbg-compile" triggers: "android-arm64-rel" + triggers: "android-arm64-test" triggers: "android-pixel4-perf" triggers: "linux-clang-dbg" triggers: "linux-clang-rel" + triggers: "linux-dbg-compile" triggers: "linux-gcc-dbg" triggers: "linux-gcc-rel" triggers: "linux-intel-hd630-perf" triggers: "linux-nvidia-p400-perf" + triggers: "linux-test" + triggers: "linux-trace" triggers: "linux-trace-rel" triggers: "mac-dbg" + triggers: "mac-dbg-compile" triggers: "mac-rel" + triggers: "mac-test" triggers: "win-clang-x64-dbg" triggers: "win-clang-x64-rel" triggers: "win-clang-x86-dbg" triggers: "win-clang-x86-rel" + triggers: "win-dbg-compile" + triggers: "win-msvc-compile" + triggers: "win-msvc-dbg-compile" triggers: "win-msvc-x64-dbg" triggers: "win-msvc-x64-rel" + triggers: "win-msvc-x86-compile" triggers: "win-msvc-x86-dbg" + triggers: "win-msvc-x86-dbg-compile" triggers: "win-msvc-x86-rel" + triggers: "win-test" + triggers: "win-trace" triggers: "win-trace-rel" + triggers: "win-x86-dbg-compile" + triggers: "win-x86-test" triggers: "win10-intel-hd630-perf" triggers: "win10-nvidia-p400-perf" + triggers: "winuwp-compile" + triggers: "winuwp-dbg-compile" triggers: "winuwp-x64-dbg" triggers: "winuwp-x64-rel" gitiles { diff --git a/infra/config/main.star b/infra/config/main.star index 1b0b465c7..980c1cd25 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -191,7 +191,7 @@ def get_gpu_type_from_builder_name(name): return name.split("-")[1] # Adds both the CI and Try standalone builders. -def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode = "compile_and_test"): +def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode = None): properties = { "builder_group": "angle", } @@ -210,6 +210,12 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode properties["platform"] = config_os.console_name properties["toolchain"] = toolchain + if not test_mode: + if "-compile" in name: + test_mode = "compile_only" + else: + test_mode = "compile_and_test" + if toolchain == "gcc": properties["test_mode"] = "checkout_only" elif debug or toolchain == "msvc" or (config_os.category == os_category.ANDROID and cpu == "arm"): @@ -290,7 +296,9 @@ def angle_builder(name, debug, cpu, toolchain = "clang", uwp = False, test_mode ) # Include all other bots in the CQ by default except the placeholder GCC configs. - if toolchain != "gcc": + # TODO(jmadill): Include new bots in CQ. http://anglebug.com/6496 + is_new_config = name.endswith("-test") or name.endswith("-compile") or name.endswith("-trace") + if toolchain != "gcc" and not is_new_config: luci.cq_tryjob_verifier( cq_group = "master", builder = "angle:try/" + name, @@ -353,28 +361,49 @@ luci.gitiles_poller( ) # name, clang, debug, cpu, uwp, trace_tests +# TODO(jmadill): De-duplicate. http://anglebug.com/6496 +angle_builder("android-arm-compile", debug = False, cpu = "arm") angle_builder("android-arm-dbg", debug = True, cpu = "arm") +angle_builder("android-arm-dbg-compile", debug = True, cpu = "arm") angle_builder("android-arm-rel", debug = False, cpu = "arm") angle_builder("android-arm64-dbg", debug = True, cpu = "arm64") +angle_builder("android-arm64-dbg-compile", debug = True, cpu = "arm64") angle_builder("android-arm64-rel", debug = False, cpu = "arm64") +angle_builder("android-arm64-test", debug = False, cpu = "arm64") angle_builder("linux-clang-dbg", debug = True, cpu = "x64") angle_builder("linux-clang-rel", debug = False, cpu = "x64") +angle_builder("linux-dbg-compile", debug = True, cpu = "x64") angle_builder("linux-gcc-dbg", debug = True, cpu = "x64", toolchain = "gcc") angle_builder("linux-gcc-rel", debug = False, cpu = "x64", toolchain = "gcc") +angle_builder("linux-test", debug = False, cpu = "x64") angle_builder("mac-dbg", debug = True, cpu = "x64") +angle_builder("mac-dbg-compile", debug = True, cpu = "x64") angle_builder("mac-rel", debug = False, cpu = "x64") -angle_builder("win-clang-x86-dbg", debug = True, cpu = "x86") -angle_builder("win-clang-x86-rel", debug = False, cpu = "x86") +angle_builder("mac-test", debug = False, cpu = "x64") angle_builder("win-clang-x64-dbg", debug = True, cpu = "x64") angle_builder("win-clang-x64-rel", debug = False, cpu = "x64") -angle_builder("win-msvc-x86-dbg", debug = True, cpu = "x86", toolchain = "msvc") -angle_builder("win-msvc-x86-rel", debug = False, cpu = "x86", toolchain = "msvc") +angle_builder("win-clang-x86-dbg", debug = True, cpu = "x86") +angle_builder("win-clang-x86-rel", debug = False, cpu = "x86") +angle_builder("win-dbg-compile", debug = True, cpu = "x64") +angle_builder("win-msvc-compile", debug = False, cpu = "x64", toolchain = "msvc") +angle_builder("win-msvc-dbg-compile", debug = True, cpu = "x64", toolchain = "msvc") angle_builder("win-msvc-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc") angle_builder("win-msvc-x64-rel", debug = False, cpu = "x64", toolchain = "msvc") +angle_builder("win-msvc-x86-compile", debug = False, cpu = "x86", toolchain = "msvc") +angle_builder("win-msvc-x86-dbg", debug = True, cpu = "x86", toolchain = "msvc") +angle_builder("win-msvc-x86-dbg-compile", debug = True, cpu = "x86", toolchain = "msvc") +angle_builder("win-msvc-x86-rel", debug = False, cpu = "x64", toolchain = "msvc") +angle_builder("win-test", debug = False, cpu = "x64") +angle_builder("win-x86-dbg-compile", debug = True, cpu = "x86") +angle_builder("win-x86-test", debug = False, cpu = "x86") +angle_builder("winuwp-compile", debug = False, cpu = "x64", toolchain = "msvc", uwp = True) +angle_builder("winuwp-dbg-compile", debug = True, cpu = "x64", toolchain = "msvc", uwp = True) angle_builder("winuwp-x64-dbg", debug = True, cpu = "x64", toolchain = "msvc", uwp = True) angle_builder("winuwp-x64-rel", debug = False, cpu = "x64", toolchain = "msvc", uwp = True) +angle_builder("linux-trace", debug = False, cpu = "x64", test_mode = "trace_tests") angle_builder("linux-trace-rel", debug = False, cpu = "x64", test_mode = "trace_tests") +angle_builder("win-trace", debug = False, cpu = "x64", test_mode = "trace_tests") angle_builder("win-trace-rel", debug = False, cpu = "x64", test_mode = "trace_tests") angle_builder("android-pixel4-perf", debug = False, cpu = "arm64") diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 6960b94eb..c2ec2e539 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -3370,6 +3370,418 @@ } ] }, + "win10-x64-swiftshader": { + "gtest_tests": [ + { + "args": [ + "angle_deqp_egl_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_egl_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_egl_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles2_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles31_rotate180_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles31_rotate180_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_rotate180_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles31_rotate270_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles31_rotate270_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_rotate270_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles31_rotate90_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles31_rotate90_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_rotate90_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles31_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 10 + }, + "test": "angle_deqp_gles31_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles31_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles3_rotate180_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles3_rotate180_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_rotate180_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles3_rotate270_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles3_rotate270_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_rotate270_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles3_rotate90_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_gles3_rotate90_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_rotate90_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_gles3_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", + "shards": 4 + }, + "test": "angle_deqp_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_khr_gles2_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_khr_gles2_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles2_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_khr_gles31_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_khr_gles31_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles31_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_deqp_khr_gles3_tests", + "--use-angle=swiftshader", + "--bot-mode" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_deqp_khr_gles3_tests", + "test_id_prefix": "ninja://src/tests:angle_deqp_khr_gles3_tests/", + "use_isolated_scripts_api": true + }, + { + "args": [ + "angle_end2end_tests", + "--bot-mode", + "--gtest_filter=*Vulkan_SwiftShader*" + ], + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_isolated_script_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "containment_type": "AUTO", + "dimension_sets": [ + { + "cpu": "x86-64", + "gpu": "none", + "os": "Windows-10", + "pool": "chromium.tests.gpu" + } + ], + "hard_timeout": 900, + "io_timeout": 900, + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "angle_end2end_tests", + "test_id_prefix": "ninja://src/tests:angle_end2end_tests/", + "use_isolated_scripts_api": true + } + ] + }, "win10-x86-swiftshader": { "gtest_tests": [ { diff --git a/infra/specs/angle_mb_config.pyl b/infra/specs/angle_mb_config.pyl index 05e9f86d7..dda26924c 100644 --- a/infra/specs/angle_mb_config.pyl +++ b/infra/specs/angle_mb_config.pyl @@ -12,31 +12,50 @@ # This is a map of builder group names -> builder names -> config names # (where each config name is a key in the 'configs' dict, below). MB uses # this dict to look up which config to use for a given bot. + # TODO(jmadill): Remove duplicates. http://anglebug.com/6496 'builder_groups': { 'angle': { + 'android-arm-compile': 'angle_goma_android_arm_release_bot', 'android-arm-dbg': 'angle_goma_android_arm_debug_bot', + 'android-arm-dbg-compile': 'angle_goma_android_arm_debug_bot', 'android-arm-rel': 'angle_goma_android_arm_release_bot', 'android-arm64-dbg': 'angle_goma_android_arm64_debug_bot', + 'android-arm64-dbg-compile': 'angle_goma_android_arm64_debug_bot', 'android-arm64-rel': 'angle_goma_android_arm64_release_bot', + 'android-arm64-test': 'angle_goma_android_arm64_release_bot', 'android-pixel4-perf': 'angle_goma_android_perf_bot', 'linux-clang-dbg': 'angle_goma_debug_bot', 'linux-clang-rel': 'angle_goma_release_bot', + 'linux-dbg-compile': 'angle_goma_debug_bot', 'linux-gcc-dbg': 'angle_non_clang_debug_bot', 'linux-gcc-rel': 'angle_non_clang_release_bot', 'linux-intel-hd630-perf': 'angle_goma_perf_bot', 'linux-nvidia-p400-perf': 'angle_goma_perf_bot', + 'linux-test': 'angle_goma_release_bot', 'mac-dbg': 'angle_goma_debug_bot', + 'mac-dbg-compile': 'angle_goma_debug_bot', 'mac-rel': 'angle_goma_release_bot', + 'mac-test': 'angle_goma_release_bot', 'win-clang-x64-dbg': 'angle_goma_debug_bot', 'win-clang-x64-rel': 'angle_goma_release_bot', 'win-clang-x86-dbg': 'angle_goma_x86_debug_bot', 'win-clang-x86-rel': 'angle_goma_x86_release_bot', + 'win-dbg-compile': 'angle_goma_debug_bot', + 'win-msvc-compile': 'angle_non_clang_release_bot', + 'win-msvc-dbg-compile': 'angle_non_clang_debug_bot', 'win-msvc-x64-dbg': 'angle_non_clang_debug_bot', 'win-msvc-x64-rel': 'angle_non_clang_release_bot', + 'win-msvc-x86-compile': 'angle_non_clang_x86_release_bot', 'win-msvc-x86-dbg': 'angle_non_clang_x86_debug_bot', + 'win-msvc-x86-dbg-compile': 'angle_non_clang_x86_debug_bot', 'win-msvc-x86-rel': 'angle_non_clang_x86_release_bot', + 'win-test': 'angle_goma_release_bot', + 'win-x86-dbg-compile': 'angle_goma_x86_debug_bot', + 'win-x86-test': 'angle_goma_x86_release_bot', 'win10-intel-hd630-perf': 'angle_goma_perf_bot', 'win10-nvidia-p400-perf': 'angle_goma_perf_bot', + 'winuwp-compile': 'angle_winuwp_non_clang_release_bot', + 'winuwp-dbg-compile': 'angle_winuwp_non_clang_debug_bot', 'winuwp-x64-dbg': 'angle_winuwp_non_clang_debug_bot', 'winuwp-x64-rel': 'angle_winuwp_non_clang_release_bot', }, diff --git a/infra/specs/waterfalls.pyl b/infra/specs/waterfalls.pyl index d907fa163..b662a37ce 100644 --- a/infra/specs/waterfalls.pyl +++ b/infra/specs/waterfalls.pyl @@ -158,6 +158,16 @@ 'isolated_scripts': 'angle_perf_isolated_scripts', }, }, + 'win10-x64-swiftshader': { + 'os_type': 'win', + 'mixins': [ + 'win10_gce_gpu_pool', + 'timeout_15m', + ], + 'test_suites': { + 'gtest_tests': 'swangle_gtests', + }, + }, 'win10-x86-swiftshader': { 'os_type': 'win', 'mixins': [ diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index 8137a0315..3bc76a8fc 100644 --- a/scripts/code_generation_hashes/Test_spec_JSON.json +++ b/scripts/code_generation_hashes/Test_spec_JSON.json @@ -1,6 +1,6 @@ { "infra/specs/angle.json": - "9df9c67e4b069729fdf3dcf8699362a1", + "1cf65bc153ba0ef90a97797f1a7e9754", "infra/specs/generate_test_spec_json.py": "348921bf70270ec6ee51fbb7e97d6925", "infra/specs/mixins.pyl": @@ -12,7 +12,7 @@ "infra/specs/variants.pyl": "8cfcaa99fa07ad2a2d5d14f220fd5037", "infra/specs/waterfalls.pyl": - "4fca53038f215b11647fe35b825c0bab", + "9bf84ffc60f2cbbdfc746b1df79d0dcf", "testing/buildbot/generate_buildbot_json.py": "f958374820a3ac8369e3f740f0fa2a09", "testing/buildbot/mixins.pyl":