Skip to content

C
Chromium_Depot_tools
Commit 245337d6 authored by William Hesse's avatar William Hesse Committed by Commit Bot
Browse files
Options

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: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
parent e8310043
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 16 deletions
recipes/README.recipes.md
View file @ 245337d6
...@@ -52,7 +52,7 @@ Recipe module to ensure a checkout is consistent on a bot. ...@@ -52,7 +52,7 @@ Recipe module to ensure a checkout is consistent on a bot.
Wrapper for easy calling of bot_update. Wrapper for easy calling of bot_update.
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#411)(self, bot_update_step):** &mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#413)(self, bot_update_step):**
Deapplies a patch, taking care of DEPS and solution revisions properly. Deapplies a patch, taking care of DEPS and solution revisions properly.
...@@ -68,7 +68,7 @@ Args: ...@@ -68,7 +68,7 @@ Args:
manifest_name: The name of the manifest to upload to LogDog. This must manifest_name: The name of the manifest to upload to LogDog. This must
be unique for the whole build. be unique for the whole build.
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#388)(self, project_name, gclient_config=None):** &mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#390)(self, project_name, gclient_config=None):**
Returns all property names used for storing the checked-out revision of Returns all property names used for storing the checked-out revision of
a given project. a given project.
......
recipes/recipe_modules/bot_update/api.py
View file @ 245337d6
...@@ -128,8 +128,10 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -128,8 +128,10 @@ class BotUpdateApi(recipe_api.RecipeApi):
if patch: if patch:
repo_url = self.m.tryserver.gerrit_change_repo_url repo_url = self.m.tryserver.gerrit_change_repo_url
fetch_ref = self.m.tryserver.gerrit_change_fetch_ref fetch_ref = self.m.tryserver.gerrit_change_fetch_ref
if repo_url and fetch_ref: target_ref = self.m.tryserver.gerrit_change_target_ref
flags.append(['--patch_ref', '%s@%s' % (repo_url, fetch_ref)]) if repo_url and fetch_ref and target_ref:
flags.append(
['--patch_ref', '%s@%s:%s' % (repo_url, target_ref, fetch_ref)])
if patch_refs: if patch_refs:
flags.extend( flags.extend(
['--patch_ref', patch_ref] ['--patch_ref', patch_ref]
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
......
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/angle/angle@refs/changes/56/123456/7", "https://chromium.googlesource.com/angle/angle@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/angle/angle@refs/changes/56/123456/7", "https://chromium.googlesource.com/angle/angle@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/branch-heads/67:refs/changes/56/123456/7",
"--revision", "--revision",
"src@refs/branch-heads/67", "src@refs/branch-heads/67",
"--refs", "--refs",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/chromium/src@refs/changes/56/123456/7", "https://chromium.googlesource.com/chromium/src@refs/heads/experimental/feature:refs/changes/56/123456/7",
"--revision", "--revision",
"src@experimental/feature", "src@experimental/feature",
"--disable-syntax-validation" "--disable-syntax-validation"
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7", "https://chromium.googlesource.com/v8/v8@refs/heads/experimental/feature:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://webrtc.googlesource.com/src@refs/changes/56/123456/7", "https://webrtc.googlesource.com/src@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7", "https://chromium.googlesource.com/v8/v8@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ 245337d6
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--patch_ref", "--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/changes/56/123456/7", "https://chromium.googlesource.com/v8/v8@refs/heads/master:refs/changes/56/123456/7",
"--revision", "--revision",
"src@HEAD", "src@HEAD",
"--revision", "--revision",
......
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