Skip to content

C
Chromium_Depot_tools
Commit 61499999 authored by tandrii@chromium.org's avatar tandrii@chromium.org
Browse files
Options

patch_root hacks cleanup. 

Removes deprecated patch_project_roots in bot_update,
and the TODOs used for migration.

Depends: https://codereview.chromium.org/1913863002

R=phajdan.jr@chromium.org,machenbach@chromium.org
BUG=605563

Review URL: https://codereview.chromium.org/1920933002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300153 0039d316-1c4b-4281-b951-d872f2087c98
parent e0b49314
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 84 deletions
recipe_modules/bot_update/api.py
View file @ 61499999
......@@ -57,7 +57,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
patch=True, update_presentation=True,
force=False, patch_root=None, no_shallow=False,
with_branch_heads=False, refs=None,
patch_project_roots=None, patch_oauth2=False,
patch_oauth2=False,
output_manifest=True, clobber=False,
root_solution_revision=None, rietveld=None, issue=None,
patchset=None, gerrit_no_reset=False, **kwargs):
......@@ -85,14 +85,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
# Construct our bot_update command. This basically be inclusive of
# everything required for bot_update to know:
root = patch_root
if (root == 'TODO(TANDRII): REMOVE THIS TRANSITION TO patch_projects' or
root is None):
# This special condition is here for initial rollout of this code,
# because it's hard to test this change without rolling into build
# repository.
# After the switch to new code is complete, this special TODOstring will
# be removed in favor of "root is None"
assert patch_project_roots is None
if root is None:
root = self.m.gclient.calculate_patch_root(
self.m.properties.get('patch_project'), cfg)
......
recipe_modules/bot_update/example.expected/tryjob_crbug605563.json deleted 100644 → 0
View file @ e0b49314
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.linux",
"--builder",
"linux_rel",
"--slave",
"totallyaslave-c4",
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_cr_revision\"}",
"--git-cache-dir",
"[GIT_CACHE]",
"--patch_url",
"http://src.chromium.org/foo/bar",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@HEAD"
],
"cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipe_modules/bot_update/example.py
View file @ 61499999
......@@ -34,9 +34,6 @@ def RunSteps(api):
root_solution_revision = api.properties.get('root_solution_revision')
suffix = api.properties.get('suffix')
gerrit_no_reset = True if api.properties.get('gerrit_no_reset') else False
# TODO(tandrii): remove this after transition. http://crbug.com/605563.
crbug605563 = ('TODO(TANDRII): REMOVE THIS TRANSITION TO patch_projects'
if api.properties.get('crbug605563') else None)
api.bot_update.ensure_checkout(force=force,
no_shallow=no_shallow,
patch=patch,
......@@ -46,8 +43,7 @@ def RunSteps(api):
clobber=clobber,
root_solution_revision=root_solution_revision,
suffix=suffix,
gerrit_no_reset=gerrit_no_reset,
patch_root=crbug605563)
gerrit_no_reset=gerrit_no_reset)
def GenTests(api):
......@@ -79,15 +75,6 @@ def GenTests(api):
patchset=654321,
patch_url='http://src.chromium.org/foo/bar'
)
yield api.test('tryjob_crbug605563') + api.properties(
mastername='tryserver.chromium.linux',
buildername='linux_rel',
slavename='totallyaslave-c4',
issue=12345,
patchset=654321,
patch_url='http://src.chromium.org/foo/bar',
crbug605563=True,
)
yield api.test('trychange') + api.properties(
mastername='tryserver.chromium.linux',
buildername='linux_rel',
......@@ -179,9 +166,7 @@ def GenTests(api):
)
yield api.test('tryjob_v8_head_by_default') + api.properties.tryserver(
patch_project='v8',
crbug605563=True,
)
yield api.test('tryjob_gerrit_angle') + api.properties.tryserver_gerrit(
full_project_name='angle/angle',
crbug605563=True,
)
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