Revert "Screenshot after devicelab test" This reverts commit 7f40b154b4d7c67889c9d219ed8029606c515279. Reason for revert: Broke the build, we need to specify the device ID. Original change's description: > Screenshot after devicelab test > > This is intended to help particularly if the test fails for some > unexpected reason, for example it doesn't find an observatory port. > > Bug:https://github.com/flutter/flutter/issues/83939 > Change-Id: I67c4f28de72f971537b0514be79a65aa2b65f4be > Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/14400 > Commit-Queue: Dan Field <dnfield@google.com> > Reviewed-by: Godofredo Contreras <godofredoc@google.com> TBR=zra@google.com,godofredoc@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,dnfield@google.com Change-Id: I791d1be701d9da30cb91147b2366d014d5a75676 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: https://github.com/flutter/flutter/issues/83939 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/14420 Reviewed-by: Dan Field <dnfield@google.com> Commit-Queue: Dan Field <dnfield@google.com>
diff --git a/recipes/devicelab/devicelab_drone.expected/basic device.json b/recipes/devicelab/devicelab_drone.expected/basic device.json deleted file mode 100644 index f225cec..0000000 --- a/recipes/devicelab/devicelab_drone.expected/basic device.json +++ /dev/null
@@ -1,655 +0,0 @@ -[ - { - "cmd": [], - "name": "Checkout flutter/flutter" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CLEANUP]/tmp_tmp_1/flutter sdk", - "--url", - "https://chromium.googlesource.com/external/github.com/flutter/flutter" - ], - "name": "Checkout flutter/flutter.git setup", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "git", - "fetch", - "origin", - "--recurse-submodules", - "--progress", - "--tags" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "env": { - "PATH": "RECIPE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "Checkout flutter/flutter.git fetch", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "2d72510e447ab60a9728aeea2362d8be2cbd7789" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "infra_step": true, - "name": "Checkout flutter/flutter.git checkout", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "infra_step": true, - "name": "Checkout flutter/flutter.read revision", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@", - "@@@SET_BUILD_PROPERTY@got_revision@\"deadbeef\"@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "infra_step": true, - "name": "Checkout flutter/flutter.git clean", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "infra_step": true, - "name": "Checkout flutter/flutter.submodule sync", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk", - "infra_step": true, - "name": "Checkout flutter/flutter.submodule update", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [], - "name": "Initialize logs" - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[CLEANUP]/flutter_logs_dir" - ], - "infra_step": true, - "name": "Initialize logs.Ensure [CLEANUP]/flutter_logs_dir", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "", - "[CLEANUP]/flutter_logs_dir/noop.txt" - ], - "infra_step": true, - "name": "Initialize logs.Write noop file", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [], - "name": "Dependencies" - }, - { - "cmd": [ - "cipd", - "ensure", - "-root", - "[CLEANUP]/tmp_tmp_2/vpython", - "-ensure-file", - "infra/tools/luci/vpython/${platform} latest", - "-max-threads", - "0", - "-json-output", - "/path/to/tmp/json" - ], - "name": "Dependencies.ensure_installed", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@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-latest----------\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@", - "@@@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": [ - "flutter", - "doctor" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "name": "flutter doctor", - "timeout": 300 - }, - { - "cmd": [ - "pub", - "get" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "pub get" - }, - { - "cmd": [ - "flutter", - "doctor", - "--verbose" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "name": "flutter doctor (2)", - "timeout": 300 - }, - { - "cmd": [ - "dart", - "bin/test_runner.dart", - "test", - "-t", - "abc", - "--results-file", - "[CLEANUP]/tmp_tmp_3", - "--luci-builder", - "Linux abc", - "--git-branch", - "master" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "name": "run abc", - "timeout": 1800, - "~followup_annotations": [ - "@@@STEP_LOG_LINE@stdout@@@@", - "@@@STEP_LOG_END@stdout@@@", - "@@@STEP_LOG_LINE@stderr@@@@", - "@@@STEP_LOG_END@stderr@@@" - ] - }, - { - "cmd": [ - "flutter", - "screenshot", - "--type", - "device", - "-o", - "[CLEANUP]/flutter_logs_dir/post_test.png" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "name": "Take screenshot (post_test.png)" - }, - { - "cmd": [], - "name": "process logs" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", - "--", - "RECIPE_REPO[depot_tools]/gsutil.py", - "-m", - "----", - "cp", - "-r", - "[CLEANUP]/flutter_logs_dir", - "gs://flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/abc/00000000-0000-0000-0000-000000001337" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "process logs.gsutil upload logs 2d72510e447ab60a9728aeea2362d8be2cbd7789", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LINK@archive logs@https://console.cloud.google.com/storage/browser/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/abc/00000000-0000-0000-0000-000000001337@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "glob", - "[CLEANUP]/flutter_logs_dir", - "*" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "process logs.logs", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@glob@[CLEANUP]/flutter_logs_dir/a.txt@@@", - "@@@STEP_LOG_END@glob@@@" - ] - }, - { - "cmd": [], - "name": "log links", - "~followup_annotations": [ - "@@@STEP_LINK@myfile.txt@https://storage.googleapis.com/flutter_logs/flutter/2d72510e447ab60a9728aeea2362d8be2cbd7789/abc/00000000-0000-0000-0000-000000001337/myfile.txt@@@" - ] - }, - { - "cmd": [ - "vpython", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "listdir", - "[CLEANUP]/flutter_logs_dir", - "--recursive" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "log links.List logs path", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@listdir@[CLEANUP]/flutter_logs_dir/myfile.txt@@@", - "@@@STEP_LOG_END@listdir@@@" - ] - }, - { - "cmd": [], - "name": "Killing Processes" - }, - { - "cmd": [ - "pkill", - "chrome" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "Killing Processes.kill chrome", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "pkill", - "dart" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "Killing Processes.kill dart", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "pkill", - "flutter" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "Killing Processes.kill flutter", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "pkill", - "java" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "Killing Processes.kill java", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "pkill", - "adb" - ], - "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab", - "env": { - "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir", - "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython" - ] - }, - "infra_step": true, - "name": "Killing Processes.kill adb", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "name": "$result" - } -] \ No newline at end of file
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py index b20527b..4f9ba47 100644 --- a/recipes/devicelab/devicelab_drone.py +++ b/recipes/devicelab/devicelab_drone.py
@@ -26,7 +26,7 @@ 'recipe_engine/swarming', ] -# Thirty minutes +# Fifteen minutes MAX_TIMEOUT_SECS = 30 * 60 @@ -101,7 +101,6 @@ test_runner_command, timeout_secs=MAX_TIMEOUT_SECS ) - take_screenshot(api, env, 'post_test.png') api.logs_util.upload_logs(task_name) # This is to clean up leaked processes. api.os_utils.kill_processes() @@ -110,19 +109,6 @@ uploadMetrics(api, results_path) -# TODO(dnfield): Move this to the runner once we understand how we can reliably -# make this happen even if the runner gets killed. -# https://github.com/flutter/flutter/issues/84015 -def take_screenshot(api, env, file_name): - if not api.properties.get('attached_device', False): - return - - screenshot_path = api.path.join(env['FLUTTER_LOGS_DIR'], file_name) - screenshot_cmd = ['flutter', 'screenshot', '--type', 'device', '-o', - screenshot_path] - api.step('Take screenshot (%s)' % file_name, screenshot_cmd) - - def mac_test(api, env, env_prefixes, flutter_path, task_name, runner_params): """Runs a devicelab mac test.""" api.flutter_deps.gems( @@ -146,7 +132,6 @@ test_runner_command, timeout_secs=MAX_TIMEOUT_SECS ) - take_screenshot(api, env, 'post_test.png') api.logs_util.upload_logs(task_name) # This is to clean up leaked processes. api.os_utils.kill_processes() @@ -189,17 +174,6 @@ ) ) yield api.test( - "basic device", api.properties( - buildername='Linux abc', - task_name='abc', - attached_device=True), - api.repo_util.flutter_environment_data(checkout_dir=checkout_path), - api.buildbucket.ci_build( - project='test', - git_repo='git.example.com/test/repo', - ) - ) - yield api.test( "xcode-devicelab", api.properties( buildername='Mac abc',