AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change infra recipe module to use the Go asset

Browse Source 
Bug: skia:
Change-Id: Ib2fa0b971f201ea2f16afd0467d7882b66b4047c
Reviewed-on: https://skia-review.googlesource.com/13331
Reviewed-by: Joe Gregorio <jcgregorio@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2017-04-13 10:00:43 -04:00 committed by Skia Commit-Bot
parent e440721a86
commit ade6920037
11 changed files with 358 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/gen_tasks.go
View File

@ -399,7 +399,7 @@ func housekeeper(b *specs.TasksCfgBuilder, name, compileTaskName string) string
// generated chain of tasks, which the Job should add as a dependency.
func infra(b *specs.TasksCfgBuilder, name string) string {
b.MustAddTask(name, &specs.TaskSpec{
CipdPackages: []*specs.CipdPackage{},
CipdPackages: []*specs.CipdPackage{b.MustGetCipdPackageFromAsset("go")},
Dimensions: linuxGceDimensions(),
ExtraArgs: []string{
"--workdir", "../../..", "infra",

37
infra/bots/recipe_modules/infra/api.py
View File

@ -11,19 +11,50 @@ UPDATE_GO_ATTEMPTS = 5
class InfraApi(recipe_api.RecipeApi):
@property
def goroot(self):
return self.m.vars.slave_dir.join('go', 'go')
@property
def go_bin(self):
return self.goroot.join('bin')
@property
def go_exe(self):
return self.go_bin.join('go')
@property
def go_env(self):
return {'GOPATH': self.gopath}
return {
'GOPATH': self.gopath,
'GOROOT': self.goroot,
'PATH': '%s:%s:%%(PATH)s' % (self.go_bin, self.gopath),
}
@property
def gopath(self):
return self.m.vars.checkout_root.join('gopath')
return self.m.vars.slave_dir.join('gopath')
def go_version(self):
"""Print the Go version."""
env = self.m.step.get_from_context('env', {})
env.update(self.go_env)
with self.m.step.context({'env': env}):
self.m.run(
self.m.step,
'go version',
cmd=[self.go_exe, 'version'])
self.m.run(
self.m.step,
'env go version',
cmd=['go', 'version'])
def update_go_deps(self):
"""Attempt to update go dependencies.
This fails flakily sometimes, so perform multiple attempts.
"""
self.go_version()
env = self.m.step.get_from_context('env', {})
env.update(self.go_env)
with self.m.step.context({'env': env}):
@ -31,4 +62,4 @@ class InfraApi(recipe_api.RecipeApi):
self.m.step,
'update go pkgs',
UPDATE_GO_ATTEMPTS,
cmd=['go', 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG])
cmd=[self.go_exe, 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG])

63
infra/bots/recipe_modules/infra/example.expected/failed_all_updates.json
View File

@ -1,7 +1,37 @@
[
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -10,8 +40,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs",
@ -22,7 +53,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -31,8 +62,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 2)",
@ -43,7 +75,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -52,8 +84,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 3)",
@ -64,7 +97,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -73,8 +106,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 4)",
@ -85,7 +119,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -94,8 +128,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 5)",

42
infra/bots/recipe_modules/infra/example.expected/failed_one_update.json
View File

@ -1,7 +1,37 @@
[
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -10,8 +40,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs",
@ -22,7 +53,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -31,8 +62,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 2)"

35
infra/bots/recipe_modules/infra/example.expected/infra_tests.json
View File

@ -1,7 +1,37 @@
[
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -10,8 +40,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs"

63
infra/bots/recipes/infra.expected/failed_all_updates.json
View File

@ -76,9 +76,39 @@
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -87,8 +117,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs",
@ -99,7 +130,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -108,8 +139,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 2)",
@ -120,7 +152,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -129,8 +161,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 3)",
@ -141,7 +174,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -150,8 +183,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 4)",
@ -162,7 +196,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -171,8 +205,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 5)",

46
infra/bots/recipes/infra.expected/failed_one_update.json
View File

@ -76,9 +76,39 @@
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -87,8 +117,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs",
@ -99,7 +130,7 @@
},
{
"cmd": [
"go",
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -108,8 +139,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs (attempt 2)"
@ -121,7 +153,9 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"GOPATH": "[CUSTOM_/_B_WORK]/gopath"
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
},
"name": "infra_tests"
},

39
infra/bots/recipes/infra.expected/infra_tests.json
View File

@ -76,9 +76,39 @@
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -87,8 +117,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs"
@ -100,7 +131,9 @@
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"GOPATH": "[CUSTOM_/_B_WORK]/gopath"
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
},
"name": "infra_tests"
},

40
infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
View File

@ -191,9 +191,39 @@
},
"name": "Recreate SKPs"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -202,8 +232,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs"
@ -246,8 +277,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
},
"name": "Upload SKPs"
},

40
infra/bots/recipes/recreate_skps.expected/failed_upload.json
View File

@ -191,9 +191,39 @@
},
"name": "Recreate SKPs"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
@ -202,8 +232,9 @@
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
"SKIA_OUT": "[START_DIR]/out"
},
"name": "update go pkgs"
@ -246,8 +277,9 @@
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[CUSTOM_/_B_WORK]/gopath",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:%(PATH)s"
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:%(PATH)s"
},
"name": "Upload SKPs",
"~followup_annotations": [

7
infra/bots/tasks.json
View File

@ -4001,6 +4001,13 @@
"priority": 0.95
},
"Housekeeper-PerCommit-InfraTests": {
"cipd_packages": [
{
"name": "skia/bots/go",
"path": "go",
"version": "version:1"
}
],
"dimensions": [
"cpu:x86-64-avx2",
"gpu:none",