Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (build, depot_tools, fuchsia) into this repository.
Please review the expectation changes, and LGTM+CQ.
build:
https://crrev.com/34226506ece18dad4ef68c23f62ba6a754798615 (gbeaty@chromium.org)
Stop testing M84 builders in led_recipes_tester.
https://crrev.com/d7a1fcd2ea076c86c8af5e78b47215a8351ab414 (hypan@google.com)
recipe: Add a trybot for the builder android-cronet-marshmallow-arm64-rel
https://crrev.com/52355dd638f0d2faf4057c23112efb0c261bde0a (wuwang@chromium.org)
Revert "Temporary add enable_wpr_tests on android-marshmallow-arm64-rel and Android Release (Nexus 5X)"
depot_tools:
https://crrev.com/d410c664e6e371f8b2ba32be75de2c4adfea3fb9 (bpastene@chromium.org)
gclient: Preserve ANSI color codes when calling hooks.
fuchsia:
https://crrev.com/69a91fad75c6bcf14d5bfb0bdd51522d43bfdf2e (nmulcahey@google.com)
[macossdk] Only copy SDK if it is missing.
https://crrev.com/700fea05e37bbb2e8c323a54450b88a0c8ab9fd9 (nmulcahey@google.com)
[owners] Remove nmulcahey@
https://crrev.com/f20d9d61fdfdfc9e0d03dd18f5b0f6dbc4c2897c (nmulcahey@google.com)
[vdl][aemu] Track `aemu` by the `integration` ref.
https://crrev.com/bd02d880d0a95694248dde39f8d6cebbfabe2ecd (olivernewman@google.com)
Revert "[utils] Add @context decorator"
More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.
R=godofredoc@google.com, keyonghan@google.com, wutong@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I5576874537337f5cc0e574946dcd9731197e2f54
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/6001
Commit-Queue: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 5c703c5..325eb39 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -23,17 +23,17 @@
"deps": {
"build": {
"branch": "refs/heads/master",
- "revision": "75ea2f6081da8c342e7364a811d0bbabf0d2596a",
+ "revision": "54f9aa0f620ab4b76ff32a518d40ded51134d4f1",
"url": "https://chromium.googlesource.com/chromium/tools/build"
},
"depot_tools": {
"branch": "refs/heads/master",
- "revision": "c6aa15118046ed881094f1d97061bdb92ba7a149",
+ "revision": "d410c664e6e371f8b2ba32be75de2c4adfea3fb9",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/master",
- "revision": "a71e9b50c8fe9322e2d451c136748bcda8baae65",
+ "revision": "bd02d880d0a95694248dde39f8d6cebbfabe2ecd",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
diff --git a/recipes/femu_test_1_20_0.expected/no_zircon_file.json b/recipes/femu_test_1_20_0.expected/no_zircon_file.json
index 58368c7..3061ce2 100644
--- a/recipes/femu_test_1_20_0.expected/no_zircon_file.json
+++ b/recipes/femu_test_1_20_0.expected/no_zircon_file.json
@@ -604,7 +604,7 @@
"-root",
"[CACHE]/builder/aemu",
"-ensure-file",
- "fuchsia/third_party/aemu/${platform} git_revision:1e1851f8e59d8722f219bcc115d7d26288b246a9",
+ "fuchsia/third_party/aemu/${platform} integration",
"-max-threads",
"0",
"-json-output",
@@ -635,7 +635,7 @@
"@@@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-git_revision:1e1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-integration-----\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/aemu/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json b/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
index cb6fecf..2120261 100644
--- a/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
+++ b/recipes/femu_test_1_20_0.expected/start_femu_with_vdl.json
@@ -604,7 +604,7 @@
"-root",
"[CACHE]/builder/aemu",
"-ensure-file",
- "fuchsia/third_party/aemu/${platform} git_revision:1e1851f8e59d8722f219bcc115d7d26288b246a9",
+ "fuchsia/third_party/aemu/${platform} integration",
"-max-threads",
"0",
"-json-output",
@@ -635,7 +635,7 @@
"@@@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-git_revision:1e1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-integration-----\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/aemu/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
