aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/bots/gen_tasks.go
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-06-18 16:02:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-18 20:47:48 +0000
commitaa037523e569b72e28fbca0fd55eb9c4c64219d0 (patch)
tree9d988f8b3ff406ac51b371a21aeea809d37e4ff4 /infra/bots/gen_tasks.go
parent3ff2b200573354c83bbb52ff2f5f760eb481596e (diff)
[infra] Include cpython CIPD package on Windows
No-Tree-Checks: true Bug: skia: Change-Id: I08854d88e33d00e4bb56eb6eb346592618bd2693 Reviewed-on: https://skia-review.googlesource.com/135579 Commit-Queue: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Auto-Submit: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/gen_tasks.go')
-rw-r--r--infra/bots/gen_tasks.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index b758085d38..01098e2605 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -149,6 +149,14 @@ var (
},
}
+ CIPD_PKGS_CPYTHON = []*specs.CipdPackage{
+ &specs.CipdPackage{
+ Name: "infra/python/cpython/${platform}",
+ Path: "cipd_bin_packages",
+ Version: "version:2.7.14.chromium14",
+ },
+ }
+
CIPD_PKGS_KITCHEN = append([]*specs.CipdPackage{
&specs.CipdPackage{
Name: "infra/tools/luci/kitchen/${platform}",
@@ -235,6 +243,9 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri
serviceAccount = alternateServiceAccount(serviceAccount)
}
cipd := append([]*specs.CipdPackage{}, CIPD_PKGS_KITCHEN...)
+ if strings.Contains(name, "Win") {
+ cipd = append(cipd, CIPD_PKGS_CPYTHON...)
+ }
properties := map[string]string{
"buildbucket_build_id": specs.PLACEHOLDER_BUILDBUCKET_BUILD_ID,
"buildername": name,