Mark avd setup as infra step for Linux android views Bug: https://github.com/flutter/flutter/issues/92843 Change-Id: I36a3f9b8a9313ec7af506e330a3f19067db488b2 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/29502 Reviewed-by: Keyong Han <keyonghan@google.com> Commit-Queue: Jesse Seales <jseales@google.com> Reviewed-by: Casey Hillers <chillers@google.com>
diff --git a/recipe_modules/android_virtual_device/api.py b/recipe_modules/android_virtual_device/api.py index 2557067..84872c2 100644 --- a/recipe_modules/android_virtual_device/api.py +++ b/recipe_modules/android_virtual_device/api.py
@@ -92,7 +92,7 @@ ['chmod', '755', resource_name], infra_step=True, ) - self.m.test_utils.run_test('avd_setup.sh', [resource_name, str(self.adb_path)]) + self.m.test_utils.run_test('avd_setup.sh', [resource_name, str(self.adb_path)], infra_step=True) def kill(self, emulator_pid=None): """Kills the emulator and cleans up any zombie QEMU processes.
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/demo zombie processes.json b/recipe_modules/android_virtual_device/examples/full.expected/demo zombie processes.json index aadcd40..17eba84 100644 --- a/recipe_modules/android_virtual_device/examples/full.expected/demo zombie processes.json +++ b/recipe_modules/android_virtual_device/examples/full.expected/demo zombie processes.json
@@ -172,6 +172,7 @@ "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/demo.json b/recipe_modules/android_virtual_device/examples/full.expected/demo.json index bfaef0c..8c92b6f 100644 --- a/recipe_modules/android_virtual_device/examples/full.expected/demo.json +++ b/recipe_modules/android_virtual_device/examples/full.expected/demo.json
@@ -172,6 +172,7 @@ "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipe_modules/test_utils/api.py b/recipe_modules/test_utils/api.py index f485dff..07d27dd 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): + def run_test(self, step_name, command_list, timeout_secs=TIMEOUT_SECS, infra_step=False): """Recipe's step wrapper to collect stdout and add it to step_summary. Args: @@ -108,6 +108,7 @@ command_list(list(str)): A list of strings with the command and parameters to execute. timeout_secs(int): The timeout in seconds for this step. + infra_step: mark step as an infra step 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 @@ -117,6 +118,7 @@ step = self.m.step( step_name, command_list, + infra_step=infra_step, stdout=self.m.raw_io.output_text(), stderr=self.m.raw_io.output_text(), timeout=timeout_secs
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_0.json b/recipes/engine/scenarios.expected/with_failure_upload_0.json index e6ff293..9573967 100644 --- a/recipes/engine/scenarios.expected/with_failure_upload_0.json +++ b/recipes/engine/scenarios.expected/with_failure_upload_0.json
@@ -380,6 +380,7 @@ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "luci_context": { "realm": { "name": "flutter:ci"
diff --git a/recipes/engine/scenarios.expected/with_failure_upload_1.json b/recipes/engine/scenarios.expected/with_failure_upload_1.json index de7c7e3..c58fd1a 100644 --- a/recipes/engine/scenarios.expected/with_failure_upload_1.json +++ b/recipes/engine/scenarios.expected/with_failure_upload_1.json
@@ -380,6 +380,7 @@ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "luci_context": { "realm": { "name": "flutter:ci"
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_0.json b/recipes/engine/scenarios.expected/without_failure_upload_0.json index 1c38c88..98bd17f 100644 --- a/recipes/engine/scenarios.expected/without_failure_upload_0.json +++ b/recipes/engine/scenarios.expected/without_failure_upload_0.json
@@ -380,6 +380,7 @@ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "luci_context": { "realm": { "name": "flutter:ci"
diff --git a/recipes/engine/scenarios.expected/without_failure_upload_1.json b/recipes/engine/scenarios.expected/without_failure_upload_1.json index 1c38c88..98bd17f 100644 --- a/recipes/engine/scenarios.expected/without_failure_upload_1.json +++ b/recipes/engine/scenarios.expected/without_failure_upload_1.json
@@ -380,6 +380,7 @@ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools" ] }, + "infra_step": true, "luci_context": { "realm": { "name": "flutter:ci"
diff --git a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json index 9565800..b3176df 100644 --- a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json +++ b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
@@ -463,6 +463,7 @@ "[CLEANUP]/tmp_tmp_1/curl" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json index 3a27d27..23feb0e 100644 --- a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json +++ b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
@@ -463,6 +463,7 @@ "[CLEANUP]/tmp_tmp_1/curl" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json index 6f79e7c..3808b10 100644 --- a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json +++ b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
@@ -463,6 +463,7 @@ "[CLEANUP]/tmp_tmp_1/curl" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json index 7a47728..b6818b5 100644 --- a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json +++ b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
@@ -463,6 +463,7 @@ "[CLEANUP]/tmp_tmp_1/curl" ] }, + "infra_step": true, "name": "avd setup.avd_setup.sh", "timeout": 3600, "~followup_annotations": [
diff --git a/recipes/infra/ci_yaml.py b/recipes/infra/ci_yaml.py index 2eb963d..5698b28 100644 --- a/recipes/infra/ci_yaml.py +++ b/recipes/infra/ci_yaml.py
@@ -71,7 +71,7 @@ git_ref = api.buildbucket.gitiles_commit.id else: # github pull request info - git_ref = 'master' # Default to master for LED runs + git_ref = 'main' # Default to master for LED runs for tag in api.buildbucket.build.tags: if 'sha/git/' in tag.value: git_ref = tag.value.replace('sha/git/', '')