[infra] Set GOCACHE in tasks that use go.
Bug: skia:8423
Change-Id: I60227677ceade39d76b4b8fa2f7c890f6908f111
Reviewed-on: https://skia-review.googlesource.com/c/179259
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/build_task_drivers.sh b/infra/bots/build_task_drivers.sh
index d558637..cdf6531 100755
--- a/infra/bots/build_task_drivers.sh
+++ b/infra/bots/build_task_drivers.sh
@@ -2,6 +2,7 @@
set -x -e
+export GOCACHE="$(pwd)/cache/go_cache"
export GOPATH="$(pwd)/go_deps"
export GOROOT="$(pwd)/go/go"
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index d710083..6e98683 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -120,6 +120,13 @@
},
}
+ CACHES_GO = []*specs.Cache{
+ &specs.Cache{
+ Name: "go_cache",
+ Path: "cache/go_cache",
+ },
+ }
+
LOGDOG_ANNOTATION_URL = fmt.Sprintf("logdog://logs.chromium.org/%s/%s/+/annotations", PROJECT, specs.PLACEHOLDER_TASK_ID)
)
@@ -219,6 +226,7 @@
// all platforms.
func buildTaskDrivers(b *specs.TasksCfgBuilder) string {
b.MustAddTask(BUILD_TASK_DRIVERS_NAME, &specs.TaskSpec{
+ Caches: CACHES_GO,
CipdPackages: append(CIPD_PKGS_GIT, b.MustGetCipdPackageFromAsset("go"), b.MustGetCipdPackageFromAsset("go_deps")),
Command: []string{
"/bin/bash", "buildbot/infra/bots/build_task_drivers.sh", specs.PLACEHOLDER_ISOLATED_OUTDIR,
@@ -312,6 +320,7 @@
task := kitchenTask(name, "swarm_infra", "infrabots.isolate", SERVICE_ACCOUNT_COMPILE, linuxGceDimensions(machineType), nil, OUTPUT_NONE)
task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...)
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
+ task.Caches = append(task.Caches, CACHES_GO...)
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("node"))
task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GSUTIL...)
if strings.Contains(name, "Large") {
@@ -389,6 +398,7 @@
}
t := &specs.TaskSpec{
+ Caches: CACHES_GO,
CipdPackages: cipd,
Command: []string{
"./infra_tests",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json
index fce22b7..17a31e5 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -118,6 +119,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -132,6 +134,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -147,6 +150,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -165,6 +169,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>",
@@ -187,6 +192,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
@@ -207,6 +213,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json
index ba7d02c..eef3f77 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -118,6 +119,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -132,6 +134,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -148,6 +151,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -167,6 +171,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json
index ab7f150..fd925ba 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -114,6 +115,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -129,6 +131,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -147,6 +150,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>",
@@ -172,6 +176,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
@@ -192,6 +197,7 @@
"CHROME_HEADLESS": "1",
"DATASTORE_EMULATOR_HOST": "localhost:8891",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
index 0f33743..c72f266 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -118,6 +119,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -132,6 +134,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -148,6 +151,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -167,6 +171,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json
index 0f33743..c72f266 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -118,6 +119,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -132,6 +134,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -148,6 +151,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -167,6 +171,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_try_gerrit.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_try_gerrit.json
index 2830fc1..ed637c8 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_try_gerrit.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_try_gerrit.json
@@ -89,6 +89,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -120,6 +121,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -134,6 +136,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -150,6 +153,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -169,6 +173,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.expected/missing_deps.json b/infra/bots/recipes/swarm_infra.expected/missing_deps.json
index 4da96ce..8b98f8f 100644
--- a/infra/bots/recipes/swarm_infra.expected/missing_deps.json
+++ b/infra/bots/recipes/swarm_infra.expected/missing_deps.json
@@ -87,6 +87,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -118,6 +119,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -132,6 +134,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -148,6 +151,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -164,6 +168,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -179,6 +184,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
@@ -197,6 +203,7 @@
"env": {
"CHROME_HEADLESS": "1",
"GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>:[DEPOT_TOOLS]",
diff --git a/infra/bots/recipes/swarm_infra.py b/infra/bots/recipes/swarm_infra.py
index 86b963b..6c708aa 100644
--- a/infra/bots/recipes/swarm_infra.py
+++ b/infra/bots/recipes/swarm_infra.py
@@ -51,6 +51,7 @@
go_src = go_dir.join('src')
api.file.ensure_directory('makedirs go/src', go_src)
infra_dir = go_src.join(INFRA_GO)
+ go_cache = api.path['start_dir'].join('cache', 'go_cache')
go_root = api.path['start_dir'].join('go', 'go')
go_bin = go_root.join('bin')
@@ -77,6 +78,7 @@
# Fetch Go dependencies.
env = {
'CHROME_HEADLESS': '1',
+ 'GOCACHE': go_cache,
'GOROOT': go_root,
'GOPATH': go_dir,
'GIT_USER_AGENT': 'git/1.9.1', # I don't think this version matters.
diff --git a/infra/bots/task_drivers/infra_tests/infra_tests.go b/infra/bots/task_drivers/infra_tests/infra_tests.go
index 8beb782..c041bbc 100644
--- a/infra/bots/task_drivers/infra_tests/infra_tests.go
+++ b/infra/bots/task_drivers/infra_tests/infra_tests.go
@@ -59,6 +59,7 @@
}, string(os.PathListSeparator))
env := []string{
"CHROME_HEADLESS=1",
+ fmt.Sprintf("GOCACHE=%s", path.Join(workdir, "cache", "go_cache")),
fmt.Sprintf("GOROOT=%s", goRoot),
fmt.Sprintf("GOPATH=%s", goPath),
"GIT_USER_AGENT=git/1.9.1", // I don't think this version matters.
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 18af539..547596d 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -162,6 +162,12 @@
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Housekeeper-PerCommit-BuildTaskDrivers": {
+ "caches": [
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
+ }
+ ],
"cipd_packages": [
{
"name": "infra/git/${platform}",
@@ -282,6 +288,12 @@
"isolate": "empty.isolate"
},
"Infra-Experimental-Small": {
+ "caches": [
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
+ }
+ ],
"cipd_packages": [
{
"name": "infra/git/${platform}",
@@ -362,6 +374,10 @@
{
"name": "vpython",
"path": "cache/vpython"
+ },
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
}
],
"cipd_packages": [
@@ -502,6 +518,10 @@
{
"name": "vpython",
"path": "cache/vpython"
+ },
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
}
],
"cipd_packages": [
@@ -632,6 +652,10 @@
{
"name": "vpython",
"path": "cache/vpython"
+ },
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
}
],
"cipd_packages": [
@@ -768,6 +792,10 @@
{
"name": "vpython",
"path": "cache/vpython"
+ },
+ {
+ "name": "go_cache",
+ "path": "cache/go_cache"
}
],
"cipd_packages": [
