Suppress devicelab logs For any builder added to `SUPPRESS_LOG_BUILDER_LIST`, logs will be suppressed. We use a builder list here in recipes to enhance security, compared to a property flag defined in .ci.yaml. Led run: https://ci.chromium.org/raw/build/logs.chromium.org/flutter/led/keyonghan_google.com/3c8565df5ebe3882b2fca398f9342c8e37d73440c85fd50e1cde27f49839256e/+/build.proto?server=chromium-swarm.appspot.com Change-Id: I7c92d8775f908d67fc2364367616376a841f8f7a Bug: b/231460791, https://github.com/flutter/flutter/issues/102939 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/30241 Commit-Queue: Keyong Han <keyonghan@google.com> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/recipe_modules/test_utils/api.py b/recipe_modules/test_utils/api.py index 07d27dd..3121ac4 100644 --- a/recipe_modules/test_utils/api.py +++ b/recipe_modules/test_utils/api.py
@@ -100,7 +100,7 @@ str(self.m.swarming.bot_id).startswith('flutter-win') ) - def run_test(self, step_name, command_list, timeout_secs=TIMEOUT_SECS, infra_step=False): + def run_test(self, step_name, command_list, timeout_secs=TIMEOUT_SECS, infra_step=False, suppress_log=False): """Recipe's step wrapper to collect stdout and add it to step_summary. Args: @@ -109,6 +109,7 @@ parameters to execute. timeout_secs(int): The timeout in seconds for this step. infra_step: mark step as an infra step + suppress_log: flag whether test logs are suppressed. Returns(str): The status of the test step. A str `flaky` or `success` will be returned when step succeeds, and an exception will be thrown out when @@ -131,10 +132,11 @@ stderr = self._truncateString(result.stderr) raise self.m.step.StepFailure('\n\n```%s```\n' % (stdout or stderr)) finally: - self.m.step.active_result.presentation.logs[ - 'test_stdout'] = self.m.step.active_result.stdout - self.m.step.active_result.presentation.logs[ - 'test_stderr'] = self.m.step.active_result.stderr + if not suppress_log: + self.m.step.active_result.presentation.logs[ + 'test_stdout'] = self.m.step.active_result.stdout + self.m.step.active_result.presentation.logs[ + 'test_stderr'] = self.m.step.active_result.stderr if self._is_flaky(step.stdout): test_run_status = 'flaky' else:
diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json index f2e1e91..7b0f9ff 100644 --- a/recipes/devicelab/devicelab_drone.expected/basic.json +++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -243,69 +243,6 @@ }, { "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Initialize logs.Write noop file", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [], "name": "Dependencies" }, { @@ -357,8 +294,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -399,8 +334,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -441,8 +374,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -494,8 +425,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -528,480 +457,7 @@ } }, "name": "run abc", - "timeout": 1800, - "~followup_annotations": [ - "@@@STEP_LOG_LINE@test_stdout@#flaky@@@", - "@@@STEP_LOG_LINE@test_stdout@this is a flaky@@@", - "@@@STEP_LOG_LINE@test_stdout@flaky: true@@@", - "@@@STEP_LOG_END@test_stdout@@@", - "@@@STEP_LOG_LINE@test_stderr@@@@", - "@@@STEP_LOG_END@test_stderr@@@" - ] - }, - { - "cmd": [], - "name": "process logs" - }, - { - "cmd": [ - "python3", - "-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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Killing Processes.kill adb", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "top", - "-b", - "-n", - "3", - "-o", - "%MEM" - ], - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "OS info (2)" + "timeout": 1800 }, { "cmd": [ @@ -1011,8 +467,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True",
diff --git a/recipes/devicelab/devicelab_drone.expected/local-engine.json b/recipes/devicelab/devicelab_drone.expected/local-engine.json index 8e7ff23..56605bf 100644 --- a/recipes/devicelab/devicelab_drone.expected/local-engine.json +++ b/recipes/devicelab/devicelab_drone.expected/local-engine.json
@@ -243,69 +243,6 @@ }, { "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Initialize logs.Write noop file", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [], "name": "Dependencies" }, { @@ -496,8 +433,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -540,8 +475,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -584,8 +517,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -642,8 +573,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -679,505 +608,7 @@ } }, "name": "run abc", - "timeout": 1800, - "~followup_annotations": [ - "@@@STEP_LOG_LINE@test_stdout@@@@", - "@@@STEP_LOG_END@test_stdout@@@", - "@@@STEP_LOG_LINE@test_stderr@@@@", - "@@@STEP_LOG_END@test_stderr@@@" - ] - }, - { - "cmd": [], - "name": "process logs" - }, - { - "cmd": [ - "python3", - "-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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Killing Processes.kill adb", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "top", - "-b", - "-n", - "3", - "-o", - "%MEM" - ], - "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", - "GIT_BRANCH": "master", - "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk" - }, - "env_prefixes": { - "PATH": [ - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin", - "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin", - "[CLEANUP]/tmp_tmp_2/vpython", - "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin", - "[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, - "luci_context": { - "realm": { - "name": "test:ci" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "OS info (2)" + "timeout": 1800 }, { "cmd": [], @@ -1195,8 +626,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -1247,8 +676,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -1295,8 +722,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -1347,8 +772,6 @@ "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", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release", "LUCI_BRANCH": "", @@ -1406,8 +829,6 @@ "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", "GCP_PROJECT": "flutter-infra", "GIT_BRANCH": "master", "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release",
diff --git a/recipes/devicelab/devicelab_drone.expected/no-task-name.json b/recipes/devicelab/devicelab_drone.expected/no-task-name.json index db7713e..a801877 100644 --- a/recipes/devicelab/devicelab_drone.expected/no-task-name.json +++ b/recipes/devicelab/devicelab_drone.expected/no-task-name.json
@@ -19,7 +19,7 @@ "The recipe has crashed at point 'Uncaught exception'!", "", "Traceback (most recent call last):", - " File \"RECIPE_REPO[flutter]/recipes/devicelab/devicelab_drone.py\", line 44, in RunSteps", + " File \"RECIPE_REPO[flutter]/recipes/devicelab/devicelab_drone.py\", line 46, in RunSteps", " raise ValueError('A task_name property is required')", "ValueError('A task_name property is required')" ]
diff --git a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json index a40c6a1..f3c86cb 100644 --- a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json +++ b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
@@ -243,69 +243,6 @@ }, { "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Initialize logs.Write noop file", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [], "name": "Dependencies" }, { @@ -357,8 +294,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -399,8 +334,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -441,8 +374,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -494,8 +425,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -528,478 +457,7 @@ } }, "name": "run abc", - "timeout": 1800, - "~followup_annotations": [ - "@@@STEP_LOG_LINE@test_stdout@@@@", - "@@@STEP_LOG_END@test_stdout@@@", - "@@@STEP_LOG_LINE@test_stderr@@@@", - "@@@STEP_LOG_END@test_stderr@@@" - ] - }, - { - "cmd": [], - "name": "process logs" - }, - { - "cmd": [ - "python3", - "-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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "Killing Processes.kill adb", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "top", - "-b", - "-n", - "3", - "-o", - "%MEM" - ], - "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", - "GIT_BRANCH": "master", - "LUCI_BRANCH": "", - "LUCI_CI": "True", - "LUCI_PR": "", - "OS": "linux", - "PUB_CACHE": "[START_DIR]/.pub-cache", - "REVISION": "2d72510e447ab60a9728aeea2362d8be2cbd7789", - "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, - "luci_context": { - "realm": { - "name": "project:staging" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "OS info (2)" + "timeout": 1800 }, { "cmd": [ @@ -1015,8 +473,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -1071,8 +527,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -1123,8 +577,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True", @@ -1184,8 +636,6 @@ "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", "GIT_BRANCH": "master", "LUCI_BRANCH": "", "LUCI_CI": "True",
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py index 0de44cd..60e07af 100644 --- a/recipes/devicelab/devicelab_drone.py +++ b/recipes/devicelab/devicelab_drone.py
@@ -34,6 +34,8 @@ # Fifteen minutes MAX_TIMEOUT_SECS = 30 * 60 +# Any builder in this list will have logs suppressed. +SUPPRESS_LOG_BUILDER_LIST = ['Linux abc'] def RunSteps(api): # Collect memory/cpu/process before task execution. @@ -62,7 +64,12 @@ stdout=api.raw_io.output_text() ).stdout.rstrip() env, env_prefixes = api.repo_util.flutter_environment(flutter_path) - api.logs_util.initialize_logs_collection(env) + + builder_name = api.properties.get('buildername') + suppress_log = builder_name in SUPPRESS_LOG_BUILDER_LIST + + if not suppress_log: + api.logs_util.initialize_logs_collection(env) with api.step.nest('Dependencies'): api.flutter_deps.flutter_engine(env, env_prefixes) deps = api.properties.get('dependencies', []) @@ -82,7 +89,7 @@ # Run test runner_params = [ '-t', task_name, '--results-file', results_path, '--luci-builder', - api.properties.get('buildername') + builder_name ] if 'LOCAL_ENGINE' in env: runner_params.extend(['--local-engine', env['LOCAL_ENGINE']]) @@ -106,12 +113,12 @@ if str(api.swarming.bot_id).startswith('flutter-devicelab'): with api.devicelab_osx_sdk('ios'): test_status = mac_test( - api, env, env_prefixes, flutter_path, task_name, runner_params + api, env, env_prefixes, flutter_path, task_name, runner_params, suppress_log ) else: with api.osx_sdk('ios'): test_status = mac_test( - api, env, env_prefixes, flutter_path, task_name, runner_params + api, env, env_prefixes, flutter_path, task_name, runner_params, suppress_log ) else: with api.context(env=env, env_prefixes=env_prefixes): @@ -127,17 +134,19 @@ test_status = api.test_utils.run_test( 'run %s' % task_name, test_runner_command, - timeout_secs=MAX_TIMEOUT_SECS + timeout_secs=MAX_TIMEOUT_SECS, + suppress_log=suppress_log, ) finally: - debug_after_failure(api, task_name) + if not suppress_log: + debug_after_failure(api, task_name) if test_status == 'flaky': api.test_utils.flaky_step('run %s' % task_name) with api.context(env=env, env_prefixes=env_prefixes, cwd=devicelab_path): uploadResults( api, env, env_prefixes, results_path, test_status == 'flaky', git_branch, api.properties.get('buildername'), commit_time, task_name, - benchmark_tags + benchmark_tags, suppress_log=suppress_log ) uploadMetricsToCas(api, results_path) @@ -151,7 +160,7 @@ api.os_utils.collect_os_info() -def mac_test(api, env, env_prefixes, flutter_path, task_name, runner_params): +def mac_test(api, env, env_prefixes, flutter_path, task_name, runner_params, suppress_log): """Runs a devicelab mac test.""" api.flutter_deps.gems( env, env_prefixes, flutter_path.join('dev', 'ci', 'mac') @@ -172,7 +181,8 @@ test_status = api.test_utils.run_test( 'run %s' % task_name, test_runner_command, - timeout_secs=MAX_TIMEOUT_SECS + timeout_secs=MAX_TIMEOUT_SECS, + suppress_log=suppress_log, ) finally: debug_after_failure(api, task_name) @@ -206,6 +216,7 @@ task_name, benchmark_tags, test_status='Succeeded', + suppress_log=False, ): """Upload DeviceLab test results to Cocoon/skia perf. @@ -231,6 +242,7 @@ task_name(str): The task name of the current test. benchmark_tags(str): Json dumped str of benchmark tags, which includes host and device info. test_status(str): The status of the test running step. + suppress_log(bool): Flag whether test logs are suppressed. """ if shouldNotUpdate(api, git_branch): return @@ -263,7 +275,16 @@ upload_command = ['dart', 'bin/test_runner.dart', 'upload-metrics'] upload_command.extend(runner_params) with api.context(env=env, env_prefixes=env_prefixes): - api.step('upload results', upload_command, infra_step=True) + if suppress_log: + api.step( + 'upload results', + upload_command, + infra_step=True, + stdout=api.raw_io.output_text(), + stderr=api.raw_io.output_text(), + ) + else: + api.step('upload results', upload_command, infra_step=True) def uploadMetricsToCas(api, results_path):