Roll engine to 06448ee8165f4ff6579ef9510ac69322eda896ac
Roller-URL: https://ci.chromium.org/b/8755378830250814833
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: Ib27ce43a0a6a5d0b7cb40f13d7016add2976d909
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/55400
Bot-Commit: flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/config/generated/ci_yaml/engine_config.json b/config/generated/ci_yaml/engine_config.json
index c57cfe5..09f1ced 100644
--- a/config/generated/ci_yaml/engine_config.json
+++ b/config/generated/ci_yaml/engine_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Linux linux_android_emulator_tests","timeout":60,"properties":{"config_name":"linux_android_emulator","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_opengles_tests","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_opengles","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_tests_api_33","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_api_33","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator_api_33.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","gclient_variables":"{\n \"download_emsdk\": \"true\",\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Windows builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","gclient_variables":"{\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Mac builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","ignore_cache_paths":"[\n \"builder/src/flutter/prebuilts/SDKs\",\n \"builder/src/flutter/prebuilts/Library\"\n]","gclient_variables":"{\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Linux linux_benchmarks","timeout":60,"properties":{"config_name":"linux_benchmarks"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/builder"},{"name":"Linux linux_fuchsia","timeout":60,"properties":{"release_build":"true","config_name":"linux_fuchsia"},"recipe":"engine_v2/engine_v2","dimensions":{"kvm":"1"},"droneDimensions":["os=Linux"]},{"name":"Linux linux_clang_tidy","timeout":120,"properties":{"config_name":"linux_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_arm_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_engine","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_desktop_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_desktop_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_debug_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_debug_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_license","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"linux_license","clobber":"true"},"recipe":"engine_v2/builder"},{"name":"Linux linux_web_engine","timeout":120,"properties":{"release_build":"true","config_name":"linux_web_engine"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_unopt","timeout":120,"properties":{"config_name":"linux_unopt"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32","gclient_variables":"{\"download_emsdk\": true}","dependencies":"[\n {\"dependency\": \"chrome_and_driver\", \"version\": \"version:119.0.6045.9\"},\n {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","no_goma":"true","drone_dimensions":"[\"device_type=none\", \"os=Linux\"]\n","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main"],"recipe":"engine/web_engine_framework"},{"name":"Linux mac_android_aot_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Mac mac_clang_tidy","timeout":120,"properties":{"config_name":"mac_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert","**.m","**.mm"],"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_host_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","cpu":"arm64","config_name":"mac_host_engine","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13"]},{"name":"Linux mac_unopt","timeout":120,"properties":{"config_name":"mac_unopt","add_recipes_cq":"true"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_ios_engine","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13","cpu=x86"]},{"name":"Mac impeller-cmake-example","bringup":true,"timeout":60,"properties":{"cpu":"arm64","config_name":"mac_impeller_cmake_example"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"windows_arm_host_engine"},"enabledBranches":["main"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_unopt","timeout":120,"properties":{"config_name":"windows_unopt"},"recipe":"engine_v2/builder"},{"name":"Linux ci_yaml engine roller","bringup":true,"properties":{"backfill":"false"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+","fuchsia_r\\d+[a-z]*"],"platformProperties":{"linux":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"},\n {\"dependency\": \"gradle_cache\", \"version\": \"none\"}\n]","device_type":"none","os":"Ubuntu","cores":"8"}},"mac":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Mac-13","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"}},"windows":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Windows-10"}}}}
+{"targets":[{"name":"Linux linux_android_emulator_tests","timeout":60,"properties":{"config_name":"linux_android_emulator","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_opengles_tests","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_opengles","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_android_emulator_tests_api_33","bringup":true,"timeout":60,"properties":{"config_name":"linux_android_emulator_api_33","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"runIf":[".ci.yaml","ci/builders/linux_android_emulator_api_33.json","DEPS","lib/ui/**","shell/platform/android/**","testing/scenario_app/**"],"enabledBranches":["main"],"recipe":"engine_v2/engine_v2"},{"name":"Linux builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","gclient_variables":"{\n \"download_emsdk\": \"true\",\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Windows builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","gclient_variables":"{\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Mac builder_cache","timeout":60,"properties":{"cache_name":"builder","cache_root":"cache","cache_paths":"[\n \"builder\",\n \"git\"\n]","ignore_cache_paths":"[\n \"builder/src/flutter/prebuilts/SDKs\",\n \"builder/src/flutter/prebuilts/Library\"\n]","gclient_variables":"{\n \"download_android_deps\": \"true\"\n}"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/cache"},{"name":"Linux linux_benchmarks","timeout":60,"properties":{"config_name":"linux_benchmarks"},"presubmit":false,"enabledBranches":["main"],"recipe":"engine_v2/builder"},{"name":"Linux linux_fuchsia","timeout":60,"properties":{"release_build":"true","config_name":"linux_fuchsia"},"recipe":"engine_v2/engine_v2","dimensions":{"kvm":"1"},"droneDimensions":["os=Linux"]},{"name":"Linux linux_clang_tidy","timeout":120,"properties":{"config_name":"linux_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert"],"recipe":"engine_v2/engine_v2"},{"name":"Linux linux_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_arm_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_engine","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_host_desktop_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_host_desktop_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_android_debug_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"linux_android_debug_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_license","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"linux_license","clobber":"true"},"recipe":"engine_v2/builder"},{"name":"Linux linux_web_engine","timeout":120,"properties":{"release_build":"true","config_name":"linux_web_engine"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Linux linux_unopt","timeout":120,"properties":{"config_name":"linux_unopt"},"recipe":"engine_v2/engine_v2"},{"name":"Linux Web Framework tests","timeout":60,"properties":{"add_recipes_cq":"true","cores":"32","gclient_variables":"{\"download_emsdk\": true}","dependencies":"[\n {\"dependency\": \"chrome_and_driver\", \"version\": \"version:119.0.6045.9\"},\n {\"dependency\": \"curl\", \"version\": \"version:7.64.0\"}\n]","framework":"true","no_goma":"true","drone_dimensions":"[\"device_type=none\", \"os=Linux\"]\n","shard":"web_tests","subshards":"[\"0\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7_last\"]"},"runIf":["DEPS",".ci.yaml","lib/web_ui/**","web_sdk/**","tools/**","ci/**","flutter_frontend_server/**"],"enabledBranches":["main"],"recipe":"engine/web_engine_framework"},{"name":"Linux mac_android_aot_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Linux"]},{"name":"Mac mac_clang_tidy","timeout":120,"properties":{"config_name":"mac_clang_tidy"},"runIf":["DEPS",".ci.yaml","tools/clang_tidy/**","ci/builders/**","ci/clang_tidy.sh","**.h","**.c","**.cc","**.fbs","**.frag","**.vert","**.m","**.mm"],"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_host_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","cpu":"arm64","config_name":"mac_host_engine","dependencies":"[\n {\"dependency\": \"goldctl\", \"version\": \"git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd\"}\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13"]},{"name":"Mac mac_unopt","bringup":true,"timeout":120,"properties":{"config_name":"mac_unopt","add_recipes_cq":"true"},"recipe":"engine_v2/engine_v2"},{"name":"Mac mac_ios_engine","timeout":240,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"mac_ios_engine","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Mac-13","cpu=x86"]},{"name":"Mac impeller-cmake-example","bringup":true,"timeout":60,"properties":{"cpu":"arm64","config_name":"mac_impeller_cmake_example"},"recipe":"engine_v2/engine_v2"},{"name":"Windows windows_android_aot_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_android_aot_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","release_build":"true","config_name":"windows_host_engine"},"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_arm_host_engine","timeout":120,"properties":{"add_recipes_cq":"true","config_name":"windows_arm_host_engine"},"enabledBranches":["main"],"recipe":"engine_v2/engine_v2","droneDimensions":["os=Windows"]},{"name":"Windows windows_unopt","timeout":120,"properties":{"config_name":"windows_unopt"},"recipe":"engine_v2/builder"},{"name":"Linux ci_yaml engine roller","bringup":true,"properties":{"backfill":"false"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+","fuchsia_r\\d+[a-z]*"],"platformProperties":{"linux":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"},\n {\"dependency\": \"gradle_cache\", \"version\": \"none\"}\n]","device_type":"none","os":"Ubuntu","cores":"8"}},"mac":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Mac-13","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"}},"windows":{"properties":{"dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:17\"}\n]","device_type":"none","os":"Windows-10"}}}}
diff --git a/config/generated/flutter/luci/commit-queue.cfg b/config/generated/flutter/luci/commit-queue.cfg
index 76f5dc1..026f610 100644
--- a/config/generated/flutter/luci/commit-queue.cfg
+++ b/config/generated/flutter/luci/commit-queue.cfg
@@ -113,15 +113,15 @@
name: "flutter/try/Linux mac_android_aot_engine"
}
builders {
- name: "flutter/try/Linux mac_unopt"
- }
- builders {
name: "flutter/try/Mac mac_host_engine"
}
builders {
name: "flutter/try/Mac mac_ios_engine"
}
builders {
+ name: "flutter/try/Mac mac_unopt"
+ }
+ builders {
name: "flutter/try/Windows windows_android_aot_engine"
}
builders {
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 801a8f2..4168c69 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -6636,102 +6636,6 @@
}
}
builders {
- name: "Linux mac_unopt"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8"
- dimensions: "device_type:none"
- dimensions: "os:Ubuntu"
- dimensions: "pool:luci.flutter.prod"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$flutter/rbe": {'
- ' "instance": "projects/flutter-rbe-prod/instances/default",'
- ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "add_recipes_cq": true,'
- ' "bringup": false,'
- ' "clobber": false,'
- ' "config_name": "mac_unopt",'
- ' "cores": 8,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "open_jdk",'
- ' "version": "version:17"'
- ' },'
- ' {'
- ' "dependency": "gradle_cache",'
- ' "version": "none"'
- ' }'
- ' ],'
- ' "device_type": "none",'
- ' "gcs_goldens_bucket": "",'
- ' "git_branch": "main",'
- ' "git_repo": "engine",'
- ' "gold_tryjob": false,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "os": "Ubuntu",'
- ' "rbe_jobs": "200",'
- ' "recipe": "engine_v2/engine_v2",'
- ' "upload_packages": true,'
- ' "use_cas": true'
- '}'
- priority: 30
- execution_timeout_secs: 7200
- caches {
- name: "engine_main_builder"
- path: "builder"
- }
- caches {
- name: "engine_main_git"
- path: "git"
- }
- caches {
- name: "engine_main_gradle_cache_none"
- path: "gradle_cache"
- }
- caches {
- name: "engine_main_open_jdk_version_17"
- path: "open_jdk"
- }
- caches {
- name: "engine_main_open_jdk_version_17_legacy"
- path: "java"
- }
- caches {
- name: "gradle"
- path: "gradle"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- build_numbers: YES
- service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Linux module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
@@ -34189,6 +34093,99 @@
}
}
builders {
+ name: "Mac mac_unopt"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-13"
+ dimensions: "pool:luci.flutter.prod"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$flutter/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$flutter/osx_sdk": {'
+ ' "sdk_version": "15a240d"'
+ ' },'
+ ' "$flutter/rbe": {'
+ ' "instance": "projects/flutter-rbe-prod/instances/default",'
+ ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+ ' },'
+ ' "$kitchen": {'
+ ' "emulate_gce": true'
+ ' },'
+ ' "$recipe_engine/isolated": {'
+ ' "server": "https://isolateserver.appspot.com"'
+ ' },'
+ ' "$recipe_engine/swarming": {'
+ ' "server": "https://chromium-swarm.appspot.com"'
+ ' },'
+ ' "add_recipes_cq": true,'
+ ' "bringup": true,'
+ ' "clobber": false,'
+ ' "config_name": "mac_unopt",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:17"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "main",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Mac-13",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "engine_v2/engine_v2",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 7200
+ caches {
+ name: "engine_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "engine_main_git"
+ path: "git"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17"
+ path: "open_jdk"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17_legacy"
+ path: "java"
+ }
+ caches {
+ name: "flutter_xcode"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ build_numbers: YES
+ service_account: "flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {}
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "device_type:none"
@@ -66403,103 +66400,6 @@
}
}
builders {
- name: "Linux mac_unopt"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8"
- dimensions: "device_type:none"
- dimensions: "os:Ubuntu"
- dimensions: "pool:luci.flutter.staging"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$flutter/rbe": {'
- ' "instance": "projects/flutter-rbe-prod/instances/default",'
- ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "add_recipes_cq": true,'
- ' "bringup": false,'
- ' "clobber": false,'
- ' "config_name": "mac_unopt",'
- ' "cores": 8,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "open_jdk",'
- ' "version": "version:17"'
- ' },'
- ' {'
- ' "dependency": "gradle_cache",'
- ' "version": "none"'
- ' }'
- ' ],'
- ' "device_type": "none",'
- ' "gcs_goldens_bucket": "",'
- ' "git_branch": "main",'
- ' "git_repo": "engine",'
- ' "gold_tryjob": false,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "os": "Ubuntu",'
- ' "rbe_jobs": "200",'
- ' "recipe": "engine_v2/engine_v2",'
- ' "upload_packages": true,'
- ' "use_cas": true'
- '}'
- priority: 30
- execution_timeout_secs: 7200
- expiration_secs: 86400
- caches {
- name: "engine_main_builder"
- path: "builder"
- }
- caches {
- name: "engine_main_git"
- path: "git"
- }
- caches {
- name: "engine_main_gradle_cache_none"
- path: "gradle_cache"
- }
- caches {
- name: "engine_main_open_jdk_version_17"
- path: "open_jdk"
- }
- caches {
- name: "engine_main_open_jdk_version_17_legacy"
- path: "java"
- }
- caches {
- name: "gradle"
- path: "gradle"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- build_numbers: YES
- service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Linux module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
@@ -93889,6 +93789,100 @@
}
}
builders {
+ name: "Mac mac_unopt"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-13"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$flutter/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$flutter/osx_sdk": {'
+ ' "sdk_version": "15a240d"'
+ ' },'
+ ' "$flutter/rbe": {'
+ ' "instance": "projects/flutter-rbe-prod/instances/default",'
+ ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+ ' },'
+ ' "$kitchen": {'
+ ' "emulate_gce": true'
+ ' },'
+ ' "$recipe_engine/isolated": {'
+ ' "server": "https://isolateserver.appspot.com"'
+ ' },'
+ ' "$recipe_engine/swarming": {'
+ ' "server": "https://chromium-swarm.appspot.com"'
+ ' },'
+ ' "add_recipes_cq": true,'
+ ' "bringup": true,'
+ ' "clobber": false,'
+ ' "config_name": "mac_unopt",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:17"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "main",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Mac-13",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "engine_v2/engine_v2",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 7200
+ expiration_secs: 86400
+ caches {
+ name: "engine_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "engine_main_git"
+ path: "git"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17"
+ path: "open_jdk"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17_legacy"
+ path: "java"
+ }
+ caches {
+ name: "flutter_xcode"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ build_numbers: YES
+ service_account: "flutter-staging-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {}
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "device_type:none"
@@ -125825,102 +125819,6 @@
}
}
builders {
- name: "Linux mac_unopt"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8"
- dimensions: "device_type:none"
- dimensions: "os:Ubuntu"
- dimensions: "pool:luci.flutter.try"
- exe {
- cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/main"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$flutter/goma": {'
- ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
- ' },'
- ' "$flutter/rbe": {'
- ' "instance": "projects/flutter-rbe-prod/instances/default",'
- ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
- ' },'
- ' "$kitchen": {'
- ' "emulate_gce": true'
- ' },'
- ' "$recipe_engine/isolated": {'
- ' "server": "https://isolateserver.appspot.com"'
- ' },'
- ' "$recipe_engine/swarming": {'
- ' "server": "https://chromium-swarm.appspot.com"'
- ' },'
- ' "add_recipes_cq": true,'
- ' "bringup": false,'
- ' "clobber": false,'
- ' "config_name": "mac_unopt",'
- ' "cores": 8,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "open_jdk",'
- ' "version": "version:17"'
- ' },'
- ' {'
- ' "dependency": "gradle_cache",'
- ' "version": "none"'
- ' }'
- ' ],'
- ' "device_type": "none",'
- ' "gcs_goldens_bucket": "",'
- ' "git_branch": "main",'
- ' "git_repo": "engine",'
- ' "gold_tryjob": true,'
- ' "goma_jobs": "200",'
- ' "mastername": "client.flutter",'
- ' "no_lto": true,'
- ' "os": "Ubuntu",'
- ' "rbe_jobs": "200",'
- ' "recipe": "engine_v2/engine_v2",'
- ' "upload_packages": false,'
- ' "use_cas": true'
- '}'
- execution_timeout_secs: 7200
- caches {
- name: "engine_main_builder"
- path: "builder"
- }
- caches {
- name: "engine_main_git"
- path: "git"
- }
- caches {
- name: "engine_main_gradle_cache_none"
- path: "gradle_cache"
- }
- caches {
- name: "engine_main_open_jdk_version_17"
- path: "open_jdk"
- }
- caches {
- name: "engine_main_open_jdk_version_17_legacy"
- path: "java"
- }
- caches {
- name: "gradle"
- path: "gradle"
- }
- caches {
- name: "pub_cache"
- path: ".pub-cache"
- }
- build_numbers: YES
- service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- task_template_canary_percentage {}
- experiments {
- key: "luci.recipes.use_python3"
- value: 100
- }
- }
- builders {
name: "Linux module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
@@ -152736,6 +152634,99 @@
}
}
builders {
+ name: "Mac mac_unopt"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Mac-13"
+ dimensions: "pool:luci.flutter.try"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$flutter/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$flutter/osx_sdk": {'
+ ' "sdk_version": "15a240d"'
+ ' },'
+ ' "$flutter/rbe": {'
+ ' "instance": "projects/flutter-rbe-prod/instances/default",'
+ ' "platform": "container-image=docker://gcr.io/cloud-marketplace/google/debian11@sha256:69e2789c9f3d28c6a0f13b25062c240ee7772be1f5e6d41bb4680b63eae6b304"'
+ ' },'
+ ' "$kitchen": {'
+ ' "emulate_gce": true'
+ ' },'
+ ' "$recipe_engine/isolated": {'
+ ' "server": "https://isolateserver.appspot.com"'
+ ' },'
+ ' "$recipe_engine/swarming": {'
+ ' "server": "https://chromium-swarm.appspot.com"'
+ ' },'
+ ' "add_recipes_cq": true,'
+ ' "bringup": true,'
+ ' "clobber": false,'
+ ' "config_name": "mac_unopt",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:17"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "main",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": true,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "no_lto": true,'
+ ' "os": "Mac-13",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "engine_v2/engine_v2",'
+ ' "upload_packages": false,'
+ ' "use_cas": true'
+ '}'
+ execution_timeout_secs: 7200
+ caches {
+ name: "engine_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "engine_main_git"
+ path: "git"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17"
+ path: "open_jdk"
+ }
+ caches {
+ name: "engine_main_open_jdk_version_17_legacy"
+ path: "java"
+ }
+ caches {
+ name: "flutter_xcode"
+ path: "osx_sdk"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "pub_cache"
+ path: ".pub-cache"
+ }
+ build_numbers: YES
+ service_account: "flutter-try-builder@chops-service-accounts.iam.gserviceaccount.com"
+ task_template_canary_percentage {}
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac module_custom_host_app_name_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "device_type:none"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index bb714fb..ffa2611 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -5584,7 +5584,7 @@
name: "buildbucket/luci.flutter.try/Mac mac_host_engine"
}
builders {
- name: "buildbucket/luci.flutter.try/Linux mac_unopt"
+ name: "buildbucket/luci.flutter.try/Mac mac_unopt"
}
builders {
name: "buildbucket/luci.flutter.try/Mac mac_ios_engine"
@@ -5734,9 +5734,9 @@
short_name: "mmhe"
}
builders {
- name: "buildbucket/luci.flutter.staging/Linux mac_unopt"
- category: "Linux"
- short_name: "lmu"
+ name: "buildbucket/luci.flutter.staging/Mac mac_unopt"
+ category: "Mac"
+ short_name: "mmu"
}
builders {
name: "buildbucket/luci.flutter.staging/Mac mac_ios_engine"
@@ -5887,9 +5887,9 @@
short_name: "mmhe"
}
builders {
- name: "buildbucket/luci.flutter.prod/Linux mac_unopt"
- category: "Linux"
- short_name: "lmu"
+ name: "buildbucket/luci.flutter.prod/Mac mac_unopt"
+ category: "Mac"
+ short_name: "mmu"
}
builders {
name: "buildbucket/luci.flutter.prod/Mac mac_ios_engine"
diff --git a/config/generated/flutter/luci/luci-notify.cfg b/config/generated/flutter/luci/luci-notify.cfg
index 901d61f..5541ba5 100644
--- a/config/generated/flutter/luci/luci-notify.cfg
+++ b/config/generated/flutter/luci/luci-notify.cfg
@@ -456,30 +456,6 @@
}
builders {
bucket: "prod"
- name: "Linux mac_unopt"
- repository: "https://flutter.googlesource.com/mirrors/engine"
- }
-}
-notifiers {
- notifications {
- on_occurrence: INFRA_FAILURE
- on_occurrence: FAILURE
- failed_step_regexp: "(^build|.*test:).*"
- email {
- recipients: "flutter-engine@grotations.appspotmail.com"
- }
- template: "test_build_failure"
- }
- notifications {
- on_occurrence: SUCCESS
- failed_step_regexp: "(.*test:).*"
- email {
- recipients: "flutter-engine@grotations.appspotmail.com"
- }
- template: "test_flake"
- }
- builders {
- bucket: "prod"
name: "Mac builder_cache"
repository: "https://flutter.googlesource.com/mirrors/engine"
}
@@ -600,6 +576,30 @@
}
builders {
bucket: "prod"
+ name: "Mac mac_unopt"
+ repository: "https://flutter.googlesource.com/mirrors/engine"
+ }
+}
+notifiers {
+ notifications {
+ on_occurrence: INFRA_FAILURE
+ on_occurrence: FAILURE
+ failed_step_regexp: "(^build|.*test:).*"
+ email {
+ recipients: "flutter-engine@grotations.appspotmail.com"
+ }
+ template: "test_build_failure"
+ }
+ notifications {
+ on_occurrence: SUCCESS
+ failed_step_regexp: "(.*test:).*"
+ email {
+ recipients: "flutter-engine@grotations.appspotmail.com"
+ }
+ template: "test_flake"
+ }
+ builders {
+ bucket: "prod"
name: "Windows builder_cache"
repository: "https://flutter.googlesource.com/mirrors/engine"
}
@@ -1152,30 +1152,6 @@
}
builders {
bucket: "staging"
- name: "Linux mac_unopt"
- repository: "https://flutter.googlesource.com/mirrors/engine"
- }
-}
-notifiers {
- notifications {
- on_occurrence: INFRA_FAILURE
- on_occurrence: FAILURE
- failed_step_regexp: "(^build|.*test:).*"
- email {
- recipients: "flutter-engine@grotations.appspotmail.com"
- }
- template: "test_build_failure"
- }
- notifications {
- on_occurrence: SUCCESS
- failed_step_regexp: "(.*test:).*"
- email {
- recipients: "flutter-engine@grotations.appspotmail.com"
- }
- template: "test_flake"
- }
- builders {
- bucket: "staging"
name: "Mac builder_cache"
repository: "https://flutter.googlesource.com/mirrors/engine"
}
@@ -1296,6 +1272,30 @@
}
builders {
bucket: "staging"
+ name: "Mac mac_unopt"
+ repository: "https://flutter.googlesource.com/mirrors/engine"
+ }
+}
+notifiers {
+ notifications {
+ on_occurrence: INFRA_FAILURE
+ on_occurrence: FAILURE
+ failed_step_regexp: "(^build|.*test:).*"
+ email {
+ recipients: "flutter-engine@grotations.appspotmail.com"
+ }
+ template: "test_build_failure"
+ }
+ notifications {
+ on_occurrence: SUCCESS
+ failed_step_regexp: "(.*test:).*"
+ email {
+ recipients: "flutter-engine@grotations.appspotmail.com"
+ }
+ template: "test_flake"
+ }
+ builders {
+ bucket: "staging"
name: "Windows builder_cache"
repository: "https://flutter.googlesource.com/mirrors/engine"
}