From 3f0096a72a4f85d65b47428aa8fe46f51ef2f6bc Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Thu, 4 Jun 2020 22:44:13 +0000 Subject: [PATCH] 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 Reviewed-by: Josip Sokcevic Reviewed-by: Edward Lesmes Reviewed-by: Stephen Martinis --- .../bot_update/examples/full.expected/basic.json | 3 +++ .../bot_update/examples/full.expected/basic_luci.json | 3 +++ .../examples/full.expected/basic_with_branch_heads.json | 3 +++ .../bot_update/examples/full.expected/clobber.json | 6 ++++++ .../full.expected/deprecated_got_revision_mapping.json | 6 ++++++ .../examples/full.expected/gerrit_no_rebase_patch_ref.json | 6 ++++++ .../bot_update/examples/full.expected/gerrit_no_reset.json | 6 ++++++ .../full.expected/input_commit_with_id_without_repo.json | 6 ++++++ .../examples/full.expected/multiple_patch_refs.json | 6 ++++++ .../examples/full.expected/no_apply_patch_on_gclient.json | 6 ++++++ .../examples/full.expected/no_cp_checkout_HEAD.json | 3 +++ .../full.expected/no_cp_checkout_a_branch_head.json | 3 +++ .../full.expected/no_cp_checkout_a_specific_commit.json | 3 +++ .../examples/full.expected/no_cp_checkout_master.json | 3 +++ .../bot_update/examples/full.expected/refs.json | 6 ++++++ .../full.expected/reset_root_solution_revision.json | 6 ++++++ .../full.expected/resolve_chromium_fixed_version.json | 3 +++ .../bot_update/examples/full.expected/tryjob_fail.json | 3 +++ .../examples/full.expected/tryjob_fail_patch.json | 3 +++ .../examples/full.expected/tryjob_fail_patch_download.json | 3 +++ .../examples/full.expected/tryjob_gerrit_angle.json | 6 ++++++ .../examples/full.expected/tryjob_gerrit_branch_heads.json | 6 ++++++ .../full.expected/tryjob_gerrit_feature_branch.json | 6 ++++++ .../full.expected/tryjob_gerrit_v8_feature_branch.json | 6 ++++++ .../examples/full.expected/tryjob_gerrit_webrtc.json | 6 ++++++ .../bot_update/examples/full.expected/tryjob_v8.json | 6 ++++++ .../examples/full.expected/tryjob_v8_head_by_default.json | 6 ++++++ .../examples/full.expected/with_manifest_name.json | 3 +++ .../bot_update/examples/full.expected/with_tags.json | 6 ++++++ recipes/recipe_modules/depot_tools/api.py | 5 ++++- .../depot_tools/examples/full.expected/basic.json | 3 +++ .../depot_tools/examples/full.expected/basic_luci.json | 3 +++ .../depot_tools/examples/full.expected/win.json | 3 +++ .../presubmit/examples/full.expected/basic.json | 3 +++ recipes/recipes/fetch_end_to_end_test.expected/basic.json | 3 +++ 35 files changed, 157 insertions(+), 1 deletion(-) diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index 05c4007fe..05a683953 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json index 05c4007fe..05a683953 100644 --- 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]" ] diff --git 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 index 307cdbf7f..72aa84b14 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json index 88c226b46..16a062b30 100644 --- 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]" ] diff --git 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 index 5021d5b90..ef867e256 100644 --- 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]" ] diff --git 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 index 2e6306208..adbe1cba2 100644 --- 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]" ] diff --git 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 index 47990baee..512c03a49 100644 --- 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]" ] diff --git 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 index fdbab760c..f5cf40eb4 100644 --- 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]" ] diff --git 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 index 580f0a8a5..86965de6e 100644 --- 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]" ] diff --git 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 index fb08d5558..a6d166450 100644 --- 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]" ] diff --git 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 index 3b15f3b72..be63bb9be 100644 --- 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]" ] diff --git 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 index 7494808d0..3c71a60cd 100644 --- 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]" ] diff --git 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 index 845968f7e..65230f4f8 100644 --- 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]" ] diff --git 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 index 1b6c09e5e..96d77a3c2 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json index de1639d95..be7b0103a 100644 --- 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]" ] diff --git 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 index cade0dd1e..be2944ca4 100644 --- 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]" ] diff --git 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 index 05c4007fe..05a683953 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 87cef6b98..a0f8c8f42 100644 --- 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]" ] diff --git 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 index 4f0235c43..9e98817cc 100644 --- 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]" ] diff --git 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 index 140cd3cdf..b529b5994 100644 --- 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]" ] diff --git 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 index fb08d5558..a6d166450 100644 --- 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]" ] diff --git 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 index e1b341e55..1fe40e616 100644 --- 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]" ] diff --git 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 index d86ddc109..ce570dd60 100644 --- 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]" ] diff --git 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 index ef1c6b648..f50863c7f 100644 --- 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]" ] diff --git 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 index abbd4bf5b..768060c24 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json index 8c9165954..34a226aaa 100644 --- 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]" ] diff --git 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 index a4ebb3b2a..708325234 100644 --- 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]" ] diff --git 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 index 71f42aa72..49fa5c343 100644 --- 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]" ] diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json index 98e59aa9b..308567ef7 100644 --- 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]" ] diff --git a/recipes/recipe_modules/depot_tools/api.py b/recipes/recipe_modules/depot_tools/api.py index f185f5ffd..bed53576a 100644 --- 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 diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json index 8104185b2..0826600bf 100644 --- 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]" ] diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json b/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json index 8104185b2..0826600bf 100644 --- 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]" ] diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json index 36594c988..bce098696 100644 --- 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]" ] diff --git a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json index bced784b0..f7a34181d 100644 --- 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]" ] diff --git a/recipes/recipes/fetch_end_to_end_test.expected/basic.json b/recipes/recipes/fetch_end_to_end_test.expected/basic.json index 5e7251744..757e3fa03 100644 --- 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]" ]