[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>
This commit is contained in:
parent
3ff2b20057
commit
aa037523e5
@ -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{
|
CIPD_PKGS_KITCHEN = append([]*specs.CipdPackage{
|
||||||
&specs.CipdPackage{
|
&specs.CipdPackage{
|
||||||
Name: "infra/tools/luci/kitchen/${platform}",
|
Name: "infra/tools/luci/kitchen/${platform}",
|
||||||
@ -235,6 +243,9 @@ func kitchenTask(name, recipe, isolate, serviceAccount string, dimensions []stri
|
|||||||
serviceAccount = alternateServiceAccount(serviceAccount)
|
serviceAccount = alternateServiceAccount(serviceAccount)
|
||||||
}
|
}
|
||||||
cipd := append([]*specs.CipdPackage{}, CIPD_PKGS_KITCHEN...)
|
cipd := append([]*specs.CipdPackage{}, CIPD_PKGS_KITCHEN...)
|
||||||
|
if strings.Contains(name, "Win") {
|
||||||
|
cipd = append(cipd, CIPD_PKGS_CPYTHON...)
|
||||||
|
}
|
||||||
properties := map[string]string{
|
properties := map[string]string{
|
||||||
"buildbucket_build_id": specs.PLACEHOLDER_BUILDBUCKET_BUILD_ID,
|
"buildbucket_build_id": specs.PLACEHOLDER_BUILDBUCKET_BUILD_ID,
|
||||||
"buildername": name,
|
"buildername": name,
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user