infra: Remove named vs_toolchain cache.
This is no longer needed now that ANGLE uses the pinned depot_tools.
We should land this after the recipe updates to no longer use the
cache.
Patch series:
1. http://crrev.com/c/2819943
2. http://crrev.com/c/2819472
3. This CL
Bug: angleproject:5842
Change-Id: I5d166c7cd66a9d7f077c09b4149de08b22724af8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2819945
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index a51244c..3ecc854 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -133,10 +133,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -151,10 +147,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -169,10 +161,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -187,10 +175,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -205,10 +189,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -223,10 +203,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -241,10 +217,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -259,10 +231,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -277,10 +245,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -295,10 +259,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -313,10 +273,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -464,10 +420,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -482,10 +434,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -500,10 +448,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -518,10 +462,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -536,10 +476,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -554,10 +490,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -572,10 +504,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -590,10 +518,6 @@
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\"}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -608,10 +532,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -626,10 +546,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
@@ -644,10 +560,6 @@
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}"
- caches {
- name: "win_toolchain"
- path: "win_toolchain"
- }
build_numbers: YES
service_account: "angle-try-builder@chops-service-accounts.iam.gserviceaccount.com"
}
diff --git a/infra/config/main.star b/infra/config/main.star
index 909f8d2..fcfd07a 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -136,9 +136,6 @@
properties["$build/goma"] = goma_props
caches = []
- if os.category == os_category.WINDOWS:
- caches += [swarming.cache(name = "win_toolchain", path = "win_toolchain")]
-
if os.category == os_category.MAC:
# Cache for mac_toolchain tool and XCode.app
caches += [swarming.cache(name = "osx_sdk", path = "osx_sdk")]
