aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Pass target branch from tryserver in bot_update module"

Browse Source 
This reverts commit 245337d62e.

Reason for revert: broke presubmit builders running run_presubmit.py recipe.

Original change's description:
> Pass target branch from tryserver in bot_update module
> 
> Change-Id: I9d250c87355833ddc6c7d8f41e9e43575713925f
> 
> Recipe-Nontrivial-Roll: build_limited_scripts_slave
> Recipe-Nontrivial-Roll: skia
> Recipe-Nontrivial-Roll: infra
> Recipe-Nontrivial-Roll: build
> Recipe-Nontrivial-Roll: release_scripts
> Change-Id: I9d250c87355833ddc6c7d8f41e9e43575713925f
> Reviewed-on: https://chromium-review.googlesource.com/c/1420977
> Commit-Queue: William Hesse <whesse@google.com>
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

TBR=whesse@google.com,ehmaldonado@chromium.org

Change-Id: I89513b5bb053788291e79340c1685189adc794ec
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/1484655
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
changes/55/1484655/2
Andrii Shyshkalov 7 years ago committed by Commit Bot
parent 54cc6049f4
commit 5585c87a78
14 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
recipes/README.recipes.md
Unescape Escape View File

@ -52,7 +52,7 @@ Recipe module to ensure a checkout is consistent on a bot.
Wrapper for easy calling of bot_update.
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#413)(self, bot_update_step):**
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#411)(self, bot_update_step):**
Deapplies a patch, taking care of DEPS and solution revisions properly.
@ -68,7 +68,7 @@ Args:
manifest_name: The name of the manifest to upload to LogDog. This must
be unique for the whole build.
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#390)(self, project_name, gclient_config=None):**
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#388)(self, project_name, gclient_config=None):**
Returns all property names used for storing the checked-out revision of
a given project.

6
recipes/recipe_modules/bot_update/api.py
Unescape Escape View File

@ -128,10 +128,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
if patch:
repo_url = self.m.tryserver.gerrit_change_repo_url
fetch_ref = self.m.tryserver.gerrit_change_fetch_ref
target_ref = self.m.tryserver.gerrit_change_target_ref
if repo_url and fetch_ref and target_ref:
flags.append(
['--patch_ref', '%s@%s:%s' % (repo_url, target_ref, fetch_ref)])
if repo_url and fetch_ref:
flags.append(['--patch_ref', '%s@%s' % (repo_url, fetch_ref)])
if patch_refs:
flags.extend(
['--patch_ref', patch_ref]

2
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--disable-syntax-validation"

2
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/angle/angle@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/angle/angle@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--disable-syntax-validation"

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--disable-syntax-validation"

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--disable-syntax-validation"

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/angle/angle@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/angle/angle@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/branch-heads/67:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@refs/branch-heads/67",
"--refs",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/heads/experimental/feature:refs/changes/56/123456/7",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7",
"--revision",
"src@experimental/feature",
"--disable-syntax-validation"

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/heads/experimental/feature:refs/changes/56/123456/7",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://webrtc.googlesource.com/src@refs/heads/master:refs/changes/56/123456/7",
"https://webrtc.googlesource.com/src@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

2
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
Unescape Escape View File

@ -56,7 +56,7 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/heads/master:refs/changes/56/123456/7",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7",
"--revision",
"src@HEAD",
"--revision",

Write Preview
Loading…
Cancel
Save