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

Add extracting GM comments to the housekeeper bot.

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2237033002

Review-Url: https://codereview.chromium.org/2237033002
This commit is contained in:
jcgregorio 2016-08-12 08:50:29 -07:00 committed by Commit bot
parent fbfa258027
commit 106a9ff313
5 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -55,6 +55,38 @@
},
"name": "generate and upload binary size data"
},
{
"cmd": [
"[SLAVE_BUILD]/go/go/bin/go",
"get",
"go.skia.org/infra/comments/go/extract_comments"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[SLAVE_BUILD]/tmp/golib",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "compile extract_comments"
},
{
"cmd": [
"[SLAVE_BUILD]/tmp/golib/bin/extract_comments",
"--dir",
"gm",
"--dest",
"gs://skia-doc/gm/comments.json"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[SLAVE_BUILD]/tmp/golib",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "run extract_comments"
},
{
"name": "$result",
"recipe_result": null,

32
infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit.json
View File

@ -67,6 +67,38 @@
},
"name": "generate and upload binary size data"
},
{
"cmd": [
"[SLAVE_BUILD]/go/go/bin/go",
"get",
"go.skia.org/infra/comments/go/extract_comments"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[SLAVE_BUILD]/tmp/golib",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "compile extract_comments"
},
{
"cmd": [
"[SLAVE_BUILD]/tmp/golib/bin/extract_comments",
"--dir",
"gm",
"--dest",
"gs://skia-doc/gm/comments.json"
],
"cwd": "[SLAVE_BUILD]/skia",
"env": {
"BUILDTYPE": "Release",
"CHROME_HEADLESS": "1",
"GOPATH": "[SLAVE_BUILD]/tmp/golib",
"SKIA_OUT": "[SLAVE_BUILD]/out"
},
"name": "run extract_comments"
},
{
"name": "$result",
"recipe_result": null,

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

@ -5,7 +5,6 @@
# Recipe for the Skia PerCommit Housekeeper.
DEPS = [
'core',
'recipe_engine/path',
@ -68,6 +67,30 @@ def RunSteps(api):
cwd=cwd,
abort_on_failure=False)
env = {}
env['GOPATH'] = api.vars.tmp_dir.join('golib')
extractexe = env['GOPATH'].join('bin', 'extract_comments')
goexe = api.vars.slave_dir.join('go', 'go', 'bin', 'go')
# Compile extract_comments.
api.run(
api.step,
'compile extract_comments',
cmd=[goexe, 'get', 'go.skia.org/infra/comments/go/extract_comments'],
cwd=cwd,
env=env,
abort_on_failure=True)
# Run extract_comments on the gm directory.
api.run(
api.step,
'run extract_comments',
cmd=[extractexe, '--dir', 'gm', '--dest', 'gs://skia-doc/gm/comments.json'],
cwd=cwd,
env=env,
abort_on_failure=True)
def GenTests(api):
for mastername, slaves in TEST_BUILDERS.iteritems():
for slavename, builders_by_slave in slaves.iteritems():

12
infra/bots/recipes/swarm_trigger.expected/Housekeeper-PerCommit.json
View File

@ -456,6 +456,16 @@
"@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@"
]
},
{
"cmd": [
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"[SLAVE_BUILD]/skia/infra/bots/assets/go/VERSION",
"/path/to/tmp/"
],
"name": "read go VERSION"
},
{
"cmd": [
"python",
@ -601,6 +611,8 @@
"slavename:skiabot-linux-swarm-000",
"--tag",
"stepname:housekeeper_skia on Ubuntu",
"--cipd-package",
"go:skia/bots/go:version:0",
"def456",
"--",
"--workdir",

4
infra/bots/recipes/swarm_trigger.py
View File

@ -271,7 +271,9 @@ def housekeeper_swarm(api, builder_cfg, got_revision, infrabots_dir,
infrabots_dir,
idempotent=False,
store_output=False,
extra_isolate_hashes=extra_isolate_hashes)
extra_isolate_hashes=extra_isolate_hashes,
cipd_packages=[cipd_pkg(api, infrabots_dir, 'go')],
)
return api.swarming.collect_swarming_task(task)