Don't use CIPD_PKG_CPYTHON for P30.
Bug: skia:9602 Change-Id: Ia57b3f23502cff829879c3035c4ae37a4145a65b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262220 Auto-Submit: Joe Gregorio <jcgregorio@google.com> Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Ravi Mistry <rmistry@google.com>
This commit is contained in:
parent
6be45ec41f
commit
4679cb8557
@ -382,8 +382,6 @@ func (b *builder) kitchenTask(name, recipe, isolate, serviceAccount string, dime
|
||||
cipd := append([]*specs.CipdPackage{}, CIPD_PKGS_KITCHEN...)
|
||||
if strings.Contains(name, "Win") && !strings.Contains(name, "LenovoYogaC630") {
|
||||
cipd = append(cipd, CIPD_PKG_CPYTHON)
|
||||
} else if strings.Contains(name, "P30") {
|
||||
cipd = append(cipd, CIPD_PKG_CPYTHON)
|
||||
}
|
||||
properties := map[string]string{
|
||||
"buildername": name,
|
||||
|
@ -16514,11 +16514,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -16586,11 +16581,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28044,11 +28034,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28116,11 +28101,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28188,11 +28168,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28260,11 +28235,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28332,11 +28302,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -28404,11 +28369,6 @@
|
||||
"name": "infra/tools/luci/vpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
}
|
||||
],
|
||||
"command": [
|
||||
@ -50647,11 +50607,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -50719,11 +50674,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60274,11 +60224,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60346,11 +60291,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60418,11 +60358,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60490,11 +60425,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60562,11 +60492,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
@ -60634,11 +60559,6 @@
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "git_revision:af7d2ebd14e9bdad51ff1afacbf37f49815ad27b"
|
||||
},
|
||||
{
|
||||
"name": "infra/python/cpython/${platform}",
|
||||
"path": "cipd_bin_packages",
|
||||
"version": "version:2.7.15.chromium14"
|
||||
},
|
||||
{
|
||||
"name": "infra/gsutil",
|
||||
"path": "cipd_bin_packages",
|
||||
|
Loading…
Reference in New Issue
Block a user