Skip to content

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

infra: Remove unused debug/cpu properties from tests.

These are now configured through mb_config.pyl. We still pass in the properties to the lucicfg helper function set up the waterfall UI. Bug: angleproject:5114 Change-Id: Ib46ab95f5803a166fd2342679afbfcaa6f467c45 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2822233Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent fb3173b9
Showing with 36 additions and 41 deletions
infra/config/generated/cr-buildbucket.cfg
...@@ -28,7 +28,7 @@ buckets { ...@@ -28,7 +28,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -42,7 +42,7 @@ buckets { ...@@ -42,7 +42,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -56,7 +56,7 @@ buckets { ...@@ -56,7 +56,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -70,7 +70,7 @@ buckets { ...@@ -70,7 +70,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -84,7 +84,7 @@ buckets { ...@@ -84,7 +84,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"trace_tests\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\",\"trace_tests\":true}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -97,7 +97,7 @@ buckets { ...@@ -97,7 +97,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches { caches {
name: "osx_sdk" name: "osx_sdk"
path: "osx_sdk" path: "osx_sdk"
...@@ -114,7 +114,7 @@ buckets { ...@@ -114,7 +114,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches { caches {
name: "osx_sdk" name: "osx_sdk"
path: "osx_sdk" path: "osx_sdk"
...@@ -132,7 +132,7 @@ buckets { ...@@ -132,7 +132,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -146,7 +146,7 @@ buckets { ...@@ -146,7 +146,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -160,7 +160,7 @@ buckets { ...@@ -160,7 +160,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -174,7 +174,7 @@ buckets { ...@@ -174,7 +174,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -188,7 +188,7 @@ buckets { ...@@ -188,7 +188,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -202,7 +202,7 @@ buckets { ...@@ -202,7 +202,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -216,7 +216,7 @@ buckets { ...@@ -216,7 +216,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -230,7 +230,7 @@ buckets { ...@@ -230,7 +230,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -244,7 +244,7 @@ buckets { ...@@ -244,7 +244,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"trace_tests\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\",\"trace_tests\":true}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -258,7 +258,7 @@ buckets { ...@@ -258,7 +258,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"uwp\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -272,7 +272,7 @@ buckets { ...@@ -272,7 +272,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"uwp\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -302,7 +302,7 @@ buckets { ...@@ -302,7 +302,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -316,7 +316,7 @@ buckets { ...@@ -316,7 +316,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -330,7 +330,7 @@ buckets { ...@@ -330,7 +330,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -344,7 +344,7 @@ buckets { ...@@ -344,7 +344,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -358,7 +358,7 @@ buckets { ...@@ -358,7 +358,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"trace_tests\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\",\"trace_tests\":true}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -371,7 +371,7 @@ buckets { ...@@ -371,7 +371,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches { caches {
name: "osx_sdk" name: "osx_sdk"
path: "osx_sdk" path: "osx_sdk"
...@@ -388,7 +388,7 @@ buckets { ...@@ -388,7 +388,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$depot_tools/osx_sdk\":{\"sdk_version\":\"12D4e\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
caches { caches {
name: "osx_sdk" name: "osx_sdk"
path: "osx_sdk" path: "osx_sdk"
...@@ -419,7 +419,7 @@ buckets { ...@@ -419,7 +419,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -433,7 +433,7 @@ buckets { ...@@ -433,7 +433,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -447,7 +447,7 @@ buckets { ...@@ -447,7 +447,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -461,7 +461,7 @@ buckets { ...@@ -461,7 +461,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -475,7 +475,7 @@ buckets { ...@@ -475,7 +475,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -489,7 +489,7 @@ buckets { ...@@ -489,7 +489,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -503,7 +503,7 @@ buckets { ...@@ -503,7 +503,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -517,7 +517,7 @@ buckets { ...@@ -517,7 +517,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x86\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -531,7 +531,7 @@ buckets { ...@@ -531,7 +531,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"trace_tests\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"recipe\":\"angle\",\"trace_tests\":true}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -545,7 +545,7 @@ buckets { ...@@ -545,7 +545,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":true,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"uwp\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
...@@ -559,7 +559,7 @@ buckets { ...@@ -559,7 +559,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"debug\":false,\"recipe\":\"angle\",\"target_cpu\":\"x64\",\"uwp\":true}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"builder_group\":\"angle\",\"clang\":false,\"recipe\":\"angle\"}"
build_numbers: YES build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
......
infra/config/main.star
...@@ -118,8 +118,6 @@ def get_os_from_name(name): ...@@ -118,8 +118,6 @@ def get_os_from_name(name):
# 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 = False, trace_tests = False): def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests = False):
properties = { properties = {
"debug": debug,
"target_cpu": cpu,
"builder_group": "angle", "builder_group": "angle",
} }
os = get_os_from_name(name) os = get_os_from_name(name)
...@@ -146,9 +144,6 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests = ...@@ -146,9 +144,6 @@ def angle_standalone_builder(name, clang, debug, cpu, uwp = False, trace_tests =
if not clang: if not clang:
properties["clang"] = False properties["clang"] = False
if uwp:
properties["uwp"] = True
if trace_tests: if trace_tests:
properties["trace_tests"] = True properties["trace_tests"] = True
......
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