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>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index b920f3d..213e63e 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -382,8 +382,6 @@
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,
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a399aaf..4da1860 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -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": [
@@ -50648,11 +50608,6 @@
"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",
"version": "version:4.46"
@@ -50720,11 +50675,6 @@
"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",
"version": "version:4.46"
@@ -60275,11 +60225,6 @@
"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",
"version": "version:4.46"
@@ -60347,11 +60292,6 @@
"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",
"version": "version:4.46"
@@ -60419,11 +60359,6 @@
"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",
"version": "version:4.46"
@@ -60491,11 +60426,6 @@
"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",
"version": "version:4.46"
@@ -60563,11 +60493,6 @@
"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",
"version": "version:4.46"
@@ -60635,11 +60560,6 @@
"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",
"version": "version:4.46"