Skip to content

C
Chromium_Depot_tools
Commit c6512213 authored by Edward Lemur's avatar Edward Lemur Committed by Commit Bot
Browse files
Options

depot_tools: Run recipe scripts using vpython. 

This is a reland of 88d7869d

Original change's description:
> Reland "depot_tools: Add httplib2 to .vpython"
>
> This is a reland of e1410883
>
> Use vpython to execute git_cl.py, gerrit_util.py and presubmit_support.py on recipes.
>
> Original change's description:
> > depot_tools: Add httplib2 to .vpython
> >
> > Check that things won't break before further changes are made.
> >
> > Bug: 1002153
> > Change-Id: I41866f26334bf9ec2732bc0f25007234a95130e4
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1854749
> > Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
> > Commit-Queue: Andrii Shyshkalov <tandrii@google.com>
> > Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
>
> Bug: 1002153
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: chromiumos
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: release_scripts
> Change-Id: Id94057eae8830dec197257df3ea35c0c4ff946b7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1856650
> Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

Bug: 1002153
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: skia
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: release_scripts
Change-Id: If071bfd2e4514a06deec2c0d4196b4953841b64f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1859895
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: 's avatarAnthony Polito <apolito@google.com>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@google.com>
parent e16ffffc
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 38 deletions
recipes/README.recipes.md
View file @ c6512213
......@@ -344,16 +344,16 @@ Module for interact with gerrit endpoints
Wrapper for easy calling of gerrit_utils steps.
&mdash; **def [abandon\_change](/recipes/recipe_modules/gerrit/api.py#159)(self, host, change, message=None, name=None, step_test_data=None):**
&mdash; **def [abandon\_change](/recipes/recipe_modules/gerrit/api.py#160)(self, host, change, message=None, name=None, step_test_data=None):**
&mdash; **def [create\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#31)(self, host, project, branch, commit, \*\*kwargs):**
&mdash; **def [create\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#32)(self, host, project, branch, commit, \*\*kwargs):**
Create a new branch from given project and commit
Returns:
the ref of the branch created
&mdash; **def [get\_change\_description](/recipes/recipe_modules/gerrit/api.py#72)(self, host, change, patchset):**
&mdash; **def [get\_change\_description](/recipes/recipe_modules/gerrit/api.py#73)(self, host, change, patchset):**
Get the description for a given CL and patchset.
......@@ -365,7 +365,7 @@ Args:
Returns:
The description corresponding to given CL and patchset.
&mdash; **def [get\_changes](/recipes/recipe_modules/gerrit/api.py#117)(self, host, query_params, start=None, limit=None, o_params=None, step_test_data=None, \*\*kwargs):**
&mdash; **def [get\_changes](/recipes/recipe_modules/gerrit/api.py#118)(self, host, query_params, start=None, limit=None, o_params=None, step_test_data=None, \*\*kwargs):**
Query changes for the given host.
......@@ -383,14 +383,14 @@ Returns:
A list of change dicts as documented here:
https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#list-changes
&mdash; **def [get\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#53)(self, host, project, branch, \*\*kwargs):**
&mdash; **def [get\_gerrit\_branch](/recipes/recipe_modules/gerrit/api.py#54)(self, host, project, branch, \*\*kwargs):**
Get a branch from given project and commit
Returns:
the revision of the branch
&mdash; **def [get\_revision\_info](/recipes/recipe_modules/gerrit/api.py#87)(self, host, change, patchset):**
&mdash; **def [get\_revision\_info](/recipes/recipe_modules/gerrit/api.py#88)(self, host, change, patchset):**
Returns the info for a given patchset of a given change.
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/gerrit/api.py
View file @ c6512213
......@@ -26,6 +26,7 @@ class GerritApi(recipe_api.RecipeApi):
self.repo_resource('gerrit_client.py'),
cmd,
infra_step=infra_step,
venv=True,
**kwargs)
def create_gerrit_branch(self, host, project, branch, commit, **kwargs):
......
recipes/recipe_modules/gerrit/examples/full.expected/basic.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"branch",
......@@ -32,7 +32,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"branchinfo",
......@@ -60,7 +60,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......@@ -110,7 +110,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......@@ -137,7 +137,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......@@ -185,7 +185,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"abandon",
......@@ -229,7 +229,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/git_cl/api.py
View file @ c6512213
......@@ -18,7 +18,7 @@ class GitClApi(recipe_api.RecipeApi):
with self.m.context(cwd=self.m.context.cwd or my_loc):
return self.m.python(
name, self.repo_resource('git_cl.py'), [subcmd] + args,
**kwargs)
venv=True, **kwargs)
def get_description(self, patch_url=None, codereview=None, **kwargs):
"""DEPRECATED. Consider using gerrit.get_change_description instead."""
......
recipes/recipe_modules/git_cl/examples/full.expected/basic.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"upload",
......@@ -12,7 +12,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"issue"
......@@ -21,7 +21,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
......@@ -33,7 +33,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
......@@ -54,7 +54,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
......@@ -72,7 +72,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
......@@ -85,7 +85,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
......
recipes/recipe_modules/presubmit/api.py
View file @ c6512213
......@@ -106,7 +106,7 @@ class PresubmitApi(recipe_api.RecipeApi):
'--upstream', upstream, # '' if not in bot_update mode.
])
venv = None
venv = True
# TODO(iannucci): verify that presubmit_support.py correctly finds and
# uses .vpython files, then remove this configuration.
if self._vpython_spec_path:
......
recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......@@ -41,7 +41,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
View file @ c6512213
[
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......@@ -41,7 +41,7 @@
},
{
"cmd": [
"python",
"vpython",
"-u",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment