aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-06-21 09:02:30 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-21 16:57:52 +0000
commit639244261a27ee5a7e32b0336ac7322741a58afc (patch)
tree8fa71642b4d2f75fecd600294c7ac8850559a405 /infra
parent5361935cd07f2a5d52386eca59596493914eb15a (diff)
[recipes] Housekeeper-PerCommit-BundleRecipes needs vpython
Bug: skia: Change-Id: I6808e6337477fa3b5ea2833e1ebc739bf65fc062 Reviewed-on: https://skia-review.googlesource.com/136523 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/gen_tasks.go4
-rw-r--r--infra/bots/tasks.json5
2 files changed, 8 insertions, 1 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index bebc1c54f7..14dcdbe55c 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -629,8 +629,10 @@ func relpath(f string) string {
// bundleRecipes generates the task to bundle and isolate the recipes.
func bundleRecipes(b *specs.TasksCfgBuilder) string {
+ pkgs := append([]*specs.CipdPackage{}, CIPD_PKGS_GIT...)
+ pkgs = append(pkgs, CIPD_PKGS_PYTHON...)
b.MustAddTask(BUNDLE_RECIPES_NAME, &specs.TaskSpec{
- CipdPackages: CIPD_PKGS_GIT,
+ CipdPackages: pkgs,
Command: []string{
"/bin/bash", "skia/infra/bots/bundle_recipes.sh", specs.PLACEHOLDER_ISOLATED_OUTDIR,
},
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 28a250f60b..745eec7119 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -17581,6 +17581,11 @@
"name": "infra/tools/luci/git-credential-luci/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c"
+ },
+ {
+ "name": "infra/tools/luci/vpython/${platform}",
+ "path": "cipd_bin_packages",
+ "version": "git_revision:ad60019cb66a75b59991d43b95a43f68e3fff81b"
}
],
"command": [