Remove dev_finder. We were copying dev_finder and device-finder as a transitional step while updating flutter tools to use device-finder. Now that all the tools have been updated we are ready to remove dev_finder. Change-Id: I870f3f83ea761a5f420f1ebd19e0beab5cfc4622 Bug: fxb/55369 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/4060 Reviewed-by: Dan Field <dnfield@google.com> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipe_modules/fuchsia_util/api.py b/recipe_modules/fuchsia_util/api.py index 6b0a324..3513165 100644 --- a/recipe_modules/fuchsia_util/api.py +++ b/recipe_modules/fuchsia_util/api.py
@@ -71,8 +71,8 @@ 'Copy test script', checkout_path.join('dev', 'bots', FUCHSIA_TEST_SCRIPT_NAME), destination_path) - self.m.file.copy('Copy dev_finder', fuchsia_tools.join('dev_finder'), - destination_path) + self.m.file.copy('Copy device-finder', + fuchsia_tools.join('device-finder'), destination_path) self.m.file.copy('Copy pm', fuchsia_tools.join('pm'), destination_path) def collect_results(self, fuchsia_swarming_metadata, timeout='30m'):
diff --git a/recipe_modules/fuchsia_util/examples/full.expected/basic.json b/recipe_modules/fuchsia_util/examples/full.expected/basic.json index 52472fe..24c5bd6 100644 --- a/recipe_modules/fuchsia_util/examples/full.expected/basic.json +++ b/recipe_modules/fuchsia_util/examples/full.expected/basic.json
@@ -130,11 +130,11 @@ "--json-output", "/path/to/tmp/json", "copy", - "None/bin/cache/artifacts/fuchsia/tools/dev_finder", + "None/bin/cache/artifacts/fuchsia/tools/device-finder", "[CLEANUP]/tmp_tmp_1" ], "infra_step": true, - "name": "Fuchsia Tests.Create Isolate Archive.Collect tool deps.Copy dev_finder", + "name": "Fuchsia Tests.Create Isolate Archive.Collect tool deps.Copy device-finder", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@" ]
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json index 323bc7d..e9aa15b 100644 --- a/recipes/engine.expected/clobber.json +++ b/recipes/engine.expected/clobber.json
@@ -14800,41 +14800,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json index 558d47a..dea6716 100644 --- a/recipes/engine.expected/experimental.json +++ b/recipes/engine.expected/experimental.json
@@ -14790,41 +14790,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json index c2276af..42e1299 100644 --- a/recipes/engine.expected/experimental_upload.json +++ b/recipes/engine.expected/experimental_upload.json
@@ -17390,41 +17390,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json index 0c5533f..cab3d58 100644 --- a/recipes/engine.expected/first_bot_update_failed.json +++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -14906,41 +14906,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json index b6db268..13cb5b0 100644 --- a/recipes/engine.expected/linux.json +++ b/recipes/engine.expected/linux.json
@@ -14763,41 +14763,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/linux_maven_or_bitcode.json b/recipes/engine.expected/linux_maven_or_bitcode.json index b6db268..13cb5b0 100644 --- a/recipes/engine.expected/linux_maven_or_bitcode.json +++ b/recipes/engine.expected/linux_maven_or_bitcode.json
@@ -14763,41 +14763,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json index bee4a42..ddaaa5a 100644 --- a/recipes/engine.expected/linux_upload.json +++ b/recipes/engine.expected/linux_upload.json
@@ -17363,41 +17363,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/linux_upload_maven_or_bitcode.json b/recipes/engine.expected/linux_upload_maven_or_bitcode.json index ec059df..f40a749 100644 --- a/recipes/engine.expected/linux_upload_maven_or_bitcode.json +++ b/recipes/engine.expected/linux_upload_maven_or_bitcode.json
@@ -16319,41 +16319,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json index 6ab5043..fb8df14 100644 --- a/recipes/engine.expected/pull_request.json +++ b/recipes/engine.expected/pull_request.json
@@ -14800,41 +14800,6 @@ "--json-output", "/path/to/tmp/json", "copy", - "[CACHE]/builder/src/fuchsia/sdk/linux/tools/dev_finder", - "[CLEANUP]/tmp_tmp_44" - ], - "cwd": "[CACHE]/builder", - "env": { - "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk", - "GOMA_DIR": "[CACHE]/goma/client" - }, - "env_prefixes": { - "PATH": [ - "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin" - ] - }, - "env_suffixes": { - "DEPOT_TOOLS_UPDATE": [ - "0" - ], - "PATH": [ - "RECIPE_REPO[depot_tools]" - ] - }, - "infra_step": true, - "name": "Copy files.Copy dev_finder", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", "[CACHE]/builder/src/fuchsia/sdk/linux/tools/device-finder", "[CLEANUP]/tmp_tmp_44" ],
diff --git a/recipes/engine.py b/recipes/engine.py index de2b67d..94f0c28 100644 --- a/recipes/engine.py +++ b/recipes/engine.py
@@ -697,7 +697,7 @@ packages_name, fuchsia_test_script): """ Gets the system image for the current Fuchsia SDK from cloud storage, adds it - to an isolated along with the `pm` and `dev_finder` utilities, as well as the + to an isolated along with the `pm` and `device-finder` utilities, as well as the flutter_runner_tests and the required flutter unittest FARs (listed in engine/testing/fuchsia/test_fars), and a bash script (in engine/testing/fuchsia/run_tests.sh) to drive the flutter_ctl. @@ -705,11 +705,6 @@ with MakeTempDir(api, 'isolated') as isolated_dir: with api.step.nest('Copy files'): api.file.copy('Copy test script', fuchsia_test_script, isolated_dir) - api.file.copy('Copy dev_finder', fuchsia_tools.join('dev_finder'), - isolated_dir) - # Temporarily copy both dev_finder and dev-finder. This is required for a - # clean transition. dev_finder will be deleted after updating fuchsia_ctl. - # fxb/55369. api.file.copy('Copy device-finder', fuchsia_tools.join('device-finder'), isolated_dir) api.file.copy('Copy pm', fuchsia_tools.join('pm'), isolated_dir)
diff --git a/recipes/fuchsia/fuchsia.expected/basic.json b/recipes/fuchsia/fuchsia.expected/basic.json index 889bdba..2a51ff2 100644 --- a/recipes/fuchsia/fuchsia.expected/basic.json +++ b/recipes/fuchsia/fuchsia.expected/basic.json
@@ -284,7 +284,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/dev_finder", + "[START_DIR]/flutter/bin/cache/artifacts/fuchsia/tools/device-finder", "[CLEANUP]/tmp_tmp_1" ], "cwd": "[START_DIR]/flutter", @@ -299,7 +299,7 @@ ] }, "infra_step": true, - "name": "Fuchsia Tests.Create Isolate Archive.Collect tool deps.Copy dev_finder", + "name": "Fuchsia Tests.Create Isolate Archive.Collect tool deps.Copy device-finder", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@" ]