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

[infra] Make the presubmit bot use recipes from CIPD

Browse Source 
Bug: skia:
Change-Id: I28f118521fc4f1f27c2601d70e855fb7f5623ba2
Reviewed-on: https://skia-review.googlesource.com/c/194861
Reviewed-by: Ravi Mistry <rmistry@google.com>
Reviewed-by: Robbie Iannucci <iannucci@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
This commit is contained in:
Eric Boren 2019-02-25 10:37:31 -05:00 committed by Skia Commit-Bot
parent bd64f18947
commit b8960d0535
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
infra/bots/gen_tasks.go
View File

@ -1250,22 +1250,12 @@ func presubmit(b *specs.TasksCfgBuilder, name string) string {
// Use MACHINE_TYPE_LARGE because it seems to save time versus MEDIUM and we want presubmit to be
// fast.
task := kitchenTask(name, "run_presubmit", "empty.isolate", SERVICE_ACCOUNT_COMPILE, linuxGceDimensions(MACHINE_TYPE_LARGE), extraProps, OUTPUT_NONE)
replaceArg := func(key, value string) {
found := false
for idx, arg := range task.Command {
if arg == key {
task.Command[idx+1] = value
found = true
}
}
if !found {
task.Command = append(task.Command, key, value)
}
}
replaceArg("-repository", "https://chromium.googlesource.com/chromium/tools/build")
replaceArg("-revision", "HEAD")
usesGit(task, name)
task.CipdPackages = append(task.CipdPackages, &specs.CipdPackage{
Name: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
Path: "recipe_bundle",
Version: "refs/heads/master",
})
task.Dependencies = []string{} // No bundled recipes for this one.
b.MustAddTask(name, task)
return name

11
infra/bots/tasks.json
View File

@ -20479,6 +20479,11 @@
"name": "infra/tools/luci/git-credential-luci/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:2c805f1c716f6c5ad2126b27ec88b8585a09481e"
},
{
"name": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
"path": "recipe_bundle",
"version": "refs/heads/master"
}
],
"command": [
@ -20521,11 +20526,7 @@
"-properties",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Housekeeper-OnDemand-Presubmit\",\"category\":\"cq\",\"patch_gerrit_url\":\"https://skia-review.googlesource.com\",\"patch_issue\":\"<(ISSUE)\",\"patch_project\":\"skia\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"reason\":\"CQ\",\"repo_name\":\"skia\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\"}",
"-logdog-annotation-url",
"logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations",
"-repository",
"https://chromium.googlesource.com/chromium/tools/build",
"-revision",
"HEAD"
"logdog://logs.chromium.org/skia/<(TASK_ID)/+/annotations"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",