Remove pyback file.
Updated android emulators test to make use of download in the new context so the emulator code is self contained.
Change-Id: I9d79fb5bdd16611221e72ccd81d2dbb0b7352b8e
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/45720
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Commit-Queue: Ricardo Amador <ricardoamador@google.com>
diff --git a/recipe_modules/android_virtual_device/__init__.py b/recipe_modules/android_virtual_device/__init__.py
index 1fbcbc7..98d7db9 100644
--- a/recipe_modules/android_virtual_device/__init__.py
+++ b/recipe_modules/android_virtual_device/__init__.py
@@ -4,7 +4,9 @@
'recipe_engine/cipd',
'recipe_engine/context',
'recipe_engine/file',
+ 'recipe_engine/path',
'recipe_engine/platform',
+ 'recipe_engine/properties',
'recipe_engine/raw_io',
'recipe_engine/step',
]
diff --git a/recipe_modules/android_virtual_device/api.py b/recipe_modules/android_virtual_device/api.py
index 5c8a98c..a4d60a1 100644
--- a/recipe_modules/android_virtual_device/api.py
+++ b/recipe_modules/android_virtual_device/api.py
@@ -15,45 +15,55 @@
def __init__(self, *args, **kwargs):
super(AndroidVirtualDeviceApi, self).__init__(*args, **kwargs)
- self.env = {}
- self.env_prefixes = {}
- self.version = "31"
self.emulator_pid = -1
self.avd_root = None
self.adb_path = None
+ self._initialized = False
+
+ def _initialize(self, env, env_prefixes):
+ """Initilizes the android emulator environment if needed."""
+ if self._initialized:
+ # Do not download artifacts just update envs.
+ env['AVD_ROOT'] = self.avd_root
+ env['ADB_PATH'] = self.adb_path
+ return
+ self.avd_root = self.m.path['cache'].join('avd')
+ self.download(
+ env=env,
+ env_prefixes=env_prefixes,
+ )
+ self._initialized = True
@contextmanager
- def __call__(self, env, env_prefixes, version):
- self.env = env
+ def __call__(self, env, env_prefixes, version="31"):
+ version = version or self.m.properties.get('avd_version')
+ self._initialize(env, env_prefixes)
try:
- self.version = version
- self.emulator_pid = self.start(self.env, self.env_prefixes, self.version)
+ self.emulator_pid = self.start(env, env_prefixes, version)
env['EMULATOR_PID'] = self.emulator_pid
- self.setup(self.env, self.env_prefixes)
+ self.setup(env, env_prefixes)
yield
finally:
self.kill(self.emulator_pid)
- def download(self, avd_root, env, env_prefixes, version=None):
+ def download(self, env, env_prefixes):
"""Installs the android avd emulator package.
Args:
env(dict): Current environment variables.
env_prefixes(dict): Current environment prefixes variables.
- avd_root: The root path to install the AVD package.
+ avd_root(Path): The root path to install the AVD package.
"""
assert self.m.platform.is_linux
- self.avd_root = avd_root
- self.version = version
+ version = self.m.properties.get('avd_cipd_version', AVD_CIPD_IDENTIFIER)
with self.m.step.nest('download avd package'):
- self.m.file.ensure_directory('Ensure avd cache', self.avd_root)
- with self.m.context(env=env, env_prefixes=env_prefixes,
- cwd=self.avd_root), self.m.depot_tools.on_path():
+ with self.m.context(
+ env=env, env_prefixes=env_prefixes), self.m.depot_tools.on_path():
# Download and install AVD
self.m.cipd.ensure(
self.avd_root,
self.m.cipd.EnsureFile().add_package(
- 'chromium/tools/android/avd/linux-amd64', AVD_CIPD_IDENTIFIER
+ 'chromium/tools/android/avd/linux-amd64', version
)
)
@@ -75,7 +85,7 @@
env_prefixes(dict): Current environment prefixes variables.
version(string): The android API version of the emulator as a string.
"""
- self.version = version or self.version or '31'
+ self.version = version or '31'
self.emulator_pid = ''
with self.m.step.nest('start avd'):
with self.m.context(env=env, env_prefixes=env_prefixes,
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
index 66e4d83..fc4272f 100644
--- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
+++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started and stopped, processes killed.json
@@ -5,28 +5,10 @@
},
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/builder/avd",
+ "[CACHE]/avd",
"-ensure-file",
"chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
"-max-threads",
@@ -34,7 +16,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/avd",
"env": {
"USE_EMULATOR": "true"
},
@@ -69,17 +50,22 @@
{
"cmd": [
"vpython3",
- "[CACHE]/builder/avd/src/tools/android/avd/avd.py",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
"install",
"--avd-config",
- "[CACHE]/builder/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -97,7 +83,7 @@
{
"cmd": [
"vpython3",
- "[CACHE]/builder/avd/src/tools/android/avd/avd.py",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
"start",
"--no-read-only",
"--wipe-data",
@@ -105,14 +91,19 @@
"--debug-tags",
"all",
"--avd-config",
- "[CACHE]/builder/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -138,13 +129,18 @@
"755",
"RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"EMULATOR_PID": "17687",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.Set execute permission",
"~followup_annotations": [
@@ -154,15 +150,20 @@
{
"cmd": [
"RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh",
- "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb"
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"EMULATOR_PID": "17687",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.avd_setup.sh",
"timeout": 3600,
@@ -219,6 +220,184 @@
]
},
{
+ "cmd": [],
+ "name": "start avd (2)"
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
+ "install",
+ "--avd-config",
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "name": "start avd (2).Install Android emulator (API level 31)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
+ "start",
+ "--no-read-only",
+ "--wipe-data",
+ "--writable-system",
+ "--debug-tags",
+ "all",
+ "--avd-config",
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "name": "start avd (2).Start Android emulator (API level 31)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@raw_io.output_text@android_31_google_apis_x86|emulator-5554 started (pid: 17687)@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "avd setup (2)"
+ },
+ {
+ "cmd": [
+ "chmod",
+ "755",
+ "RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "infra_step": true,
+ "name": "avd setup (2).Set execute permission",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "infra_step": true,
+ "name": "avd setup (2).avd_setup.sh",
+ "timeout": 3600,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@test_stdout@@@@",
+ "@@@STEP_LOG_END@test_stdout@@@",
+ "@@@STEP_LOG_LINE@test_stderr@@@@",
+ "@@@STEP_LOG_END@test_stderr@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "echo",
+ "hello"
+ ],
+ "name": "Do something (2)"
+ },
+ {
+ "cmd": [],
+ "name": "kill and cleanup avd (2)"
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "17687"
+ ],
+ "name": "kill and cleanup avd (2).Kill emulator cleanup",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ps",
+ "-axww"
+ ],
+ "name": "kill and cleanup avd (2).list processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "12345"
+ ],
+ "name": "kill and cleanup avd (2).Kill zombie processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
index a99a376..fc26654 100644
--- a/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
+++ b/recipe_modules/android_virtual_device/examples/full.expected/emulator started.json
@@ -5,28 +5,10 @@
},
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/builder/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
"cipd",
"ensure",
"-root",
- "[CACHE]/builder/avd",
+ "[CACHE]/avd",
"-ensure-file",
"chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
"-max-threads",
@@ -34,7 +16,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/builder/avd",
"env": {
"USE_EMULATOR": "true"
},
@@ -69,17 +50,22 @@
{
"cmd": [
"vpython3",
- "[CACHE]/builder/avd/src/tools/android/avd/avd.py",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
"install",
"--avd-config",
- "[CACHE]/builder/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -97,7 +83,7 @@
{
"cmd": [
"vpython3",
- "[CACHE]/builder/avd/src/tools/android/avd/avd.py",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
"start",
"--no-read-only",
"--wipe-data",
@@ -105,14 +91,19 @@
"--debug-tags",
"all",
"--avd-config",
- "[CACHE]/builder/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -138,13 +129,18 @@
"755",
"RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"EMULATOR_PID": "17687",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.Set execute permission",
"~followup_annotations": [
@@ -154,15 +150,20 @@
{
"cmd": [
"RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh",
- "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb"
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb"
],
- "cwd": "[CACHE]/builder/avd",
+ "cwd": "[CACHE]/avd",
"env": {
- "ADB_PATH": "[CACHE]/builder/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/builder/avd",
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
"EMULATOR_PID": "17687",
"USE_EMULATOR": "true"
},
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.avd_setup.sh",
"timeout": 3600,
@@ -208,6 +209,173 @@
]
},
{
+ "cmd": [],
+ "name": "start avd (2)"
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
+ "install",
+ "--avd-config",
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "name": "start avd (2).Install Android emulator (API level 31)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "[CACHE]/avd/src/tools/android/avd/avd.py",
+ "start",
+ "--no-read-only",
+ "--wipe-data",
+ "--writable-system",
+ "--debug-tags",
+ "all",
+ "--avd-config",
+ "[CACHE]/avd/src/tools/android/avd/proto/generic_android31.textpb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "name": "start avd (2).Start Android emulator (API level 31)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@raw_io.output_text@android_31_google_apis_x86|emulator-5554 started (pid: 17687)@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "avd setup (2)"
+ },
+ {
+ "cmd": [
+ "chmod",
+ "755",
+ "RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "infra_step": true,
+ "name": "avd setup (2).Set execute permission",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "RECIPE_MODULE[flutter::android_virtual_device]/resources/avd_setup.sh",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb"
+ ],
+ "cwd": "[CACHE]/avd",
+ "env": {
+ "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
+ "AVD_ROOT": "[CACHE]/avd",
+ "EMULATOR_PID": "17687",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
+ "infra_step": true,
+ "name": "avd setup (2).avd_setup.sh",
+ "timeout": 3600,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@test_stdout@@@@",
+ "@@@STEP_LOG_END@test_stdout@@@",
+ "@@@STEP_LOG_LINE@test_stderr@@@@",
+ "@@@STEP_LOG_END@test_stderr@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "echo",
+ "hello"
+ ],
+ "name": "Do something (2)"
+ },
+ {
+ "cmd": [],
+ "name": "kill and cleanup avd (2)"
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "17687"
+ ],
+ "name": "kill and cleanup avd (2).Kill emulator cleanup",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ps",
+ "-axww"
+ ],
+ "name": "kill and cleanup avd (2).list processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipe_modules/android_virtual_device/examples/full.py b/recipe_modules/android_virtual_device/examples/full.py
index dfc6941..bd20b7f 100644
--- a/recipe_modules/android_virtual_device/examples/full.py
+++ b/recipe_modules/android_virtual_device/examples/full.py
@@ -12,9 +12,10 @@
env = {'USE_EMULATOR': api.properties.get('use_emulator', False)}
env_prefixes = {}
avd_root = api.path['cache'].join('builder', 'avd')
- api.android_virtual_device.download(
- avd_root=avd_root, env=env, env_prefixes=env_prefixes, version='31'
- )
+ with api.android_virtual_device(env=env, env_prefixes=env_prefixes,
+ version="31"):
+ api.step('Do something', ['echo', 'hello'])
+ # Calling a second time to ensure we have coverage for duplicated initialization.
with api.android_virtual_device(env=env, env_prefixes=env_prefixes,
version="31"):
api.step('Do something', ['echo', 'hello'])
@@ -33,6 +34,14 @@
'_google_apis_x86|emulator-5554 started (pid: 17687)'
)
),
+ api.step_data(
+ 'start avd (2).Start Android emulator (API level %s)' %
+ avd_api_version,
+ stdout=api.raw_io.output_text(
+ 'android_' + avd_api_version +
+ '_google_apis_x86|emulator-5554 started (pid: 17687)'
+ )
+ ),
)
yield api.test(
@@ -49,4 +58,16 @@
'kill and cleanup avd.list processes',
stdout=api.raw_io.output_text('12345 qemu-system blah')
),
+ api.step_data(
+ 'start avd (2).Start Android emulator (API level %s)' %
+ avd_api_version,
+ stdout=api.raw_io.output_text(
+ 'android_' + avd_api_version +
+ '_google_apis_x86|emulator-5554 started (pid: 17687)'
+ )
+ ),
+ api.step_data(
+ 'kill and cleanup avd (2).list processes',
+ stdout=api.raw_io.output_text('12345 qemu-system blah')
+ ),
)
diff --git a/recipe_modules/flutter_deps/api.py b/recipe_modules/flutter_deps/api.py
index 8dfb5f9..aa18db6 100644
--- a/recipe_modules/flutter_deps/api.py
+++ b/recipe_modules/flutter_deps/api.py
@@ -74,7 +74,7 @@
"""
available_deps = {
'android_sdk': self.android_sdk,
- 'android_virtual_device': self.android_virtual_device,
+ # 'android_virtual_device': self.android_virtual_device,
'apple_signing': self.apple_signing,
'arm_tools': self.arm_tools,
'certs': self.certs,
@@ -111,7 +111,7 @@
'''.format(dependency)
raise ValueError(msg)
parsed_deps.append(dependency)
- if dependency in ['xcode', 'gems', 'swift']:
+ if dependency in ['xcode', 'gems', 'swift', 'android_virtual_device']:
continue
dep_funct = available_deps.get(dependency)
if not dep_funct:
@@ -684,16 +684,5 @@
temp_paths.append(jazzy_path.join('ruby', ruby_version, 'bin'))
env_prefixes['PATH'] = temp_paths
- def android_virtual_device(self, env, env_prefixes, version=None):
- """Installs and starts an android avd emulator.
-
- Args:
- env(dict): Current environment variables.
- env_prefixes(dict): Current environment prefixes variables.
- version: Android API version of the avd.
- """
- avd_root = self.m.path['cache'].join('avd')
- self.m.android_virtual_device.download(avd_root, env, env_prefixes, version)
-
def contexts(self):
return {'metric_center_token': self.m.token_util.metric_center_token}
diff --git a/recipe_modules/flutter_deps/examples/full.expected/basic.json b/recipe_modules/flutter_deps/examples/full.expected/basic.json
index a2a5d2c..fff7d4f 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/basic.json
@@ -847,108 +847,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
index 49c3105..c9b597e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/flutter_engine.json
@@ -933,110 +933,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host_debug_unopt",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CLEANUP]/builder/src/out/host_debug_unopt/dart-sdk/bin",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
index a2a5d2c..fff7d4f 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/goldTryjob.json
@@ -847,108 +847,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/linux.json b/recipe_modules/flutter_deps/examples/full.expected/linux.json
index a2a5d2c..fff7d4f 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/linux.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/linux.json
@@ -847,108 +847,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
index 55ffab6..04cde2c 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
@@ -933,110 +933,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LOCAL_ENGINE": "[CLEANUP]/builder/src/out/host-release",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CLEANUP]/builder/src/out/host-release/dart-sdk/bin",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
index e3064bd..628cb81 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
@@ -933,110 +933,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LOCAL_WEB_SDK": "[CLEANUP]/builder/src/out/wasm-release",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CLEANUP]/builder/src/flutter/prebuilts/${platform}/dart-sdk/bin",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json b/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
index 14e6302..16b466c 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-arm64ruby.json
@@ -847,108 +847,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
index 8e70260..b651ae9 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/with-gems.json
@@ -847,108 +847,6 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "env": {
- "ANDROID_HOME": "[CACHE]/android",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk-bundle",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_2",
- "ANDROID_SDK_ROOT": "[CACHE]/android",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_2/.android",
- "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
- "CHROME_NO_SANDBOX": "true",
- "FIREFOX_EXECUTABLE": "[CACHE]/firefox/firefox",
- "FLUTTER_XCODE_CODE_SIGN_STYLE": "Manual",
- "FLUTTER_XCODE_DEVELOPMENT_TEAM": "S8QB4VV633",
- "FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER": "match Development *",
- "GEM_HOME": "[CACHE]/gems/ruby/0",
- "GOPATH": "[CLEANUP]/go_path",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "RUBY_HOME": "[CACHE]/ruby"
- },
- "env_prefixes": {
- "DYLD_FALLBACK_LIBRARY_PATH": [
- "[CACHE]/ruby/dylibs"
- ],
- "PATH": [
- "[CACHE]/ruby/bin",
- "[CACHE]/dart_sdk",
- "[CACHE]/chrome/chrome",
- "[CACHE]/chrome/drivers",
- "[CACHE]/firefox",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[CACHE]/go/bin",
- "[CLEANUP]/go_path/bin",
- "[START_DIR]/firebase",
- "[CACHE]/cmake/bin",
- "[CLEANUP]/tmp_tmp_3",
- "[CACHE]/cosign/bin",
- "[CACHE]/ninja",
- "[CACHE]/clang/bin",
- "[CLEANUP]/tmp_tmp_5/curl",
- "[CACHE]/gems/ruby/0/bin"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "name": "download avd package.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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": [
"cipd",
"ensure",
diff --git a/recipe_modules/flutter_deps/examples/full.py b/recipe_modules/flutter_deps/examples/full.py
index a688d85..7545867 100644
--- a/recipe_modules/flutter_deps/examples/full.py
+++ b/recipe_modules/flutter_deps/examples/full.py
@@ -71,7 +71,6 @@
api.flutter_deps.jazzy(env, env_prefixes, '')
api.flutter_deps.contexts()
if api.platform.is_linux:
- api.flutter_deps.android_virtual_device(env, env_prefixes, '31')
api.flutter_deps.gh_cli(env, env_prefixes, 'latest')
# Gems dependency requires to run from a flutter_environment.
diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 992a94d..262ef62 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -526,121 +526,12 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "test:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "",
- "OPENPAY_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_2/openpay",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "test:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -658,8 +549,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -685,8 +575,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -704,8 +592,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -731,8 +618,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -751,10 +636,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -788,8 +671,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -808,10 +689,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -836,8 +715,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -856,10 +733,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.expected/emulator-test.json b/recipes/devicelab/devicelab_drone.expected/emulator-test.json
index 76c739f..d9da7a6 100644
--- a/recipes/devicelab/devicelab_drone.expected/emulator-test.json
+++ b/recipes/devicelab/devicelab_drone.expected/emulator-test.json
@@ -188,29 +188,99 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "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",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "linux",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "name": "flutter doctor",
+ "timeout": 300
},
{
"cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
+ "dart",
+ "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",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "linux",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
"infra_step": true,
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
+ "name": "dart 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",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "linux",
+ "PUB_CACHE": "[START_DIR]/.pub-cache",
+ "REVISION": "12345abcde12345abcde12345abcde12345abcde",
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "true"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "name": "flutter doctor (2)",
+ "timeout": 300
+ },
+ {
+ "cmd": [],
+ "name": "download avd package"
},
{
"cmd": [
@@ -225,7 +295,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -237,11 +307,16 @@
"OS": "linux",
"PUB_CACHE": "[START_DIR]/.pub-cache",
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk"
+ "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
+ "USE_EMULATOR": "true"
},
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
@@ -253,9 +328,9 @@
"RECIPE_REPO[depot_tools]"
]
},
- "name": "Dependencies.download avd package.ensure_installed",
+ "name": "download avd package.ensure_installed",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
@@ -270,107 +345,6 @@
]
},
{
- "cmd": [
- "flutter",
- "doctor"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "true"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "name": "flutter doctor",
- "timeout": 300
- },
- {
- "cmd": [
- "dart",
- "pub",
- "get"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "true"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "infra_step": true,
- "name": "dart pub get"
- },
- {
- "cmd": [
- "flutter",
- "doctor",
- "--verbose"
- ],
- "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_1/flutter sdk",
- "USE_EMULATOR": "true"
- },
- "env_prefixes": {
- "PATH": [
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "name": "flutter doctor (2)",
- "timeout": 300
- },
- {
"cmd": [],
"name": "start avd"
},
@@ -406,7 +380,8 @@
"[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -460,7 +435,8 @@
"[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"env_suffixes": {
@@ -513,7 +489,8 @@
"[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -552,7 +529,8 @@
"[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -596,8 +574,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -615,10 +591,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "run abc",
@@ -644,8 +618,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -663,10 +635,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "kill and cleanup avd.Kill emulator cleanup",
@@ -681,8 +651,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -700,10 +668,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"name": "kill and cleanup avd.list processes",
@@ -732,8 +698,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -751,10 +715,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -777,8 +739,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -796,10 +756,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -830,8 +788,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -849,10 +805,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -874,8 +828,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -893,10 +845,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -912,8 +862,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -931,10 +879,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -950,8 +896,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -969,10 +913,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -988,8 +930,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1007,10 +947,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1026,8 +964,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1045,10 +981,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1068,8 +1002,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1087,10 +1019,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1103,8 +1033,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1122,10 +1050,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json b/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
index 56203ea..10c32a3 100644
--- a/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
+++ b/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
@@ -331,120 +331,12 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -461,8 +353,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -488,8 +379,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -506,8 +395,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -533,8 +421,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -552,10 +438,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -590,8 +474,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -609,10 +491,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -656,8 +536,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -675,10 +553,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -713,8 +589,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -732,10 +606,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -778,8 +650,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -797,10 +667,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -834,8 +702,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -853,10 +719,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -884,8 +748,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -903,10 +765,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -934,8 +794,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -953,10 +811,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -984,8 +840,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1003,10 +857,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1034,8 +886,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1053,10 +903,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1088,8 +936,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1107,10 +953,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1141,8 +985,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1159,8 +1001,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1200,8 +1041,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1218,8 +1057,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1255,8 +1093,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1273,8 +1109,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1319,8 +1154,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1337,8 +1170,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.expected/local-engine.json b/recipes/devicelab/devicelab_drone.expected/local-engine.json
index 8376a88..c5d06c5 100644
--- a/recipes/devicelab/devicelab_drone.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone.expected/local-engine.json
@@ -470,122 +470,12 @@
]
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "test:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "test:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -604,8 +494,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -631,8 +520,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -651,8 +538,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -678,8 +564,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -699,11 +583,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -739,8 +621,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -760,11 +640,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -808,8 +686,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -829,11 +705,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -868,8 +742,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -889,11 +761,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -936,8 +806,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -957,11 +825,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -995,8 +861,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1016,11 +880,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1048,8 +910,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1069,11 +929,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1101,8 +959,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1122,11 +978,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1154,8 +1008,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1175,11 +1027,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1207,8 +1057,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1228,11 +1076,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1264,8 +1110,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1285,11 +1129,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1322,8 +1164,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1342,8 +1182,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1377,8 +1216,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1397,8 +1234,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1428,8 +1264,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1448,8 +1282,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1483,8 +1316,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1503,8 +1334,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1545,8 +1375,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1568,11 +1396,9 @@
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1605,8 +1431,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1625,8 +1449,7 @@
"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",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
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 7c04bbd..104df89 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
@@ -331,120 +331,12 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -461,8 +353,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -488,8 +379,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -506,8 +395,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -533,8 +421,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -552,10 +438,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -589,8 +473,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -608,10 +490,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -655,8 +535,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -674,10 +552,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -712,8 +588,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -731,10 +605,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -777,8 +649,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -796,10 +666,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -833,8 +701,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -852,10 +718,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -883,8 +747,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -902,10 +764,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -933,8 +793,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -952,10 +810,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -983,8 +839,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1002,10 +856,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1033,8 +885,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1052,10 +902,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1087,8 +935,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1106,10 +952,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1140,8 +984,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1158,8 +1000,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1199,8 +1040,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1217,8 +1056,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1254,8 +1092,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1272,8 +1108,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1318,8 +1153,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1336,8 +1169,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index d2cd165..d0f93ab 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -331,120 +331,12 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "project:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -461,8 +353,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -488,8 +379,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -506,8 +395,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -533,8 +421,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -552,10 +438,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -589,8 +473,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -608,10 +490,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -657,8 +537,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -676,10 +554,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -714,8 +590,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -733,10 +607,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -779,8 +651,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -798,10 +668,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -835,8 +703,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -854,10 +720,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -885,8 +749,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -904,10 +766,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -935,8 +795,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -954,10 +812,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -985,8 +841,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1004,10 +858,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1035,8 +887,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1054,10 +904,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1089,8 +937,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1108,10 +954,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1136,8 +980,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1155,10 +997,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1191,8 +1031,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1209,8 +1047,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1244,8 +1081,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1262,8 +1097,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1293,8 +1127,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1311,8 +1143,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1346,8 +1177,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1364,8 +1193,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1408,8 +1236,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1429,10 +1255,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1465,8 +1289,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1483,8 +1305,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
index 19357e4..105186a 100644
--- a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
+++ b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
@@ -526,121 +526,12 @@
"name": "Dependencies"
},
{
- "cmd": [],
- "name": "Dependencies.download avd package",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/avd",
- "-ensure-file",
- "chromium/tools/android/avd/linux-amd64 thuLfk5G3GvTQU6BzYiS5IAWWwHP7I-NOPf9rO5CYIwC",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "cwd": "[CACHE]/avd",
- "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": "",
- "OPENPAY_CHECKOUT_PATH": "[CLEANUP]/tmp_tmp_2/openpay",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "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"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "project:staging"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Dependencies.download avd package.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@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-thuLfk5G3GvTQU6B\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"chromium/tools/android/avd/linux-amd64\"@@@",
- "@@@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": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -658,8 +549,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -685,8 +575,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -704,8 +592,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -731,8 +618,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -751,10 +636,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -788,8 +671,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -808,10 +689,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"luci_context": {
@@ -844,8 +723,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -863,8 +740,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -898,8 +774,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -917,8 +791,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -948,8 +821,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -967,8 +838,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1002,8 +872,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1021,8 +889,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1065,8 +932,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1087,10 +952,8 @@
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1123,8 +986,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1142,8 +1003,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1177,8 +1037,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1196,8 +1054,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1237,8 +1094,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1256,8 +1111,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1293,8 +1147,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1312,8 +1164,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
@@ -1358,8 +1209,6 @@
],
"cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
"env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "AVD_ROOT": "[CACHE]/avd",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
"FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
"FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
@@ -1377,8 +1226,7 @@
"env_prefixes": {
"PATH": [
"[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
- "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
]
},
"infra_step": true,
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index 25dec1b..184dbc4 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -90,7 +90,11 @@
deps = api.properties.get('dependencies', [])
# TODO: If deps contains dart_sdk and we are running a local engine,
# we don't want to fetch it with cipd, so don't fetch it with required_deps
- api.flutter_deps.required_deps(env, env_prefixes, deps)
+ api.flutter_deps.required_deps(
+ env,
+ env_prefixes,
+ deps,
+ )
target_tags = api.properties.get('tags', [])
device_tags = api.test_utils.collect_benchmark_tags(
@@ -159,7 +163,7 @@
api.android_virtual_device(
env=env,
env_prefixes=env_prefixes,
- version=dep_list.get('android_virtual_device', None)
+ version=api.properties.get('avd_version')
)
)
test_status = api.test_utils.run_test(
diff --git a/recipes/engine/scenarios.expected/without_failure_upload.json b/recipes/engine/scenarios.expected/without_failure_upload.json
index 62d87c4..0048cb8 100644
--- a/recipes/engine/scenarios.expected/without_failure_upload.json
+++ b/recipes/engine/scenarios.expected/without_failure_upload.json
@@ -76,20 +76,14 @@
"name": "Ensure checkout cache"
},
{
- "cmd": [],
- "name": "download avd package"
- },
- {
"cmd": [
"vpython3",
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
"--json-output",
"/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
+ "listdir",
+ "[CACHE]/builder"
],
"infra_step": true,
"luci_context": {
@@ -104,12 +98,219 @@
"hostname": "rdbhost"
}
},
- "name": "download avd package.Ensure avd cache",
+ "name": "Empty [CACHE]/builder",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Mount caches"
+ },
+ {
+ "cmd": [
+ "python3",
+ "-u",
+ "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
+ "--",
+ "RECIPE_REPO[depot_tools]/gsutil.py",
+ "----",
+ "cat",
+ "gs://flutter_archives_v2/caches/builder-linux.json"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Mount caches.gsutil cat",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@",
+ "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
+ "@@@STEP_LOG_END@json.output (exception)@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Checkout source code"
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+ "--spec-path",
+ "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
+ "--revision_mapping_file",
+ "{\"got_engine_revision\": \"src/flutter\"}",
+ "--git-cache-dir",
+ "[CACHE]/git",
+ "--cleanup-dir",
+ "[CLEANUP]/bot_update",
+ "--output_json",
+ "/path/to/tmp/json",
+ "--revision",
+ "src/flutter@abcd1234",
+ "--refs",
+ "refs/heads/main"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
+ "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "DEPOT_TOOLS_REPORT_BUILD": "flutter/ci/Linux Engine/8945511751514863184",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "GIT_BRANCH": "",
+ "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
+ "GIT_HTTP_LOW_SPEED_TIME": "1800",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "LUCI_WORKDIR": "[START_DIR]",
+ "OS": "linux",
+ "REVISION": "abcd1234"
+ },
+ "env_prefixes": {
+ "PATH": [
+ "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
+ ]
+ },
+ "env_suffixes": {
+ "DEPOT_TOOLS_UPDATE": [
+ "0",
+ "0"
+ ],
+ "PATH": [
+ "RECIPE_REPO[depot_tools]",
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Checkout source code.bot_update",
+ "timeout": 900,
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Some step text@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcd1234\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcd1234\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/flutter\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcd1234\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcd1234\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcd1234\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
+ "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_REPO[depot_tools]/gclient.py",
+ "runhooks"
+ ],
+ "cwd": "[CACHE]/builder",
+ "env": {
+ "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
+ "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "DEPOT_TOOLS_REPORT_BUILD": "flutter/ci/Linux Engine/8945511751514863184",
+ "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
+ "GIT_BRANCH": "",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "LUCI_WORKDIR": "[START_DIR]",
+ "OS": "linux",
+ "REVISION": "abcd1234"
+ },
+ "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]",
+ "RECIPE_REPO[depot_tools]"
+ ]
+ },
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Checkout source code.gclient runhooks",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
},
{
+ "cmd": [],
+ "name": "download avd package"
+ },
+ {
"cmd": [
"cipd",
"ensure",
@@ -122,7 +323,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
"ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
@@ -407,245 +607,6 @@
]
},
{
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "listdir",
- "[CACHE]/builder"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Empty [CACHE]/builder",
- "~followup_annotations": [
- "@@@STEP_LOG_END@listdir@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Mount caches"
- },
- {
- "cmd": [
- "python3",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cat",
- "gs://flutter_archives_v2/caches/builder-linux.json"
- ],
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Mount caches.gsutil cat",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@"
- ]
- },
- {
- "cmd": [],
- "name": "Checkout source code"
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
- "--spec-path",
- "cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'src/flutter', 'url': 'https://flutter.googlesource.com/mirrors/engine'}]",
- "--revision_mapping_file",
- "{\"got_engine_revision\": \"src/flutter\"}",
- "--git-cache-dir",
- "[CACHE]/git",
- "--cleanup-dir",
- "[CLEANUP]/bot_update",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src/flutter@abcd1234",
- "--refs",
- "refs/heads/main"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "DEPOT_TOOLS_REPORT_BUILD": "flutter/ci/Linux Engine/8945511751514863184",
- "EMULATOR_PID": "17687",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "GIT_HTTP_LOW_SPEED_LIMIT": "102400",
- "GIT_HTTP_LOW_SPEED_TIME": "1800",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "abcd1234"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0",
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "infra_step": true,
- "luci_context": {
- "realm": {
- "name": "flutter:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout source code.bot_update",
- "timeout": 900,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@Some step text@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": \"abcd1234\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/flutter.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcd1234\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/flutter\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision\": \"abcd1234\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_engine_revision_cp\": \"refs/heads/main@{#84512}\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"9221bca00ddbd888260084def81f09543281b952\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src/flutter\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/flutter\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src/flutter.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"abcd1234\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"version\": 0@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision@\"abcd1234\"@@@",
- "@@@SET_BUILD_PROPERTY@got_engine_revision_cp@\"refs/heads/main@{#84512}\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@\"9221bca00ddbd888260084def81f09543281b952\"@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[CACHE]/builder",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "DEPOT_TOOLS_REPORT_BUILD": "flutter/ci/Linux Engine/8945511751514863184",
- "EMULATOR_PID": "17687",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "abcd1234"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]",
- "RECIPE_REPO[depot_tools]"
- ]
- },
- "luci_context": {
- "realm": {
- "name": "flutter:ci"
- },
- "resultdb": {
- "current_invocation": {
- "name": "invocations/build:8945511751514863184",
- "update_token": "token"
- },
- "hostname": "rdbhost"
- }
- },
- "name": "Checkout source code.gclient runhooks",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
"cmd": [],
"name": "ensure goma"
},
@@ -2365,43 +2326,15 @@
"name": "Scenario App Integration Tests"
},
{
+ "cmd": [],
+ "name": "kill and cleanup avd"
+ },
+ {
"cmd": [
"kill",
"-9",
"17687"
],
- "cwd": "[CACHE]/builder",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "ENGINE_CHECKOUT_PATH": "[CACHE]/builder",
- "GIT_BRANCH": "",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "LUCI_WORKDIR": "[START_DIR]",
- "OS": "linux",
- "REVISION": "abcd1234"
- },
- "env_prefixes": {
- "PATH": [
- "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
- ]
- },
- "env_suffixes": {
- "DEPOT_TOOLS_UPDATE": [
- "0"
- ],
- "PATH": [
- "RECIPE_REPO[depot_tools]"
- ]
- },
"luci_context": {
"realm": {
"name": "flutter:ci"
@@ -2414,7 +2347,33 @@
"hostname": "rdbhost"
}
},
- "name": "Kill emulator"
+ "name": "kill and cleanup avd.Kill emulator cleanup",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ps",
+ "-axww"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "flutter:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "kill and cleanup avd.list processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
},
{
"cmd": [],
diff --git a/recipes/engine/scenarios.py b/recipes/engine/scenarios.py
index 1b4918d..871395b 100644
--- a/recipes/engine/scenarios.py
+++ b/recipes/engine/scenarios.py
@@ -86,21 +86,19 @@
env, env_prefixes, api.properties.get('dependencies', [])
)
- api.android_virtual_device.start(env, env_prefixes)
- api.android_virtual_device.setup(env, env_prefixes)
api.repo_util.engine_checkout(cache_root, env, env_prefixes)
+ with api.android_virtual_device(env=env, env_prefixes=env_prefixes):
- with api.context(cwd=cache_root, env=env,
- env_prefixes=env_prefixes), api.depot_tools.on_path():
- gn_cmd = ['--android', '--android-cpu=x64', '--no-lto']
- api.build_util.run_gn(gn_cmd, checkout)
- api.build_util.build(
- 'android_debug_x64', checkout,
- ['scenario_app', 'flutter_shell_native_unittests']
- )
- RunAndroidUnitTests(api, env, env_prefixes)
- RunAndroidScenarioTests(api, env, env_prefixes)
- api.step('Kill emulator', ['kill', '-9', env['EMULATOR_PID']])
+ with api.context(cwd=cache_root, env=env,
+ env_prefixes=env_prefixes), api.depot_tools.on_path():
+ gn_cmd = ['--android', '--android-cpu=x64', '--no-lto']
+ api.build_util.run_gn(gn_cmd, checkout)
+ api.build_util.build(
+ 'android_debug_x64', checkout,
+ ['scenario_app', 'flutter_shell_native_unittests']
+ )
+ RunAndroidUnitTests(api, env, env_prefixes)
+ RunAndroidScenarioTests(api, env, env_prefixes)
with api.step.defer_results():
# This is to clean up leaked processes.
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 af0d8ac..242e722 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_clean_exit.json
@@ -183,26 +183,36 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "-ensure-file",
+ "flutter_internal/tools/curl/${platform} latest",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (2)",
+ "~followup_annotations": [
+ "@@@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\": \"flutter_internal/tools/curl/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": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "cmd": [],
+ "name": "download avd package"
},
{
"cmd": [
@@ -217,7 +227,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android/sdk",
"ANDROID_NDK_PATH": "[CACHE]/android/ndk",
@@ -239,7 +248,8 @@
"env_prefixes": {
"PATH": [
"[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl"
]
},
"env_suffixes": {
@@ -267,34 +277,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CLEANUP]/tmp_tmp_2/curl",
- "-ensure-file",
- "flutter_internal/tools/curl/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_installed (2)",
- "~followup_annotations": [
- "@@@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\": \"flutter_internal/tools/curl/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": [],
"name": "start avd"
},
@@ -327,6 +309,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -375,6 +365,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -422,6 +420,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.Set execute permission",
"~followup_annotations": [
@@ -455,6 +461,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.avd_setup.sh",
"timeout": 3600,
@@ -502,8 +516,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter config --no-analytics",
@@ -542,8 +556,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter doctor",
@@ -584,8 +598,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter devices",
@@ -625,8 +639,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -671,8 +685,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "Android Views Integration Tests",
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 b3fba1b..1904a94 100644
--- a/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
+++ b/recipes/flutter/android_views.expected/flutter_drive_zombie_process.json
@@ -183,26 +183,36 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "-ensure-file",
+ "flutter_internal/tools/curl/${platform} latest",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (2)",
+ "~followup_annotations": [
+ "@@@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\": \"flutter_internal/tools/curl/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": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "cmd": [],
+ "name": "download avd package"
},
{
"cmd": [
@@ -217,7 +227,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android/sdk",
"ANDROID_NDK_PATH": "[CACHE]/android/ndk",
@@ -239,7 +248,8 @@
"env_prefixes": {
"PATH": [
"[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl"
]
},
"env_suffixes": {
@@ -267,34 +277,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CLEANUP]/tmp_tmp_2/curl",
- "-ensure-file",
- "flutter_internal/tools/curl/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_installed (2)",
- "~followup_annotations": [
- "@@@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\": \"flutter_internal/tools/curl/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": [],
"name": "start avd"
},
@@ -327,6 +309,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -375,6 +365,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"env_suffixes": {
"DEPOT_TOOLS_UPDATE": [
"0"
@@ -422,6 +420,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.Set execute permission",
"~followup_annotations": [
@@ -455,6 +461,14 @@
"REVISION": "12345abcde12345abcde12345abcde12345abcde",
"SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
},
+ "env_prefixes": {
+ "PATH": [
+ "[START_DIR]/flutter sdk/bin",
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
+ ]
+ },
"infra_step": true,
"name": "avd setup.avd_setup.sh",
"timeout": 3600,
@@ -502,8 +516,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter config --no-analytics",
@@ -542,8 +556,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter doctor",
@@ -584,8 +598,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter devices",
@@ -625,8 +639,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -671,8 +685,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "Android Views Integration Tests",
diff --git a/recipes/flutter/android_views.py b/recipes/flutter/android_views.py
index 564a06e..46adee7 100644
--- a/recipes/flutter/android_views.py
+++ b/recipes/flutter/android_views.py
@@ -49,11 +49,7 @@
env, env_prefixes, api.properties.get('dependencies', [])
)
- deps = api.properties.get('dependencies', [])
- dep_list = {d['dependency']: d.get('version') for d in deps}
- with api.android_virtual_device(env=env, env_prefixes=env_prefixes,
- version=dep_list.get('android_virtual_device',
- None)):
+ with api.android_virtual_device(env=env, env_prefixes=env_prefixes):
with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
with api.step.nest('prepare environment'), api.step.defer_results():
# This prevents junk analytics from being sent due to testing
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 dc08e94..7ec83d2 100644
--- a/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
+++ b/recipes/flutter/deferred_components.expected/flutter_release_clean_exit.json
@@ -183,26 +183,36 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "-ensure-file",
+ "flutter_internal/tools/curl/${platform} latest",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (2)",
+ "~followup_annotations": [
+ "@@@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\": \"flutter_internal/tools/curl/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": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "cmd": [],
+ "name": "download avd package"
},
{
"cmd": [
@@ -217,7 +227,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android/sdk",
"ANDROID_NDK_PATH": "[CACHE]/android/ndk",
@@ -239,7 +248,8 @@
"env_prefixes": {
"PATH": [
"[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl"
]
},
"env_suffixes": {
@@ -267,34 +277,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CLEANUP]/tmp_tmp_2/curl",
- "-ensure-file",
- "flutter_internal/tools/curl/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_installed (2)",
- "~followup_annotations": [
- "@@@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\": \"flutter_internal/tools/curl/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": [],
"name": "start avd"
},
@@ -331,8 +313,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"env_suffixes": {
@@ -387,8 +369,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"env_suffixes": {
@@ -442,8 +424,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -483,8 +465,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -534,8 +516,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter config --no-analytics",
@@ -574,8 +556,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter doctor",
@@ -616,8 +598,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter devices",
@@ -657,8 +639,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -706,8 +688,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.ensure_installed",
@@ -756,8 +738,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "download assets script"
@@ -794,8 +776,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "Deferred components release tests",
@@ -803,92 +785,6 @@
},
{
"cmd": [],
- "name": "kill and cleanup avd"
- },
- {
- "cmd": [
- "kill",
- "-9",
- "17687"
- ],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
- "name": "kill and cleanup avd.Kill emulator cleanup",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "ps",
- "-axww"
- ],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
- "name": "kill and cleanup avd.list processes",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@raw_io.output_text@@@"
- ]
- },
- {
- "cmd": [],
"name": "Killing Processes"
},
{
@@ -896,36 +792,6 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill chrome",
"~followup_annotations": [
@@ -937,36 +803,6 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill dart",
"~followup_annotations": [
@@ -978,36 +814,6 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill flutter",
"~followup_annotations": [
@@ -1019,36 +825,6 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill java",
"~followup_annotations": [
@@ -1060,36 +836,6 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill adb",
"~followup_annotations": [
@@ -1105,40 +851,36 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "OS info (2)"
},
{
+ "cmd": [],
+ "name": "kill and cleanup avd"
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "17687"
+ ],
+ "name": "kill and cleanup avd.Kill emulator cleanup",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ps",
+ "-axww"
+ ],
+ "name": "kill and cleanup avd.list processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
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 a8341a9..c6c97c2 100644
--- a/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
+++ b/recipes/flutter/deferred_components.expected/flutter_release_zombie_process.json
@@ -183,26 +183,36 @@
]
},
{
- "cmd": [],
- "name": "download avd package"
+ "cmd": [
+ "cipd",
+ "ensure",
+ "-root",
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "-ensure-file",
+ "flutter_internal/tools/curl/${platform} latest",
+ "-max-threads",
+ "0",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "ensure_installed (2)",
+ "~followup_annotations": [
+ "@@@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\": \"flutter_internal/tools/curl/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": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/avd"
- ],
- "infra_step": true,
- "name": "download avd package.Ensure avd cache",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
+ "cmd": [],
+ "name": "download avd package"
},
{
"cmd": [
@@ -217,7 +227,6 @@
"-json-output",
"/path/to/tmp/json"
],
- "cwd": "[CACHE]/avd",
"env": {
"ANDROID_HOME": "[CACHE]/android/sdk",
"ANDROID_NDK_PATH": "[CACHE]/android/ndk",
@@ -239,7 +248,8 @@
"env_prefixes": {
"PATH": [
"[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin"
+ "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
+ "[CLEANUP]/tmp_tmp_2/curl"
]
},
"env_suffixes": {
@@ -267,34 +277,6 @@
]
},
{
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CLEANUP]/tmp_tmp_2/curl",
- "-ensure-file",
- "flutter_internal/tools/curl/${platform} latest",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_installed (2)",
- "~followup_annotations": [
- "@@@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\": \"flutter_internal/tools/curl/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": [],
"name": "start avd"
},
@@ -331,8 +313,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"env_suffixes": {
@@ -387,8 +369,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"env_suffixes": {
@@ -442,8 +424,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -483,8 +465,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -534,8 +516,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter config --no-analytics",
@@ -574,8 +556,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter doctor",
@@ -616,8 +598,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.flutter devices",
@@ -657,8 +639,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"infra_step": true,
@@ -706,8 +688,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "prepare environment.ensure_installed",
@@ -756,8 +738,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "download assets script"
@@ -794,8 +776,8 @@
"PATH": [
"[START_DIR]/flutter sdk/bin",
"[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
+ "[CLEANUP]/tmp_tmp_2/curl",
+ "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools"
]
},
"name": "Deferred components release tests",
@@ -803,133 +785,6 @@
},
{
"cmd": [],
- "name": "kill and cleanup avd"
- },
- {
- "cmd": [
- "kill",
- "-9",
- "17687"
- ],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
- "name": "kill and cleanup avd.Kill emulator cleanup",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "ps",
- "-axww"
- ],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
- "name": "kill and cleanup avd.list processes",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_END@raw_io.output_text@@@"
- ]
- },
- {
- "cmd": [
- "kill",
- "-9",
- "12345"
- ],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
- "name": "kill and cleanup avd.Kill zombie processes",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
"name": "Killing Processes"
},
{
@@ -937,36 +792,6 @@
"pkill",
"chrome"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill chrome",
"~followup_annotations": [
@@ -978,36 +803,6 @@
"pkill",
"dart"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill dart",
"~followup_annotations": [
@@ -1019,36 +814,6 @@
"pkill",
"flutter"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill flutter",
"~followup_annotations": [
@@ -1060,36 +825,6 @@
"pkill",
"java"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill java",
"~followup_annotations": [
@@ -1101,36 +836,6 @@
"pkill",
"adb"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "Killing Processes.kill adb",
"~followup_annotations": [
@@ -1146,40 +851,47 @@
"-o",
"%MEM"
],
- "cwd": "[START_DIR]/flutter sdk/dev/integration_tests/deferred_components_test",
- "env": {
- "ADB_PATH": "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools/adb",
- "ANDROID_HOME": "[CACHE]/android/sdk",
- "ANDROID_NDK_PATH": "[CACHE]/android/ndk",
- "ANDROID_SDK_HOME": "[CLEANUP]/tmp_tmp_1",
- "ANDROID_SDK_ROOT": "[CACHE]/android/sdk",
- "ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
- "AVD_ROOT": "[CACHE]/avd",
- "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "EMULATOR_PID": "17687",
- "GIT_BRANCH": "",
- "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
- "GRADLE_USER_HOME": "[CACHE]/gradle",
- "LUCI_BRANCH": "",
- "LUCI_CI": "True",
- "LUCI_PR": "",
- "OS": "linux",
- "PUB_CACHE": "[START_DIR]/.pub-cache",
- "REVISION": "12345abcde12345abcde12345abcde12345abcde",
- "SDK_CHECKOUT_PATH": "[START_DIR]/flutter sdk"
- },
- "env_prefixes": {
- "PATH": [
- "[START_DIR]/flutter sdk/bin",
- "[START_DIR]/flutter sdk/bin/cache/dart-sdk/bin",
- "[CACHE]/avd/src/third_party/android_sdk/public/platform-tools",
- "[CLEANUP]/tmp_tmp_2/curl"
- ]
- },
"infra_step": true,
"name": "OS info (2)"
},
{
+ "cmd": [],
+ "name": "kill and cleanup avd"
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "17687"
+ ],
+ "name": "kill and cleanup avd.Kill emulator cleanup",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ps",
+ "-axww"
+ ],
+ "name": "kill and cleanup avd.list processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@raw_io.output_text@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "kill",
+ "-9",
+ "12345"
+ ],
+ "name": "kill and cleanup avd.Kill zombie processes",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/flutter/deferred_components.py b/recipes/flutter/deferred_components.py
index e8dba76..700a587 100644
--- a/recipes/flutter/deferred_components.py
+++ b/recipes/flutter/deferred_components.py
@@ -53,66 +53,56 @@
ref=api.properties.get('git_ref'),
)
- avd_api_version = '31' # 31 is the first version that supports x86_64
- for dep in api.properties.get('dependencies', []):
- if dep['dependency'] == 'android_virtual_device':
- avd_api_version = dep['version']
- break
-
env, env_prefixes = api.repo_util.flutter_environment(checkout_path)
api.flutter_deps.required_deps(
env, env_prefixes, api.properties.get('dependencies', [])
)
- api.android_virtual_device.start(env, env_prefixes)
- api.android_virtual_device.setup(env, env_prefixes)
-
- bundletool_dir = cache_root.join('bundletool')
- bundletool_jar = bundletool_dir.join('bundletool.jar')
- with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
- with api.step.nest('prepare environment'), api.step.defer_results():
- # This prevents junk analytics from being sent due to testing
- api.step(
- 'flutter config --no-analytics',
- ['flutter', 'config', '--no-analytics'],
- )
- api.step(
- 'flutter doctor',
- ['flutter', 'doctor'],
- )
- api.step(
- 'flutter devices',
- ['flutter', 'devices', '--device-timeout=40', '--verbose'],
- )
- api.step(
- 'download dependencies',
- ['flutter', 'update-packages', '-v'],
- infra_step=True,
- )
- api.cipd.ensure(
- bundletool_dir,
- api.cipd.EnsureFile().add_package(
- 'flutter/android/bundletool',
- '0xeDa85nRhdQfi3iN2dK8PPluwI73z9San_Afuj3CfgC'
- )
- )
- test_dir = checkout_path.join(
- 'dev', 'integration_tests', 'deferred_components_test'
- )
- with api.context(env=env, env_prefixes=env_prefixes,
- cwd=test_dir), api.step.defer_results():
- # These assets are not allowed to be checked into the repo,
- # so they are downloaded separately here.
- api.step('download assets script', ['./download_assets.sh'])
- api.step(
- 'Deferred components release tests',
- ['./run_release_test.sh',
- str(bundletool_jar), env['ADB_PATH']],
- timeout=700,
+ with api.android_virtual_device(env=env, env_prefixes=env_prefixes):
+ bundletool_dir = cache_root.join('bundletool')
+ bundletool_jar = bundletool_dir.join('bundletool.jar')
+ with api.context(env=env, env_prefixes=env_prefixes, cwd=checkout_path):
+ with api.step.nest('prepare environment'), api.step.defer_results():
+ # This prevents junk analytics from being sent due to testing
+ api.step(
+ 'flutter config --no-analytics',
+ ['flutter', 'config', '--no-analytics'],
+ )
+ api.step(
+ 'flutter doctor',
+ ['flutter', 'doctor'],
+ )
+ api.step(
+ 'flutter devices',
+ ['flutter', 'devices', '--device-timeout=40', '--verbose'],
+ )
+ api.step(
+ 'download dependencies',
+ ['flutter', 'update-packages', '-v'],
+ infra_step=True,
+ )
+ api.cipd.ensure(
+ bundletool_dir,
+ api.cipd.EnsureFile().add_package(
+ 'flutter/android/bundletool',
+ '0xeDa85nRhdQfi3iN2dK8PPluwI73z9San_Afuj3CfgC'
+ )
+ )
+ test_dir = checkout_path.join(
+ 'dev', 'integration_tests', 'deferred_components_test'
)
- # TODO(garyq): add flutter drive tests after https://github.com/flutter/flutter/issues/88906 is resolved
+ with api.context(env=env, env_prefixes=env_prefixes,
+ cwd=test_dir), api.step.defer_results():
+ # These assets are not allowed to be checked into the repo,
+ # so they are downloaded separately here.
+ api.step('download assets script', ['./download_assets.sh'])
+ api.step(
+ 'Deferred components release tests',
+ ['./run_release_test.sh',
+ str(bundletool_jar), env['ADB_PATH']],
+ timeout=700,
+ )
- api.android_virtual_device.kill(env['EMULATOR_PID'])
# This is to clean up leaked processes.
api.os_utils.kill_processes()
# Collect memory/cpu/process after task execution.
