From 644a1d87e6ff99a19bfa2541ac03ee51deef589f Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Tue, 25 Apr 2017 15:34:16 +0200 Subject: [PATCH] Stop passing deprecated manifest flag to bot_update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The flag has been deprecated in: https://chromium-review.googlesource.com/c/486640 This is a separate CL for the expectation changes. Bug: 398105 Change-Id: I129186323e5ecffe441febe7fa3c6c72bfc9c4cd Reviewed-on: https://chromium-review.googlesource.com/486782 Reviewed-by: Paweł Hajdan Jr. Commit-Queue: Michael Achenbach --- recipes/recipe_modules/bot_update/api.py | 2 -- .../recipe_modules/bot_update/example.expected/basic.json | 3 +-- .../example.expected/basic_with_branch_heads.json | 4 +--- .../bot_update/example.expected/buildbot.json | 3 +-- .../recipe_modules/bot_update/example.expected/clobber.json | 6 ++---- .../example.expected/deprecated_got_revision_mapping.json | 6 ++---- .../example.expected/gerrit_no_rebase_patch_ref.json | 4 +--- .../bot_update/example.expected/gerrit_no_reset.json | 4 +--- .../bot_update/example.expected/no_shallow.json | 6 ++---- .../example.expected/reset_root_solution_revision.json | 6 ++---- .../bot_update/example.expected/trychange.json | 6 ++---- .../example.expected/trychange_oauth2_buildbot.json | 6 ++---- .../bot_update/example.expected/trychange_oauth2_json.json | 6 ++---- .../example.expected/trychange_oauth2_json_win.json | 6 ++---- .../recipe_modules/bot_update/example.expected/tryjob.json | 6 ++---- .../bot_update/example.expected/tryjob_fail.json | 3 +-- .../bot_update/example.expected/tryjob_fail_patch.json | 6 ++---- .../example.expected/tryjob_fail_patch_download.json | 6 ++---- .../bot_update/example.expected/tryjob_gerrit_angle.json | 6 ++---- .../example.expected/tryjob_gerrit_angle_deprecated.json | 6 ++---- .../bot_update/example.expected/tryjob_v8.json | 6 ++---- .../example.expected/tryjob_v8_head_by_default.json | 6 ++---- .../bot_update/example.expected/with_tags.json | 4 +--- 23 files changed, 37 insertions(+), 80 deletions(-) diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 732a43b137..f9db836b64 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -231,8 +231,6 @@ class BotUpdateApi(recipe_api.RecipeApi): cmd.append('--clobber') if no_shallow: cmd.append('--no_shallow') - # TODO(machenbach): Remove in a separate CL for expectation changes. - cmd.append('--output_manifest') if with_branch_heads or cfg.with_branch_heads: cmd.append('--with_branch_heads') if with_tags: diff --git a/recipes/recipe_modules/bot_update/example.expected/basic.json b/recipes/recipe_modules/bot_update/example.expected/basic.json index 3d91c07417..fa98a47f89 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic.json @@ -15,8 +15,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@abc", - "--output_manifest" + "src@abc" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 c550738e40..c89990849c 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 @@ -16,7 +16,6 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--output_manifest", "--with_branch_heads" ], "env": { @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/buildbot.json b/recipes/recipe_modules/bot_update/example.expected/buildbot.json index 3d91c07417..fa98a47f89 100644 --- a/recipes/recipe_modules/bot_update/example.expected/buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/buildbot.json @@ -15,8 +15,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@abc", - "--output_manifest" + "src@abc" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/clobber.json b/recipes/recipe_modules/bot_update/example.expected/clobber.json index 24cc41c792..265871047d 100644 --- a/recipes/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/example.expected/clobber.json @@ -16,8 +16,7 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--clobber", - "--output_manifest" + "--clobber" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 index 919b77d7e0..e6fe19013c 100644 --- 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 @@ -21,8 +21,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -76,8 +75,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 ddeed67e96..52c84aef6a 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 @@ -16,7 +16,6 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--output_manifest", "--gerrit_no_rebase_patch_ref" ], "env": { @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 43dcc977f2..0d8bb4af54 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 @@ -16,7 +16,6 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--output_manifest", "--gerrit_no_reset" ], "env": { @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 e84be0324d..a50b0643b6 100644 --- a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json @@ -16,8 +16,7 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--no_shallow", - "--output_manifest" + "--no_shallow" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 eb506f87fb..7d12d852ec 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 @@ -15,8 +15,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@revision", - "--output_manifest" + "src@revision" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -72,8 +71,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange.json b/recipes/recipe_modules/bot_update/example.expected/trychange.json index 5269cb93dc..d7dced2029 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange.json @@ -17,8 +17,7 @@ "--revision", "src@HEAD", "--refs", - "+refs/change/1/2/333", - "--output_manifest" + "+refs/change/1/2/333" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -74,8 +73,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 4a9e00803b..d508c0996e 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 @@ -19,8 +19,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -76,8 +75,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 9fa3aa2d7a..2b97028abf 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 @@ -17,8 +17,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -74,8 +73,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 3776d17bd9..717ea6b108 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 @@ -17,8 +17,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -74,8 +73,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob.json b/recipes/recipe_modules/bot_update/example.expected/tryjob.json index 5a851a9849..e383a8e8cb 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob.json @@ -21,8 +21,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -80,8 +79,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 ae9404b327..ac1788df2c 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -21,8 +21,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 3df4598bf2..c80c36be81 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 @@ -21,8 +21,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -109,8 +108,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 528599c8b7..9d8132ffc2 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 @@ -21,8 +21,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@HEAD", - "--output_manifest" + "src@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -109,8 +108,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 a533934be9..4fc9b1fa65 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 @@ -21,8 +21,7 @@ "--revision", "src@HEAD", "--revision", - "src/third_party/angle@HEAD", - "--output_manifest" + "src/third_party/angle@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -81,8 +80,7 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/third_party/angle@HEAD", - "--output_manifest" + "src/third_party/angle@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 a533934be9..4fc9b1fa65 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 @@ -21,8 +21,7 @@ "--revision", "src@HEAD", "--revision", - "src/third_party/angle@HEAD", - "--output_manifest" + "src/third_party/angle@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -81,8 +80,7 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/third_party/angle@HEAD", - "--output_manifest" + "src/third_party/angle@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 8aae82d58a..bf4c1e625f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -23,8 +23,7 @@ "--revision", "src@HEAD", "--revision", - "src/v8@abc", - "--output_manifest" + "src/v8@abc" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -85,8 +84,7 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/v8@abc", - "--output_manifest" + "src/v8@abc" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 b2c9d925ab..ef6015c348 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 @@ -23,8 +23,7 @@ "--revision", "src@HEAD", "--revision", - "src/v8@HEAD", - "--output_manifest" + "src/v8@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", @@ -85,8 +84,7 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/v8@HEAD", - "--output_manifest" + "src/v8@HEAD" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", 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 2f736eb0ed..a71b7b6bc6 100644 --- a/recipes/recipe_modules/bot_update/example.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/example.expected/with_tags.json @@ -16,7 +16,6 @@ "/path/to/tmp/json", "--revision", "src@HEAD", - "--output_manifest", "--with_tags" ], "env": { @@ -73,8 +72,7 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", - "--output_manifest" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000",