Update vpython package, remove vpython-native
I suspect that vpython-native is doing weird things like injecting
vpython calls when we just try to run "python3".
Bug: b/322974193
Change-Id: I3590e69a4693fc734476734f6f993661c927df6d
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/811021
Auto-Submit: Eric Boren <borenet@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/cipd.ensure b/cipd.ensure
index f554c25..2e2ddb8 100644
--- a/cipd.ensure
+++ b/cipd.ensure
@@ -25,8 +25,7 @@
infra/tools/luci/isolated/${platform} git_revision:dc3a3dc4272aeef30698752d137ccd4f09526d69
infra/tools/luci/lucicfg/${platform} git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024
infra/tools/luci/swarming/${platform} git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024
-infra/tools/luci/vpython/${platform} git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024
-infra/tools/luci/vpython-native/${platform} git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024
+infra/tools/luci/vpython/${platform} git_revision:31b61178dc24ab61a24e3fbccf5debe58adbf8a5
skia/bots/gsutil version:6
skia/tools/goldctl/${platform} git_revision:9f6c2de25cce548433f4d0301bbde675a65a2f95
diff --git a/go/cipd/asset_versions_gen.go b/go/cipd/asset_versions_gen.go
index 760135a..aa33ebb 100644
--- a/go/cipd/asset_versions_gen.go
+++ b/go/cipd/asset_versions_gen.go
@@ -138,15 +138,10 @@
Name: "infra/tools/luci/swarming/${platform}",
Version: "git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024",
},
- "infra/tools/luci/vpython-native/${platform}": {
- Path: "cipd_bin_packages",
- Name: "infra/tools/luci/vpython-native/${platform}",
- Version: "git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024",
- },
"infra/tools/luci/vpython/${platform}": {
Path: "cipd_bin_packages",
Name: "infra/tools/luci/vpython/${platform}",
- Version: "git_revision:4f585e471d9b3ba86b2ac0ec0cdefaa8fdb67024",
+ Version: "git_revision:31b61178dc24ab61a24e3fbccf5debe58adbf8a5",
},
"skia/bots/bazel": {
Path: "bazel",
diff --git a/go/cipd/cipd.go b/go/cipd/cipd.go
index c44c9fd..9286639 100644
--- a/go/cipd/cipd.go
+++ b/go/cipd/cipd.go
@@ -101,37 +101,31 @@
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformLinuxAmd64)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformLinuxAmd64)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
PlatformLinuxArm64: {
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformLinuxArm64)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformLinuxArm64)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
PlatformLinuxArmv6l: {
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformLinuxArmv6l)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformLinuxArmv6l)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
PlatformMacAmd64: {
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformMacAmd64)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformMacAmd64)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
PlatformWindows386: {
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformWindows386)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformWindows386)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
PlatformWindowsAmd64: {
MustGetPackage(fmt.Sprintf(pkgCpythonTmpl, PlatformWindowsAmd64)),
MustGetPackage(fmt.Sprintf(pkgCpython3Tmpl, PlatformWindowsAmd64)),
MustGetPackage("infra/tools/luci/vpython/${platform}"),
- MustGetPackage("infra/tools/luci/vpython-native/${platform}"),
},
}
)
