Enable cache micro manager for non devicelab bots.
The management of the osx_sdk dir on devicelab will happen via salt.
Change-Id: Iffb8eee935492f3c265c9724d544dddd21a1cea1
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/54461
Reviewed-by: Keyong Han <keyonghan@google.com>
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Ricardo Amador <ricardoamador@google.com>
Reviewed-by: Victoria Ashworth <vashworth@google.com>
diff --git a/recipe_modules/cache_micro_manager/api.py b/recipe_modules/cache_micro_manager/api.py
index 1ee26f8..331842f 100644
--- a/recipe_modules/cache_micro_manager/api.py
+++ b/recipe_modules/cache_micro_manager/api.py
@@ -102,6 +102,7 @@
Args:
* deps_list(list[str]): the list of dependencies that are currently being used.
"""
+
self._initialize(target_dir=target_dir)
with self.m.step.nest('Running Cache Micro Manager on {}.'.format(
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 950bebb..35a5bd9 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -836,6 +836,44 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -943,6 +981,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
index b63ea20..15ceb06 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
@@ -836,6 +836,44 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -943,6 +981,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index fcb19e4..70bad65 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -7,8 +7,6 @@
Available only to Google-run bots."""
-import os
-
from contextlib import contextmanager
from recipe_engine import recipe_api
@@ -211,8 +209,9 @@
def _setup_osx_sdk(self, kind, devicelab):
app = None
self._clean_xcode_cache(devicelab)
- #TODO reenable after fixing type issues on path
- # self._micro_manage_cache(devicelab=devicelab)
+ # NOTE: cleaning of the cache on devicelab will happen via salt.
+ if not devicelab:
+ self._micro_manage_cache(devicelab=devicelab)
app = self._ensure_sdk(kind, devicelab)
self.m.os_utils.kill_simulators()
self._select_xcode(app)
@@ -430,21 +429,26 @@
return sdk_app
- # def _micro_manage_cache(self, devicelab):
- # cache_path = self._get_xcode_base_cache_path(devicelab)
- # app_dir = self._xcode_dir(devicelab)
- # self.m.step("show app_dir", ['echo', app_dir])
- # self._show_xcode_cache(devicelab=devicelab)
- # self.m.cache_micro_manager.run(cache_path, [app_dir])
- # self._show_xcode_cache(devicelab=devicelab)
+ def _micro_manage_cache(self, devicelab: bool):
+ """Tracks the age of packages in the target cache. If older than a
+ specific date then delete them.
- # def _show_xcode_cache(self, devicelab):
- # cache_path = self._get_xcode_base_cache_path(devicelab)
- # self.m.step(
- # 'Show xcode cache',
- # ['ls', '-al', cache_path],
- # ok_ret='any',
- # )
+ Params:
+ devicelab: (bool) tells the module which path we should be working with.
+ """
+ cache_path = self._get_xcode_base_cache_path(devicelab)
+ app_dir = self._xcode_dir(devicelab)
+ self.m.step("show app_dir", ['echo', app_dir])
+ self._show_xcode_cache(cache_path)
+ self.m.cache_micro_manager.run(cache_path, [app_dir])
+ self._show_xcode_cache(cache_path)
+
+ def _show_xcode_cache(self, cache_path):
+ self.m.step(
+ 'Show xcode cache',
+ ['ls', '-al', cache_path],
+ ok_ret='any',
+ )
def _install_runtimes(self, devicelab, app_dir, tool_dir, sdk_app, kind):
"""Ensure runtimes are installed.
diff --git a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
index 3fdce75..d29957a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9c40b"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -107,6 +145,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9c40b"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
index 409c374..ecde586 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_12a7209"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -107,6 +145,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_12a7209"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
index 6cab448..383cd1b 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
index ff75dbd..7dd0117 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
@@ -13,6 +13,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -120,6 +158,44 @@
"name": "Cleaning up Xcode cache (2)"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
index f13203c..65c4cba 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-14-0_ios-13-0"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
index 50e08de..b79dec8 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
@@ -13,6 +13,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -120,6 +158,44 @@
"name": "Cleaning up Xcode cache (2)"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
index f1a4c71..965a93a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
@@ -9,6 +9,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
index b4af18f..92aa58a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
@@ -9,6 +9,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipe_modules/osx_sdk/examples/full.expected/mac.json
index 2c52246..c0f64a0 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -107,6 +145,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
index 10cee45..2e522b5 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -115,6 +153,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
index 58f2081..f39004f 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
@@ -9,6 +9,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -258,6 +296,44 @@
"name": "Cleaning up Xcode cache (2)"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
index 8b1249e..5a0045a 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
index e133f08..1494ee8 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
index 4bc663e..f168003 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
@@ -9,6 +9,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
index e3d5e04..39addcd 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_fails_to_find_dmg.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
index 201274f..3657e4d 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
index 1c5586c..80ac145 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
@@ -1,5 +1,43 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -115,6 +153,44 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
index 4a13c71..c4d40f9 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
@@ -1,5 +1,52 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Reading cache directory [CACHE]/osx_sdk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -164,6 +211,53 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Reading cache directory [CACHE]/osx_sdk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
index 7eaec5a..d27f45c 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails_passes_on_retry.json
@@ -1,5 +1,52 @@
[
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Reading cache directory [CACHE]/osx_sdk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode",
"~followup_annotations": [
@@ -549,6 +596,53 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "infra_step": true,
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [
+ "vpython3",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "listdir",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Reading cache directory [CACHE]/osx_sdk",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_END@listdir@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index 5084398..9aadaed 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -499,6 +499,143 @@
"name": "dart pub get (2)"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -837,6 +974,143 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_deadbeef"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
+ "env": {
+ "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
+ "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
+ "GIT_BRANCH": "master",
+ "LUCI_BRANCH": "",
+ "LUCI_CI": "True",
+ "LUCI_PR": "",
+ "OS": "darwin",
+ "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",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin",
+ "[CLEANUP]/tmp_tmp_1/flutter sdk/bin/cache/dart-sdk/bin"
+ ]
+ },
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "project:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 556867b..9256b99 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -470,6 +470,80 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "show app_dir"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk."
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (2)"
+ },
+ {
"cmd": [],
"name": "install xcode"
},
@@ -661,6 +735,80 @@
"name": "Cleaning up Xcode cache"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "show app_dir (2)"
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (3)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2)"
+ },
+ {
+ "cmd": [],
+ "name": "Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Show xcode cache (4)"
+ },
+ {
"cmd": [],
"name": "install xcode (2)"
},
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index 5c27fb5..e179752 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -643,6 +643,92 @@
"name": "Global generators"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk.",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode",
"~followup_annotations": [
@@ -852,6 +938,92 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (3)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "flutter:prod"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (4)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode (2)",
"~followup_annotations": [
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 26e88ad..b13f695 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -696,6 +696,92 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk.",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode",
"~followup_annotations": [
@@ -905,6 +991,92 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (3)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "dart-internal:flutter"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (4)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode (2)",
"~followup_annotations": [
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index 6f4eb94..2adb691 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -1119,6 +1119,92 @@
"name": "Global generators"
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk.",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk..Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode",
"~followup_annotations": [
@@ -1328,6 +1414,92 @@
]
},
{
+ "cmd": [
+ "echo",
+ "[CACHE]/osx_sdk/xcode_9f2000"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.show app_dir (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (3)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "Global generators.Running Cache Micro Manager on [CACHE]/osx_sdk. (2).Cache Micro Manager, cache directory exists check",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@2@@@",
+ "@@@STEP_TEXT@Cache dir does not exist, skipping.@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "ls",
+ "-al",
+ "[CACHE]/osx_sdk"
+ ],
+ "infra_step": true,
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "Global generators.Show xcode cache (4)",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"cmd": [],
"name": "Global generators.install xcode (2)",
"~followup_annotations": [
