Change dependency from fuchsia/gsutil to depot_tools/gsutil in order to unblock tree Bug: https://github.com/flutter/flutter/issues/120111 Change-Id: I492f86d3db76eab86c9e52a18d64c8eb08da2700 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/38621 Commit-Queue: Drew Roen <drewroen@google.com> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com> (cherry picked from commit 6e0d66376975c492dfa9ec43276212d11bf8bc97) Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/38780 Commit-Queue: Godofredo Contreras <godofredoc@google.com> Reviewed-by: Drew Roen <drewroen@google.com>
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json index c854f99..8147b71 100644 --- a/recipes/firebaselab/firebaselab.expected/basic.json +++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -516,148 +516,13 @@ ] }, { - "cmd": [], - "name": "test_execution.ensure gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [ - "vpython3", + "python3", "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.read manifest", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@{@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@}@@@", - "@@@STEP_LOG_END@tool_manifest.json@@@" - ] - }, - { - "cmd": [], - "name": "test_execution.ensure gsutil.install path/to/gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "vpython3", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure package directory", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version", - "-ensure-file", - "path/to/gsutil version:pinned-version", - "-max-threads", - "0", - "-json-output", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure_installed", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil", - "-o", - "GSUtil:software_update_check_period=0", + "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", + "--", + "RECIPE_REPO[depot_tools]/gsutil.py", + "----", "cp", "gs://flutter_firebase_testlab_staging/the_task/fake-task-id/*/logcat", "[CLEANUP]" @@ -681,7 +546,7 @@ ] }, "infra_step": true, - "name": "test_execution.gsutil cp", + "name": "test_execution.gsutil download", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ]
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json index 0a4e950..27c4d10 100644 --- a/recipes/firebaselab/firebaselab.expected/failure 10.json +++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -562,148 +562,13 @@ ] }, { - "cmd": [], - "name": "test_execution.ensure gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [ - "vpython3", + "python3", "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.read manifest", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@{@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@}@@@", - "@@@STEP_LOG_END@tool_manifest.json@@@" - ] - }, - { - "cmd": [], - "name": "test_execution.ensure gsutil.install path/to/gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "vpython3", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure package directory", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version", - "-ensure-file", - "path/to/gsutil version:pinned-version", - "-max-threads", - "0", - "-json-output", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure_installed", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil", - "-o", - "GSUtil:software_update_check_period=0", + "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", + "--", + "RECIPE_REPO[depot_tools]/gsutil.py", + "----", "cp", "gs://flutter_firebase_testlab_staging/None/fake-task-id/*/logcat", "[CLEANUP]" @@ -727,7 +592,7 @@ ] }, "infra_step": true, - "name": "test_execution.gsutil cp", + "name": "test_execution.gsutil download", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ]
diff --git a/recipes/firebaselab/firebaselab.expected/failure 15.json b/recipes/firebaselab/firebaselab.expected/failure 15.json index 0a4e950..27c4d10 100644 --- a/recipes/firebaselab/firebaselab.expected/failure 15.json +++ b/recipes/firebaselab/firebaselab.expected/failure 15.json
@@ -562,148 +562,13 @@ ] }, { - "cmd": [], - "name": "test_execution.ensure gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { "cmd": [ - "vpython3", + "python3", "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "RECIPE_MODULE[fuchsia::gsutil]/resources/tool_manifest.json", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.read manifest", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@{@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gsutil\",@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@", - "@@@STEP_LOG_LINE@tool_manifest.json@}@@@", - "@@@STEP_LOG_END@tool_manifest.json@@@" - ] - }, - { - "cmd": [], - "name": "test_execution.ensure gsutil.install path/to/gsutil", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "vpython3", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure package directory", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@" - ] - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version", - "-ensure-file", - "path/to/gsutil version:pinned-version", - "-max-threads", - "0", - "-json-output", - "/path/to/tmp/json" - ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "GIT_BRANCH": "", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "12345abcde12345abcde12345abcde12345abcde", - "SDK_CHECKOUT_PATH": "[START_DIR]/flutter" - }, - "env_prefixes": { - "PATH": [ - "[START_DIR]/flutter/bin", - "[START_DIR]/flutter/bin/cache/dart-sdk/bin" - ] - }, - "infra_step": true, - "name": "test_execution.ensure gsutil.install path/to/gsutil.ensure_installed", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@3@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"path/to/gsutil\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@" - ] - }, - { - "cmd": [ - "[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil", - "-o", - "GSUtil:software_update_check_period=0", + "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", + "--", + "RECIPE_REPO[depot_tools]/gsutil.py", + "----", "cp", "gs://flutter_firebase_testlab_staging/None/fake-task-id/*/logcat", "[CLEANUP]" @@ -727,7 +592,7 @@ ] }, "infra_step": true, - "name": "test_execution.gsutil cp", + "name": "test_execution.gsutil download", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ]
diff --git a/recipes/firebaselab/firebaselab.py b/recipes/firebaselab/firebaselab.py index 7928ee2..488872b 100644 --- a/recipes/firebaselab/firebaselab.py +++ b/recipes/firebaselab/firebaselab.py
@@ -10,11 +10,11 @@ import re DEPS = [ + 'depot_tools/gsutil', 'flutter/flutter_deps', 'flutter/repo_util', 'flutter/retry', 'fuchsia/gcloud', - 'fuchsia/gsutil', 'recipe_engine/context', 'recipe_engine/file', 'recipe_engine/path',