[recipes] Revert recipe changes from 108a1c3
Change-Id: I4064456babf77def95dabba63a3b31a672da1c61
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/270943
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Build.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Build.json
index 15d6c5f..74d94ad 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Build.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Build.json
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
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 ce1df4f..9cfde2a 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Large.json
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
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 669a533..16865cf 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Medium.json
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
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 0e0e5d7..6b8b5f1 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit-Race.json
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"[START_DIR]/buildbot/scripts/run_emulators/run_emulators",
"start"
],
diff --git a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
index 90a3fc4..9597bf3 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit.json
@@ -84,6 +84,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
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 8207368..3922eb3 100644
--- a/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json
+++ b/infra/bots/recipes/swarm_infra.expected/Infra-PerCommit_initialcheckout.json
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
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 8207368..3922eb3 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
@@ -63,6 +63,101 @@
},
{
"cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/golang/protobuf/protoc-gen-go"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/golang/protobuf/protoc-gen-go"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/kisielk/errcheck"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/kisielk/errcheck"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/goimports"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/goimports"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "golang.org/x/tools/cmd/stringer"
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install golang.org/x/tools/cmd/stringer"
+ },
+ {
+ "cmd": [
+ "go",
+ "install",
+ "-v",
+ "github.com/vektra/mockery/..."
+ ],
+ "cwd": "[START_DIR]/buildbot",
+ "env": {
+ "CHROME_HEADLESS": "1",
+ "GIT_USER_AGENT": "git/1.9.1",
+ "GOCACHE": "[START_DIR]/cache/go_cache",
+ "GOFLAGS": "-mod=readonly",
+ "GOPATH": "[START_DIR]/cache/gopath",
+ "GOROOT": "[START_DIR]/go/go",
+ "PATH": "[START_DIR]/go/go/bin:[START_DIR]/cache/gopath/bin:[START_DIR]/gcloud_linux/bin:[START_DIR]/protoc/bin:[START_DIR]/node/node/bin:<PATH>"
+ },
+ "name": "go install github.com/vektra/mockery/..."
+ },
+ {
+ "cmd": [
"sudo",
"npm",
"i",
diff --git a/infra/bots/recipes/swarm_infra.py b/infra/bots/recipes/swarm_infra.py
index 4f40f5e..de47081 100644
--- a/infra/bots/recipes/swarm_infra.py
+++ b/infra/bots/recipes/swarm_infra.py
@@ -83,6 +83,16 @@
# Try up to three times in case of transient network failures.
retry(api, 3, 'go mod download', cmd=['go', 'mod', 'download'])
+ install_targets = [
+ 'github.com/golang/protobuf/protoc-gen-go',
+ 'github.com/kisielk/errcheck',
+ 'golang.org/x/tools/cmd/goimports',
+ 'golang.org/x/tools/cmd/stringer',
+ 'github.com/vektra/mockery/...'
+ ]
+ for target in install_targets:
+ api.step('go install %s' % target, cmd=['go', 'install', '-v', target])
+
# More prerequisites.
builder = api.properties['buildername']
with api.context(cwd=infra_dir, env=env):