From 81b4d420bf59b7839c68e3dd8c7e41c0a1e420a3 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Fri, 21 Apr 2017 09:11:05 +0200 Subject: [PATCH] Reverse got_revision_mapping in bot_update This is the first step in reversing got_revision_mapping. This CL: - Adds a new configuration got_revision_reverse_mapping. - Ensures only the old or the new configuration is used. - Transforms the old to the new configuration within bot_update. In follow up CLs we will migrate all clients to the new mapping, then delete the old and rename the new again. Bug: 713356 Change-Id: Icdbd6a3748c6e5399b9c4867a3d8292973325160 Reviewed-on: https://chromium-review.googlesource.com/483479 Commit-Queue: Michael Achenbach Reviewed-by: Andrii Shyshkalov Reviewed-by: Robbie Iannucci --- recipes/recipe_modules/bot_update/api.py | 50 ++++++-- .../bot_update/example.expected/basic.json | 8 +- .../basic_output_manifest.json | 14 ++- .../basic_with_branch_heads.json | 14 ++- .../bot_update/example.expected/buildbot.json | 8 +- .../bot_update/example.expected/clobber.json | 14 ++- .../deprecated_got_revision_mapping.json | 112 ++++++++++++++++++ .../gerrit_no_rebase_patch_ref.json | 14 ++- .../example.expected/gerrit_no_reset.json | 14 ++- .../example.expected/no_shallow.json | 14 ++- .../reset_root_solution_revision.json | 14 ++- .../example.expected/trychange.json | 14 ++- .../trychange_oauth2_buildbot.json | 14 ++- .../trychange_oauth2_json.json | 14 ++- .../trychange_oauth2_json_win.json | 14 ++- .../bot_update/example.expected/tryjob.json | 14 ++- .../example.expected/tryjob_fail.json | 8 +- .../example.expected/tryjob_fail_patch.json | 14 ++- .../tryjob_fail_patch_download.json | 14 ++- .../example.expected/tryjob_gerrit_angle.json | 14 ++- .../tryjob_gerrit_angle_deprecated.json | 14 ++- .../example.expected/tryjob_v8.json | 14 ++- .../tryjob_v8_head_by_default.json | 14 ++- .../example.expected/with_tags.json | 14 ++- recipes/recipe_modules/bot_update/example.py | 12 +- .../bot_update/resources/bot_update.py | 20 ++-- recipes/recipe_modules/bot_update/test_api.py | 6 +- recipes/recipe_modules/gclient/config.py | 5 + 28 files changed, 392 insertions(+), 103 deletions(-) create mode 100644 recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 7e1e1d6db..3ee464c9c 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -171,13 +171,23 @@ class BotUpdateApi(recipe_api.RecipeApi): self.m.gclient.set_patch_project_revision( self.m.properties.get('patch_project'), cfg) + # TODO(machenbach): Deprecate rev_map. We'll do a three-way dance. + # When all users of got_revision_mapping use got_revision_reverse_mapping + # we can remove the old one. Make sure nobody uses both. rev_map = cfg.got_revision_mapping.as_jsonish() + reverse_rev_map = cfg.got_revision_reverse_mapping.as_jsonish() + assert not rev_map or not reverse_rev_map + if rev_map: + reverse_rev_map = {v: k for k, v in rev_map.iteritems()} + + # Make sure we never have duplicate values in the old map. + assert len(rev_map) == len(reverse_rev_map) flags = [ - # What do we want to check out (spec/root/rev/rev_map). + # What do we want to check out (spec/root/rev/reverse_rev_map). ['--spec', self.m.gclient.config_to_pythonish(cfg)], ['--patch_root', root], - ['--revision_mapping_file', self.m.json.input(rev_map)], + ['--revision_mapping_file', self.m.json.input(reverse_rev_map)], ['--git-cache-dir', cfg.cache_dir], # How to find the patch, if any (issue/patchset). @@ -246,7 +256,7 @@ class BotUpdateApi(recipe_api.RecipeApi): # Inject Json output for testing. first_sln = cfg.solutions[0].name step_test_data = lambda: self.test_api.output_json( - root, first_sln, rev_map, self._fail_patch, + root, first_sln, reverse_rev_map, self._fail_patch, output_manifest=output_manifest, fixed_revisions=fixed_revisions) # Add suffixes to the step name, if specified. @@ -349,10 +359,36 @@ class BotUpdateApi(recipe_api.RecipeApi): When deapplying the patch, v8 will be synced to v8_before. """ for name in bot_update_json.get('fixed_revisions', {}): - rev_property = self.m.gclient.c.got_revision_mapping.get(name) - if rev_property and bot_update_json['properties'].get(rev_property): + rev_properties = self.get_project_revision_properties(name) + if (rev_properties and + bot_update_json['properties'].get(rev_properties[0])): self.m.gclient.c.revisions[name] = str( - bot_update_json['properties'][rev_property]) + bot_update_json['properties'][rev_properties[0]]) + + # TODO(machenbach): Replace usages of this method eventually by direct calls + # to the manifest output. + def get_project_revision_properties(self, project_name): + """Returns all property names used for storing the checked-out revision of + a given project. + + Args: + project_name (str): The name of a checked-out project as deps path, e.g. + src or src/v8. + + Returns (list of str): All properties that'll hold the checked-out revision + of the given project. An empty list if no such properties exist. + """ + cfg = self.m.gclient.c + if cfg.got_revision_mapping: + prop = cfg.got_revision_mapping.get(project_name) + return [prop] if prop else [] + # Sort for determinism. We might have several properties for the same + # project, e.g. got_revision and got_webrtc_revision. + return sorted( + prop + for prop, project in cfg.got_revision_reverse_mapping.iteritems() + if project == project_name + ) def deapply_patch(self, bot_update_step): """Deapplies a patch, taking care of DEPS and solution revisions properly. @@ -364,7 +400,7 @@ class BotUpdateApi(recipe_api.RecipeApi): # stored in the 'got_revision' as some gclient configs change the default # mapping for their own purposes. first_solution_name = self.m.gclient.c.solutions[0].name - rev_property = self.m.gclient.c.got_revision_mapping[first_solution_name] + rev_property = self.get_project_revision_properties(first_solution_name)[0] self.m.gclient.c.revisions[first_solution_name] = str( bot_update_json['properties'][rev_property]) self._resolve_fixed_revisions(bot_update_json) diff --git a/recipes/recipe_modules/bot_update/example.expected/basic.json b/recipes/recipe_modules/bot_update/example.expected/basic.json index 9c076eeaf..dd7241cb2 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -35,13 +35,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json index 7b7d8908f..9633a6ad5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -42,13 +42,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -62,7 +66,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -95,7 +99,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json index 2a795c8f6..5171a276d 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/buildbot.json b/recipes/recipe_modules/bot_update/example.expected/buildbot.json index 9c076eeaf..dd7241cb2 100644 --- a/recipes/recipe_modules/bot_update/example.expected/buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/buildbot.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -35,13 +35,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, diff --git a/recipes/recipe_modules/bot_update/example.expected/clobber.json b/recipes/recipe_modules/bot_update/example.expected/clobber.json index 7db74937e..c90700f14 100644 --- a/recipes/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/example.expected/clobber.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json new file mode 100644 index 000000000..8863a53ed --- /dev/null +++ b/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json @@ -0,0 +1,112 @@ +[ + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "--patch_root", + "src", + "--revision_mapping_file", + "{\"got_cr_revision\": \"src\"}", + "--git-cache-dir", + "[GIT_CACHE]", + "--issue", + "12345", + "--patchset", + "654321", + "--rietveld_server", + "https://rietveld.example.com/", + "--output_json", + "/path/to/tmp/json", + "--revision", + "src@HEAD" + ], + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "infra_step": true, + "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}\"@@@" + ] + }, + { + "cmd": [ + "python", + "-u", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", + "--spec", + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", + "--patch_root", + "src", + "--revision_mapping_file", + "{\"got_cr_revision\": \"src\"}", + "--git-cache-dir", + "[GIT_CACHE]", + "--rietveld_server", + "https://rietveld.example.com/", + "--output_json", + "/path/to/tmp/json", + "--revision", + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" + ], + "env": { + "GIT_HTTP_LOW_SPEED_LIMIT": "1000", + "GIT_HTTP_LOW_SPEED_TIME": "300", + "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" + }, + "infra_step": true, + "name": "bot_update (without patch)", + "~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\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@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@@@" + ] + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +] \ No newline at end of file diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json index 5e4770e43..d98e314b4 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json index a8f2ec7d5..9f0915602 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json index 8fb98b0f9..0c26e5240 100644 --- a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json index b4e1666fc..cfc36ea87 100644 --- a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -35,13 +35,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -55,7 +59,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -88,7 +92,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange.json b/recipes/recipe_modules/bot_update/example.expected/trychange.json index e620c5aff..78c6930b5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -37,13 +37,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -57,7 +61,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -90,7 +94,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json index 727cbdbde..89aa34b84 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--apply_issue_email_file", @@ -39,13 +39,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -59,7 +63,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -92,7 +96,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json index c7f49aa33..dda3ee6d4 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--apply_issue_oauth2_file", @@ -37,13 +37,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -57,7 +61,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -90,7 +94,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json index 7a2efa8e0..9a997af2e 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--apply_issue_oauth2_file", @@ -37,13 +37,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -57,7 +61,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -90,7 +94,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob.json b/recipes/recipe_modules/bot_update/example.expected/tryjob.json index 6281b6df4..80f4d6e07 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -41,13 +41,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -61,7 +65,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--rietveld_server", @@ -96,7 +100,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json index 2e59ae9c1..7c5ccadbd 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -42,7 +42,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", @@ -50,6 +52,8 @@ "@@@STEP_LOG_END@json.output@@@", "@@@STEP_EXCEPTION@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json index 0ce9242d5..218fbf326 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -43,13 +43,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@failure_type@\"PATCH_FAILURE\"@@@" ] @@ -90,7 +94,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--rietveld_server", @@ -127,7 +131,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 6e7dcfc4e..0526c85f3 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -43,13 +43,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -90,7 +94,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--rietveld_server", @@ -127,7 +131,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json index f13a7e6b5..81510290f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json @@ -9,7 +9,7 @@ "--patch_root", "src/third_party/angle", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--gerrit_repo", @@ -42,13 +42,17 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -62,7 +66,7 @@ "--patch_root", "src/third_party/angle", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -98,7 +102,9 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json index f13a7e6b5..81510290f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json @@ -9,7 +9,7 @@ "--patch_root", "src/third_party/angle", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--gerrit_repo", @@ -42,13 +42,17 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -62,7 +66,7 @@ "--patch_root", "src/third_party/angle", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -98,7 +102,9 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json index 9ec8e62e5..3eaec77cc 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -9,7 +9,7 @@ "--patch_root", "src/v8", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -44,13 +44,17 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -64,7 +68,7 @@ "--patch_root", "src/v8", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--rietveld_server", @@ -102,7 +106,9 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json index 3953ba514..8dddb5619 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json @@ -9,7 +9,7 @@ "--patch_root", "src/v8", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--issue", @@ -44,13 +44,17 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -64,7 +68,7 @@ "--patch_root", "src/v8", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--rietveld_server", @@ -102,7 +106,9 @@ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/with_tags.json b/recipes/recipe_modules/bot_update/example.expected/with_tags.json index d7a2c12a9..dd017c1ba 100644 --- a/recipes/recipe_modules/bot_update/example.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/example.expected/with_tags.json @@ -9,7 +9,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -36,13 +36,17 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@", "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@" ] }, @@ -56,7 +60,7 @@ "--patch_root", "src", "--revision_mapping_file", - "{\"src\": \"got_cr_revision\"}", + "{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}", "--git-cache-dir", "[GIT_CACHE]", "--output_json", @@ -89,7 +93,9 @@ "@@@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@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"got_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\"@@@", diff --git a/recipes/recipe_modules/bot_update/example.py b/recipes/recipe_modules/bot_update/example.py index 219f7cc1b..4ac935f02 100644 --- a/recipes/recipe_modules/bot_update/example.py +++ b/recipes/recipe_modules/bot_update/example.py @@ -20,7 +20,11 @@ def RunSteps(api): soln.revision = api.properties.get('revision') api.gclient.c = src_cfg api.gclient.c.revisions.update(api.properties.get('revisions', {})) - api.gclient.c.got_revision_mapping['src'] = 'got_cr_revision' + if api.properties.get('deprecated_got_revision_mapping'): + api.gclient.c.got_revision_mapping['src'] = 'got_cr_revision' + else: + api.gclient.c.got_revision_reverse_mapping['got_cr_revision'] = 'src' + api.gclient.c.got_revision_reverse_mapping['got_revision'] = 'src' api.gclient.c.patch_projects['v8'] = ('src/v8', 'HEAD') api.gclient.c.patch_projects['angle/angle'] = ('src/third_party/angle', 'HEAD') @@ -85,6 +89,12 @@ def GenTests(api): patchset=654321, rietveld='https://rietveld.example.com/', ) + yield api.test('deprecated_got_revision_mapping') + api.properties( + deprecated_got_revision_mapping=True, + issue=12345, + patchset=654321, + rietveld='https://rietveld.example.com/', + ) yield api.test('trychange') + api.properties( refs=['+refs/change/1/2/333'], ) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 8d24ecc32..e420e2e22 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -60,13 +60,13 @@ REVINFO_RE = re.compile(r'^([^:]+):\s+([^@]+)@(.+)$') # Copied from scripts/recipes/chromium.py. GOT_REVISION_MAPPINGS = { CHROMIUM_SRC_URL: { - 'src/': 'got_revision', - 'src/native_client/': 'got_nacl_revision', - 'src/tools/swarm_client/': 'got_swarm_client_revision', - 'src/tools/swarming_client/': 'got_swarming_client_revision', - 'src/third_party/WebKit/': 'got_webkit_revision', - 'src/third_party/webrtc/': 'got_webrtc_revision', - 'src/v8/': 'got_v8_revision', + 'got_revision': 'src/', + 'got_nacl_revision': 'src/native_client/', + 'got_swarm_client_revision': 'src/tools/swarm_client/', + 'got_swarming_client_revision': 'src/tools/swarming_client/', + 'got_v8_revision': 'src/v8/', + 'got_webkit_revision': 'src/third_party/WebKit/', + 'got_webrtc_revision': 'src/third_party/webrtc/', } } @@ -721,7 +721,7 @@ def parse_got_revision(gclient_output, got_revision_mapping): '%s/' % path.rstrip('/') : solution_output for path, solution_output in gclient_output['solutions'].iteritems() } - for dir_name, property_name in got_revision_mapping.iteritems(): + for property_name, dir_name in got_revision_mapping.iteritems(): # Make sure dir_name always ends with a single slash. dir_name = '%s/' % dir_name.rstrip('/') if dir_name not in solutions_output: @@ -913,7 +913,7 @@ def parse_args(): parse.add_option('--specs', help='Gcilent spec.') parse.add_option('--revision_mapping_file', help=('Path to a json file of the form ' - '{"path/to/repo/": "property_name"}')) + '{"property_name": "path/to/repo/"}')) parse.add_option('--revision', action='append', default=[], help='Revision to check out. Can be any form of git ref. ' 'Can prepend root@ to specify which repository, ' @@ -1076,7 +1076,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow): # revision_mapping were specified on the command line then # default to setting 'got_revision' based on the first solution. if not revision_mapping: - revision_mapping[first_sln] = 'got_revision' + revision_mapping['got_revision'] = first_sln got_revisions = parse_got_revision(gclient_output, revision_mapping) diff --git a/recipes/recipe_modules/bot_update/test_api.py b/recipes/recipe_modules/bot_update/test_api.py index 0c19ca1b6..0547a911a 100644 --- a/recipes/recipe_modules/bot_update/test_api.py +++ b/recipes/recipe_modules/bot_update/test_api.py @@ -20,12 +20,12 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi): properties = { property_name: self.gen_revision(project_name) - for project_name, property_name in revision_mapping.iteritems() + for property_name, project_name in revision_mapping.iteritems() } properties.update({ '%s_cp' % property_name: ('refs/heads/master@{#%s}' % self.gen_commit_position(project_name)) - for project_name, property_name in revision_mapping.iteritems() + for property_name, project_name in revision_mapping.iteritems() }) output.update({ @@ -42,7 +42,7 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi): 'repository': 'https://fake.org/%s.git' % project_name, 'revision': self.gen_revision(project_name), } - for project_name in revision_mapping + for project_name in set(revision_mapping.values()) } }) diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py index 786674a86..318c73d21 100644 --- a/recipes/recipe_modules/gclient/config.py +++ b/recipes/recipe_modules/gclient/config.py @@ -42,8 +42,13 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None, src_root = Single(basestring, required=False, hidden=True), # Maps 'solution' -> build_property + # TODO(machenbach): Deprecate this in favor of the one below. + # http://crbug.com/713356 got_revision_mapping = Dict(hidden=True), + # Maps build_property -> 'solution' + got_revision_reverse_mapping = Dict(hidden=True), + # Addition revisions we want to pass in. For now theres a duplication # of code here of setting custom vars AND passing in --revision. We hope # to remove custom vars later.