Stop passing deprecated manifest flag to bot_update

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. <phajdan.jr@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
8 years ago · 644a1d87e6
parent 86989d7b0f
commit 644a1d87e6
23 changed files with 37 additions and 80 deletions
--- 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:
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",
--- 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",