Roll cocoon to 9027c802feebd72021ca52498d5d3013a71be642
Roller-URL: https://cr-buildbucket.appspot.com/build/8706817043482392929
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: I7cb29689ea8f89ff7798bc8a8b68e7432648a400
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/68680
Bot-Commit: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/config/generated/ci_yaml/cocoon_config.json b/config/generated/ci_yaml/cocoon_config.json
index b9f3faa..8a0844b 100644
--- a/config/generated/ci_yaml/cocoon_config.json
+++ b/config/generated/ci_yaml/cocoon_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Linux device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/linux-amd64"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/mac-amd64","device_type":"none"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/mac-arm64","device_type":"none"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Windows device_doctor","properties":{"script":"cipd_packages\\device_doctor\\tool\\build.bat","cipd_name":"flutter/device_doctor/windows-amd64"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux doxygen","properties":{"script":"cipd_packages/doxygen/tool/build.sh","cipd_name":"flutter/doxygen/linux-amd64","dependencies":"[\n {\"dependency\": \"cmake\", \"version\": \"build_id:8787856497187628321\"}\n]"},"runIf":["cipd_packages/doxygen/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac codesign","properties":{"script":"cipd_packages/codesign/tool/build.sh","cipd_name":"flutter/codesign/mac-amd64","device_type":"none"},"runIf":["cipd_packages/codesign/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 codesign","properties":{"script":"cipd_packages/codesign/tool/build.sh","cipd_name":"flutter/codesign/mac-arm64","device_type":"none"},"runIf":["cipd_packages/codesign/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac ruby","bringup":true,"timeout":60,"properties":{"script":"cipd_packages/ruby/tools/build.sh","cipd_name":"flutter/ruby/mac-amd64","device_os":"iOS","contexts":"[\n \"osx_sdk_devicelab\"\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 ruby","bringup":true,"timeout":60,"properties":{"script":"cipd_packages/ruby/tools/build.sh","cipd_name":"flutter/ruby/mac-arm64","device_os":"iOS","contexts":"[\n \"osx_sdk_devicelab\"\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ktlint","timeout":60,"properties":{"script":"cipd_packages/ktlint/tools/build.sh","cipd_name":"flutter/ktlint/linux-amd64"},"runIf":["cipd_packages/ktlint/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ci_yaml roller","runIf":[".ci.yaml"],"recipe":"infra/ci_yaml","backfill":false}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux","device_type":"none"}},"mac":{"properties":{"os":"Mac-13|Mac-14","cpu":"x86"}},"mac_arm64":{"properties":{"os":"Mac-13|Mac-14","cpu":"arm64"}},"windows":{"properties":{"os":"Windows","device_type":"none"}}}}
+{"targets":[{"name":"Linux device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/linux-amd64"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/mac-amd64","device_type":"none"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 device_doctor","properties":{"script":"cipd_packages/device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/mac-arm64","device_type":"none"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Windows device_doctor","properties":{"script":"cipd_packages\\device_doctor\\tool\\build.bat","cipd_name":"flutter/device_doctor/windows-amd64"},"runIf":["cipd_packages/device_doctor/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux doxygen","properties":{"script":"cipd_packages/doxygen/tool/build.sh","cipd_name":"flutter/doxygen/linux-amd64","dependencies":"[\n {\"dependency\": \"cmake\", \"version\": \"build_id:8787856497187628321\"}\n]"},"runIf":["cipd_packages/doxygen/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac codesign","properties":{"script":"cipd_packages/codesign/tool/build.sh","cipd_name":"flutter/codesign/mac-amd64","device_type":"none"},"runIf":["cipd_packages/codesign/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 codesign","properties":{"script":"cipd_packages/codesign/tool/build.sh","cipd_name":"flutter/codesign/mac-arm64","device_type":"none"},"runIf":["cipd_packages/codesign/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac ruby","bringup":true,"timeout":60,"properties":{"script":"cipd_packages/ruby/tools/build.sh","cipd_name":"flutter/ruby/mac-amd64","device_os":"iOS","contexts":"[\n \"osx_sdk_devicelab\"\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 ruby","bringup":true,"timeout":60,"properties":{"script":"cipd_packages/ruby/tools/build.sh","cipd_name":"flutter/ruby/mac-arm64","device_os":"iOS","contexts":"[\n \"osx_sdk_devicelab\"\n]","$flutter/osx_sdk":"{\n \"sdk_version\": \"15a240d\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ktlint","timeout":60,"properties":{"script":"cipd_packages/ktlint/tools/build.sh","cipd_name":"flutter/ktlint/linux-amd64"},"runIf":["cipd_packages/ktlint/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ci_yaml roller","runIf":[".ci.yaml"],"recipe":"infra/ci_yaml","backfill":false}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux","device_type":"none"}},"mac":{"properties":{"os":"Mac-14|Mac-15","cpu":"x86"}},"mac_arm64":{"properties":{"os":"Mac-14|Mac-15","cpu":"arm64"}},"windows":{"properties":{"os":"Windows","device_type":"none"}}}}
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 619867f..714809e 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -36267,7 +36267,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -36303,7 +36303,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -36542,7 +36542,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -36578,7 +36578,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -38657,7 +38657,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -38699,7 +38699,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
@@ -40590,7 +40590,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -40626,7 +40626,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -40849,7 +40849,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -40885,7 +40885,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -43140,7 +43140,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -43182,7 +43182,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
@@ -100974,7 +100974,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -101010,7 +101010,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -101251,7 +101251,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -101287,7 +101287,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -103375,7 +103375,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -103417,7 +103417,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
@@ -105320,7 +105320,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -105356,7 +105356,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -105582,7 +105582,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -105618,7 +105618,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -107889,7 +107889,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.staging"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -107931,7 +107931,7 @@
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
@@ -164773,7 +164773,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -164809,7 +164809,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -165043,7 +165043,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -165079,7 +165079,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -167120,7 +167120,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -167162,7 +167162,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
@@ -169035,7 +169035,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -169071,7 +169071,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/codesign/tool/build.sh",'
@@ -169291,7 +169291,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_type:none"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -169327,7 +169327,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/device_doctor/tool/build.sh",'
@@ -171545,7 +171545,7 @@
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:arm64"
dimensions: "device_os:iOS"
- dimensions: "os:Mac-13|Mac-14"
+ dimensions: "os:Mac-14|Mac-15"
dimensions: "pool:luci.flutter.try"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
@@ -171587,7 +171587,7 @@
' "gold_tryjob": true,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
- ' "os": "Mac-13|Mac-14",'
+ ' "os": "Mac-14|Mac-15",'
' "rbe_jobs": "200",'
' "recipe": "cocoon/cipd",'
' "script": "cipd_packages/ruby/tools/build.sh",'
