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

[infra] Add new go_deps asset

Browse Source 
This contains the Go code dependencies of our infra repo and will be
used to insulate us from upstream changes which break us due to API
changes, etc.

Bug: skia:
Change-Id: I6ce36a4e41b6d7686fe2598ba980640854cd4f11
Reviewed-on: https://skia-review.googlesource.com/145158
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Eric Boren 2018-08-03 14:29:03 -04:00 committed by Skia Commit-Bot
parent ffee60f859
commit 9d834581da
33 changed files with 286 additions and 1081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/assets/asset_utils.py
View File

@ -93,7 +93,7 @@ class CIPDStore(object):
if 'no such package' in e.output:
return []
raise
return [r['instance_id'] for r in res]
return [r['instance_id'] for r in res or []]
def _describe(self, pkg_name, instance_id):
"""Obtain details about the given package and instance ID."""

1
infra/bots/assets/go_deps/VERSION Normal file
View File

@ -0,0 +1 @@
1

26
infra/bots/assets/go_deps/common.py Executable file
View File

@ -0,0 +1,26 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Common vars used by scripts in this directory."""
import os
import sys
FILE_DIR = os.path.dirname(os.path.abspath(__file__))
INFRA_BOTS_DIR = os.path.realpath(os.path.join(FILE_DIR, os.pardir, os.pardir))
sys.path.insert(0, INFRA_BOTS_DIR)
from assets import assets
ASSET_NAME = os.path.basename(FILE_DIR)
def run(cmd):
"""Run a command, eg. "upload" or "download". """
assets.main([cmd, ASSET_NAME] + sys.argv[1:])

35
infra/bots/assets/go_deps/create.py Executable file
View File

@ -0,0 +1,35 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the asset."""
import argparse
import os
import subprocess
def create_asset(target_dir):
"""Create the asset."""
env = {}
env.update(os.environ)
env['GOPATH'] = target_dir
subprocess.check_call(
['go', 'get', '-u', '-t', 'go.skia.org/infra/...'],
env=env)
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--target_dir', '-t', required=True)
args = parser.parse_args()
create_asset(args.target_dir)
if __name__ == '__main__':
main()

42
infra/bots/assets/go_deps/create_and_upload.py Executable file
View File

@ -0,0 +1,42 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Create the asset and upload it."""
import argparse
import common
import os
import subprocess
import sys
import utils
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--gsutil')
args = parser.parse_args()
with utils.tmp_dir():
cwd = os.getcwd()
create_script = os.path.join(common.FILE_DIR, 'create.py')
upload_script = os.path.join(common.FILE_DIR, 'upload.py')
try:
subprocess.check_call(['python', create_script, '-t', cwd])
cmd = ['python', upload_script, '-t', cwd]
if args.gsutil:
cmd.extend(['--gsutil', args.gsutil])
subprocess.check_call(cmd)
except subprocess.CalledProcessError:
# Trap exceptions to avoid printing two stacktraces.
sys.exit(1)
if __name__ == '__main__':
main()

16
infra/bots/assets/go_deps/download.py Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Download the current version of the asset."""
import common
if __name__ == '__main__':
common.run('download')

16
infra/bots/assets/go_deps/upload.py Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env python
#
# Copyright 2017 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""Upload a new version of the asset."""
import common
if __name__ == '__main__':
common.run('upload')

9
infra/bots/gen_tasks.go
View File

@ -32,6 +32,7 @@ import (
const (
BUNDLE_RECIPES_NAME = "Housekeeper-PerCommit-BundleRecipes"
ISOLATE_GCLOUD_LINUX_NAME = "Housekeeper-PerCommit-IsolateGCloudLinux"
ISOLATE_GO_DEPS_NAME = "Housekeeper-PerCommit-IsolateGoDeps"
ISOLATE_GO_LINUX_NAME = "Housekeeper-PerCommit-IsolateGoLinux"
ISOLATE_SKIMAGE_NAME = "Housekeeper-PerCommit-IsolateSkImage"
ISOLATE_SKP_NAME = "Housekeeper-PerCommit-IsolateSKP"
@ -678,6 +679,10 @@ var ISOLATE_ASSET_MAPPING = map[string]isolateAssetCfg{
cipdPkg: "gcloud_linux",
path: "gcloud_linux",
},
ISOLATE_GO_DEPS_NAME: {
cipdPkg: "go_deps",
path: "go_deps",
},
ISOLATE_GO_LINUX_NAME: {
cipdPkg: "go",
path: "go",
@ -794,7 +799,7 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
} else {
task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_NDK_LINUX_NAME))
if strings.Contains(name, "SKQP") {
task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_SDK_LINUX_NAME), isolateCIPDAsset(b, ISOLATE_GO_LINUX_NAME))
task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_SDK_LINUX_NAME), isolateCIPDAsset(b, ISOLATE_GO_LINUX_NAME), isolateCIPDAsset(b, ISOLATE_GO_DEPS_NAME))
}
}
} else if strings.Contains(name, "Chromecast") {
@ -890,6 +895,7 @@ func recreateSKPs(b *specs.TasksCfgBuilder, name string) string {
task := kitchenTask(name, "recreate_skps", "swarm_recipe.isolate", SERVICE_ACCOUNT_RECREATE_SKPS, dims, nil, OUTPUT_NONE)
task.CipdPackages = append(task.CipdPackages, CIPD_PKGS_GIT...)
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_GO_DEPS_NAME))
timeout(task, 4*time.Hour)
b.MustAddTask(name, task)
return name
@ -962,6 +968,7 @@ func infra(b *specs.TasksCfgBuilder, name string) string {
task := kitchenTask(name, "infra", "swarm_recipe.isolate", SERVICE_ACCOUNT_COMPILE, linuxGceDimensions(MACHINE_TYPE_SMALL), nil, OUTPUT_NONE)
usesGit(task, name)
task.CipdPackages = append(task.CipdPackages, b.MustGetCipdPackageFromAsset("go"))
task.Dependencies = append(task.Dependencies, isolateCIPDAsset(b, ISOLATE_GO_DEPS_NAME))
b.MustAddTask(name, task)
return name
}

1
infra/bots/jobs.json
View File

@ -114,6 +114,7 @@
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-CheckGeneratedFiles",
"Housekeeper-PerCommit-InfraTests",
"Housekeeper-PerCommit-IsolateGoDeps",
"Housekeeper-PerCommit-IsolateSKP",
"Housekeeper-PerCommit-IsolateSVG",
"Housekeeper-PerCommit-IsolateSkImage",

2
infra/bots/recipe_modules/build/android.py
View File

@ -68,8 +68,6 @@ def compile_fn(api, checkout_root, out_dir):
# If this is the SkQP build, set up the environment and run the script
# to build the universal APK. This should only run the skqp branches.
if 'SKQP' in extra_tokens:
api.infra.update_go_deps()
output_binary = out_dir.join('run_testlab')
build_target = skia_dir.join('infra', 'cts', 'run_testlab.go')
build_cmd = ['go', 'build', '-o', output_binary, build_target]

49
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
View File

@ -27,51 +27,6 @@
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"go",
@ -83,9 +38,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "build firebase runner"
},

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

@ -34,7 +34,7 @@ class InfraApi(recipe_api.RecipeApi):
@property
def gopath(self):
return self.m.vars.slave_dir.join('gopath')
return self.m.vars.slave_dir.join('go_deps')
def go_version(self):
"""Print the Go version."""
@ -50,21 +50,6 @@ class InfraApi(recipe_api.RecipeApi):
'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.context.env
env.update(self.go_env)
with self.m.context(env=env):
self.m.run.with_retry(
self.m.step,
'update go pkgs',
UPDATE_GO_ATTEMPTS,
cmd=[self.go_exe, 'get', '-u', '-t', '%s/...' % INFRA_GO_PKG])
class MetadataFetch():
def __init__(self, api, metadata_key, local_file, **kwargs):
self.m = api

134
infra/bots/recipe_modules/infra/examples/full.expected/failed_all_updates.json
View File

@ -1,134 +0,0 @@
[
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 2)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 3)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 4)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 5)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"name": "$result",
"reason": "Step('update go pkgs (attempt 5)') failed with return_code 1",
"recipe_result": null,
"status_code": 1
}
]

117
infra/bots/recipe_modules/infra/examples/full.expected/failed_one_update.json
View File

@ -1,117 +0,0 @@
[
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 2)"
},
{
"cmd": [
"python",
"-u",
"\nimport os\nimport urllib2\n\nTOKEN_FILE = 'file'\nTOKEN_URL = 'http://metadata/computeMetadata/v1/project/attributes/key'\n\nreq = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})\ncontents = urllib2.urlopen(req).read()\n\nhome = os.path.expanduser('~')\ntoken_file = os.path.join(home, TOKEN_FILE)\n\nwith open(token_file, 'w') as f:\n f.write(contents)\n"
],
"name": "download file",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@TOKEN_FILE = 'file'@@@",
"@@@STEP_LOG_LINE@python.inline@TOKEN_URL = 'http://metadata/computeMetadata/v1/project/attributes/key'@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@req = urllib2.Request(TOKEN_URL, headers={'Metadata-Flavor': 'Google'})@@@",
"@@@STEP_LOG_LINE@python.inline@contents = urllib2.urlopen(req).read()@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@home = os.path.expanduser('~')@@@",
"@@@STEP_LOG_LINE@python.inline@token_file = os.path.join(home, TOKEN_FILE)@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@with open(token_file, 'w') as f:@@@",
"@@@STEP_LOG_LINE@python.inline@ f.write(contents)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport os\n\n\nTOKEN_FILE = 'file'\n\n\nhome = os.path.expanduser('~')\ntoken_file = os.path.join(home, TOKEN_FILE)\nif os.path.isfile(token_file):\n os.remove(token_file)\n"
],
"name": "cleanup file",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@TOKEN_FILE = 'file'@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@home = os.path.expanduser('~')@@@",
"@@@STEP_LOG_LINE@python.inline@token_file = os.path.join(home, TOKEN_FILE)@@@",
"@@@STEP_LOG_LINE@python.inline@if os.path.isfile(token_file):@@@",
"@@@STEP_LOG_LINE@python.inline@ os.remove(token_file)@@@",
"@@@STEP_LOG_END@python.inline@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

24
infra/bots/recipe_modules/infra/examples/full.expected/infra_tests.json
View File

@ -6,9 +6,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -19,28 +19,12 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"python",

27
infra/bots/recipe_modules/infra/examples/full.py
View File

@ -8,6 +8,7 @@
DEPS = [
'infra',
'recipe_engine/context',
'recipe_engine/file',
'recipe_engine/path',
'recipe_engine/properties',
@ -20,7 +21,7 @@ DEPS = [
def RunSteps(api):
api.vars.setup()
api.infra.update_go_deps()
api.infra.go_version()
with api.infra.MetadataFetch(api, 'key', 'file'):
pass
@ -35,27 +36,3 @@ def GenTests(api):
swarm_out_dir='[SWARM_OUT_DIR]') +
api.path.exists(api.path['start_dir'].join('localpath'))
)
yield (
api.test('failed_one_update') +
api.properties(buildername='Housekeeper-PerCommit-InfraTests',
repository='https://skia.googlesource.com/skia.git',
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.step_data('update go pkgs', retcode=1)
)
yield (
api.test('failed_all_updates') +
api.properties(buildername='Housekeeper-PerCommit-InfraTests',
repository='https://skia.googlesource.com/skia.git',
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.step_data('update go pkgs', retcode=1) +
api.step_data('update go pkgs (attempt 2)', retcode=1) +
api.step_data('update go pkgs (attempt 3)', retcode=1) +
api.step_data('update go pkgs (attempt 4)', retcode=1) +
api.step_data('update go pkgs (attempt 5)', retcode=1)
)

40
infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -146,9 +144,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Extract all fiddles out of md files"
},
@ -160,15 +158,15 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddle.json"
},
{
"cmd": [
"[START_DIR]/gopath/bin/fiddlecli",
"[START_DIR]/go_deps/bin/fiddlecli",
"--input",
"[START_DIR]/fiddle.json",
"--output",
@ -181,9 +179,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Force fiddle to compile all examples"
},
@ -200,9 +198,9 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>"
},
"infra_step": true,
"name": "Read fiddleout.json"
@ -215,9 +213,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddleout.json"
},
@ -233,9 +231,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Generate and Upload Markdown files"
},

18
infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -146,9 +144,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Extract all fiddles out of md files",
"~followup_annotations": [

28
infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -146,9 +144,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Extract all fiddles out of md files"
},
@ -160,15 +158,15 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddle.json"
},
{
"cmd": [
"[START_DIR]/gopath/bin/fiddlecli",
"[START_DIR]/go_deps/bin/fiddlecli",
"--input",
"[START_DIR]/fiddle.json",
"--output",
@ -181,9 +179,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Force fiddle to compile all examples",
"~followup_annotations": [

36
infra/bots/recipes/bookmaker.expected/nightly_failed_fiddles.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -146,9 +144,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Extract all fiddles out of md files"
},
@ -160,15 +158,15 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddle.json"
},
{
"cmd": [
"[START_DIR]/gopath/bin/fiddlecli",
"[START_DIR]/go_deps/bin/fiddlecli",
"--input",
"[START_DIR]/fiddle.json",
"--output",
@ -181,9 +179,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Force fiddle to compile all examples"
},
@ -200,9 +198,9 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>"
},
"infra_step": true,
"name": "Read fiddleout.json"
@ -215,9 +213,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddleout.json"
},

32
infra/bots/recipes/bookmaker.expected/nightly_failed_upload.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -146,9 +144,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Extract all fiddles out of md files"
},
@ -160,15 +158,15 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Output fiddle.json"
},
{
"cmd": [
"[START_DIR]/gopath/bin/fiddlecli",
"[START_DIR]/go_deps/bin/fiddlecli",
"--input",
"[START_DIR]/fiddle.json",
"--output",
@ -181,9 +179,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Force fiddle to compile all examples"
},
@ -199,9 +197,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Generate and Upload Markdown files",
"~followup_annotations": [

18
infra/bots/recipes/bookmaker.expected/percommit_bookmaker.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -145,9 +143,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Validate docs match include/core/*.h"
},

18
infra/bots/recipes/bookmaker.expected/percommit_failed_validation.json
View File

@ -100,9 +100,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
@ -113,9 +113,9 @@
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
@ -123,15 +123,13 @@
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/fiddlek/go/fiddlecli"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go get fiddlecli"
},
@ -145,9 +143,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Validate docs match include/core/*.h",
"~followup_annotations": [

3
infra/bots/recipes/bookmaker.py
View File

@ -33,8 +33,7 @@ def go_get_fiddlecli(api):
api.step,
'go get fiddlecli',
5, # Update attempts.
cmd=[api.infra.go_exe, 'get', '-u', '-t',
'go.skia.org/infra/fiddlek/go/fiddlecli'])
cmd=[api.infra.go_exe, 'get', 'go.skia.org/infra/fiddlek/go/fiddlecli'])
def RunSteps(api):

49
infra/bots/recipes/compile.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP.json
View File

@ -136,51 +136,6 @@
"infra_step": true,
"name": "fetch-gn"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"go",
@ -192,9 +147,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "build firebase runner"
},

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

@ -1,228 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/cache/work"
],
"infra_step": true,
"name": "makedirs checkout_path"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
"[START_DIR]/cache/work/.gclient_entries"
],
"infra_step": true,
"name": "remove [START_DIR]/cache/work/.gclient_entries"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
"cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"--git-cache-dir",
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123"
],
"cwd": "[START_DIR]/cache/work",
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 2)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 3)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 4)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 5)",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"name": "$result",
"reason": "Step('update go pkgs (attempt 5)') failed with return_code 1",
"recipe_result": null,
"status_code": 1
}
]

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

@ -1,178 +0,0 @@
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"ensure-directory",
"--mode",
"0777",
"[START_DIR]/cache/work"
],
"infra_step": true,
"name": "makedirs checkout_path"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
"remove",
"[START_DIR]/cache/work/.gclient_entries"
],
"infra_step": true,
"name": "remove [START_DIR]/cache/work/.gclient_entries"
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec-path",
"cache_dir = '[START_DIR]/cache/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]",
"--patch_root",
"skia",
"--revision_mapping_file",
"{\"got_revision\": \"skia\"}",
"--git-cache-dir",
"[START_DIR]/cache/git",
"--cleanup-dir",
"[CLEANUP]/bot_update",
"--output_json",
"/path/to/tmp/json",
"--revision",
"skia@abc123"
],
"cwd": "[START_DIR]/cache/work",
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": \"abc123\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#164710}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"skia\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/skia.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs",
"~followup_annotations": [
"step returned non-zero exit code: 1",
"@@@STEP_FAILURE@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs (attempt 2)"
},
{
"cmd": [
"make",
"-C",
"infra/bots",
"test"
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>"
},
"name": "infra_tests"
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]

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

@ -93,48 +93,6 @@
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#164710}\"@@@"
]
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"make",
@ -144,9 +102,9 @@
],
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>"
},
"name": "infra_tests"
},

25
infra/bots/recipes/infra.py
View File

@ -20,7 +20,6 @@ def RunSteps(api):
api.vars.setup()
checkout_root = api.checkout.default_checkout_root
api.checkout.bot_update(checkout_root=checkout_root)
api.infra.update_go_deps()
# Run the infra tests.
repo_name = api.properties['repository'].split('/')[-1]
@ -40,27 +39,3 @@ def GenTests(api):
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]')
)
yield (
api.test('failed_one_update') +
api.properties(buildername='Housekeeper-PerCommit-InfraTests',
repository='https://skia.googlesource.com/skia.git',
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.step_data('update go pkgs', retcode=1)
)
yield (
api.test('failed_all_updates') +
api.properties(buildername='Housekeeper-PerCommit-InfraTests',
repository='https://skia.googlesource.com/skia.git',
revision='abc123',
path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') +
api.step_data('update go pkgs', retcode=1) +
api.step_data('update go pkgs (attempt 2)', retcode=1) +
api.step_data('update go pkgs (attempt 3)', retcode=1) +
api.step_data('update go pkgs (attempt 4)', retcode=1) +
api.step_data('update go pkgs (attempt 5)', retcode=1)
)

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

@ -203,48 +203,6 @@
},
"name": "Recreate SKPs"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"python",
@ -255,9 +213,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Upload SKPs"
},

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

@ -203,48 +203,6 @@
},
"name": "Recreate SKPs"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "go version"
},
{
"cmd": [
"go",
"version"
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "env go version"
},
{
"cmd": [
"[START_DIR]/go/go/bin/go",
"get",
"-u",
"-t",
"go.skia.org/infra/..."
],
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "update go pkgs"
},
{
"cmd": [
"python",
@ -255,9 +213,9 @@
"cwd": "[START_DIR]/cache/work/skia",
"env": {
"CHROME_HEADLESS": "1",
"GOPATH": "[START_DIR]/gopath",
"GOPATH": "[START_DIR]/go_deps",
"GOROOT": "[START_DIR]/go/go",
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/gopath:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "[START_DIR]/go/go/bin:[START_DIR]/go_deps:<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "Upload SKPs",
"~followup_annotations": [

1
infra/bots/recipes/recreate_skps.py
View File

@ -84,7 +84,6 @@ def RunSteps(api):
# Upload the SKPs.
if 'Canary' not in api.properties['buildername']:
api.infra.update_go_deps()
cmd = ['python',
skia_dir.join('infra', 'bots', 'upload_skps.py'),
'--target_dir', output_dir]

37
infra/bots/tasks.json
View File

@ -583,6 +583,11 @@
"Housekeeper-PerCommit-InfraTests"
]
},
"Housekeeper-PerCommit-IsolateGoDeps": {
"tasks": [
"Housekeeper-PerCommit-IsolateGoDeps"
]
},
"Housekeeper-PerCommit-IsolateSKP": {
"tasks": [
"Housekeeper-PerCommit-IsolateSKP"
@ -17013,7 +17018,8 @@
"logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateGoDeps"
],
"dimensions": [
"pool:SkiaCT",
@ -17640,7 +17646,8 @@
"logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateGoDeps"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
@ -17689,6 +17696,29 @@
],
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateGoDeps": {
"cipd_packages": [
{
"name": "skia/bots/go_deps",
"path": "go_deps",
"version": "version:1"
}
],
"command": [
"/bin/cp",
"-rL",
"go_deps",
"${ISOLATED_OUTDIR}"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
"isolate": "empty.isolate"
},
"Housekeeper-PerCommit-IsolateSKP": {
"cipd_packages": [
{
@ -17891,7 +17921,8 @@
"logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
"Housekeeper-PerCommit-BundleRecipes",
"Housekeeper-PerCommit-IsolateGoDeps"
],
"dimensions": [
"pool:SkiaCT",