Run recipe git_cl under Python 3

Makes the git_cl recipe module use vpython3 instead of vpython, as
the latter breaks when running on builders with the omit_python2
experiment.

Bug: 1366965
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: chromiumos
Recipe-Nontrivial-Roll: infra
Change-Id: I2306e97dbc7b75201024b5dcf1892787185d5f77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3968801
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
changes/01/3968801/4
Brian Sheedy 3 years ago committed by LUCI CQ
parent 8e2da91cbb
commit 9879712089

@ -16,7 +16,7 @@ class GitClApi(recipe_api.RecipeApi):
name = name + ' (%s)' % kwargs.pop('suffix') name = name + ' (%s)' % kwargs.pop('suffix')
my_loc = self.c.repo_location if self.c else None my_loc = self.c.repo_location if self.c else None
cmd = ['vpython', self.repo_resource('git_cl.py'), subcmd] + args cmd = ['vpython3', self.repo_resource('git_cl.py'), subcmd] + args
with self.m.context(cwd=self.m.context.cwd or my_loc): with self.m.context(cwd=self.m.context.cwd or my_loc):
return self.m.step(name, cmd, **kwargs) return self.m.step(name, cmd, **kwargs)

@ -1,7 +1,7 @@
[ [
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"upload", "upload",
"--message-file", "--message-file",
@ -11,7 +11,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"issue" "issue"
], ],
@ -19,7 +19,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"description", "description",
"-d", "-d",
@ -29,7 +29,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"description", "description",
"-n", "-n",
@ -48,7 +48,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"description", "description",
"-d" "-d"
@ -65,7 +65,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"description", "description",
"-n", "-n",
@ -77,7 +77,7 @@
}, },
{ {
"cmd": [ "cmd": [
"vpython", "vpython3",
"RECIPE_REPO[depot_tools]/git_cl.py", "RECIPE_REPO[depot_tools]/git_cl.py",
"description", "description",
"-d" "-d"

Loading…
Cancel
Save