Set DEPOT_TOOLS_UPDATE='0' assuming depot_tool do not auto update on bot

Bug: 1090603 Change-Id: Ib42c778c69588e44ce95b58eda5bc06b12550e9e Recipe-Nontrivial-Roll: build Recipe-Nontrivial-Roll: build_limited_scripts_slave Recipe-Nontrivial-Roll: chrome_release Recipe-Nontrivial-Roll: chromiumos Recipe-Nontrivial-Roll: infra Recipe-Nontrivial-Roll: skia Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2228810 Commit-Queue: Arthur Wang <wuwang@chromium.org> Reviewed-by: Josip Sokcevic <sokcevic@google.com> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
5 years ago · 3f0096a72a
parent 88b4a168c3
commit 3f0096a72a
35 changed files with 157 additions and 1 deletions
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json
@ -25,6 +25,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
@ -25,6 +25,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
@ -26,6 +26,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
@ -24,6 +24,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -131,6 +134,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
@ -67,6 +67,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -137,6 +140,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
@ -24,6 +24,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -131,6 +134,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
@ -24,6 +24,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -131,6 +134,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
@ -23,6 +23,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -130,6 +133,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
@ -27,6 +27,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -134,6 +137,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json
@ -27,6 +27,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json
@ -27,6 +27,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json
@ -27,6 +27,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_master.json
@ -27,6 +27,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json
@ -25,6 +25,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -132,6 +135,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
@ -23,6 +23,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -130,6 +133,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json
@ -25,6 +25,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@ -67,6 +67,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
@ -67,6 +67,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@ -67,6 +67,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -178,6 +181,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -178,6 +181,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
@ -69,6 +69,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -181,6 +184,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
@ -25,6 +25,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
@ -24,6 +24,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
@ -131,6 +134,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/depot_tools/api.py
+++ b/recipes/recipe_modules/depot_tools/api.py
@ -68,5 +68,8 @@ class DepotToolsApi(recipe_api.RecipeApi):
    if self.m.runtime.is_luci:
      key = 'env_suffixes'

-    with self.m.context(**{key: {'PATH': [self.root]}}):
+    # By default Depot Tools do not auto update on the bots.
+    # (crbug/1090603)
+    with self.m.context(**{key: {'PATH': [self.root],
+                                 'DEPOT_TOOLS_UPDATE' : '0'}}):
      yield
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
@ -68,6 +68,9 @@
      "$PATH"
    ],
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json
@ -68,6 +68,9 @@
      "$PATH"
    ],
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
+++ b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json
@ -68,6 +68,9 @@
      "$PATH"
    ],
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json
@ -8,6 +8,9 @@
      "/path/to/tmp/json"
    ],
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]
--- a/recipes/recipes/fetch_end_to_end_test.expected/basic.json
+++ b/recipes/recipes/fetch_end_to_end_test.expected/basic.json
@ -22,6 +22,9 @@
      "GIT_HTTP_LOW_SPEED_TIME": "300"
    },
    "env_suffixes": {
+      "DEPOT_TOOLS_UPDATE": [
+        "0"
+      ],
      "PATH": [
        "RECIPE_REPO[depot_tools]"
      ]