Add ENGINE_PATH env to engine_metrics recipe.
This is required for the benchmarks scripts to work correctly as tests
independently of the recipe.
Bug: https://github.com/flutter/flutter/issues/127678
Change-Id: I679face37a5ea34c802b5689591e1f9866cfe26e
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/45050
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Keyong Han <keyonghan@google.com>
diff --git a/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json b/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json
index 31ab90e..d79d1d0 100644
--- a/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json
+++ b/recipes/engine/engine_metrics.expected/basic_upload_metrics_False.json
@@ -174,6 +174,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -230,6 +231,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -287,6 +289,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -333,6 +336,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -383,6 +387,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -425,6 +430,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_DIR": "[CACHE]/goma/client",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -460,6 +466,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -503,6 +510,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -542,6 +550,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -586,6 +595,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -624,6 +634,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -659,6 +670,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -700,6 +712,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -734,6 +747,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -777,6 +791,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -816,6 +831,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -860,6 +876,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -898,6 +915,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -929,6 +947,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -950,6 +969,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -971,6 +991,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -992,6 +1013,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1013,6 +1035,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1034,6 +1057,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1059,6 +1083,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1104,6 +1129,7 @@
"cwd": "[CACHE]/builder/src/flutter/testing/benchmark",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GCP_PROJECT": "flutter-cirrus",
"TOKEN_PATH": "[CLEANUP]/tmp_tmp_1"
diff --git a/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json b/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json
index a2bbc94..d340e63 100644
--- a/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json
+++ b/recipes/engine/engine_metrics.expected/basic_upload_metrics_True.json
@@ -174,6 +174,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -230,6 +231,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -287,6 +289,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -333,6 +336,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -383,6 +387,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -425,6 +430,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_DIR": "[CACHE]/goma/client",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -460,6 +466,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -503,6 +510,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -542,6 +550,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -586,6 +595,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -624,6 +634,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -659,6 +670,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -700,6 +712,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -734,6 +747,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -777,6 +791,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -816,6 +831,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GLOG_log_dir": "[CLEANUP]",
"GOMA_CACHE_DIR": "[CACHE]/goma",
@@ -860,6 +876,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -898,6 +915,7 @@
],
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GOMA_TMP_DIR": "[CLEANUP]/goma",
"GOMA_USE_LOCAL": "False"
@@ -929,6 +947,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -950,6 +969,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -971,6 +991,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -992,6 +1013,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1013,6 +1035,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1034,6 +1057,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1059,6 +1083,7 @@
"cwd": "[CACHE]/builder/src/out/host_release",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True"
},
"env_prefixes": {
@@ -1103,6 +1128,7 @@
"cwd": "[CACHE]/builder/src/flutter/testing/benchmark",
"env": {
"ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
+ "ENGINE_PATH": "[CACHE]/builder",
"FLUTTER_PREBUILT_DART_SDK": "True",
"GCP_PROJECT": "flutter-cirrus",
"TOKEN_PATH": "[CLEANUP]/tmp_tmp_1"
diff --git a/recipes/engine/engine_metrics.py b/recipes/engine/engine_metrics.py
index 96ffced..db4e5a5 100644
--- a/recipes/engine/engine_metrics.py
+++ b/recipes/engine/engine_metrics.py
@@ -36,6 +36,7 @@
}
env_prefixes = {'PATH': [dart_bin]}
api.repo_util.engine_checkout(cache_root, env, env_prefixes)
+ env['ENGINE_PATH'] = cache_root
with api.depot_tools.on_path(), api.context(env=env,
env_prefixes=env_prefixes):
api.build_util.run_gn(['--runtime-mode', 'release', '--prebuilt-dart-sdk'],
