Roll cocoon to 4ad2db74e1705baae93e8400eb95a568e4cecb9b
Roller-URL: https://ci.chromium.org/b/8754409924284084609
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: Ia2da957f805a7384b3f6204f73876fd3e3cf4e75
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/55720
Commit-Queue: flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com <flutter-prod-builder@chops-service-accounts.iam.gserviceaccount.com>
Bot-Commit: 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 4d4d478..e54b36f 100644
--- a/config/generated/ci_yaml/cocoon_config.json
+++ b/config/generated/ci_yaml/cocoon_config.json
@@ -1 +1 @@
-{"targets":[{"name":"Linux Cocoon","properties":{"add_recipes_cq":"true"},"runIf":[".ci.yaml","analyze/**","app_dart/**","auto_submit/**","cipd_packages/**","cloud_build/**","dashboard/**","dev/**","licenses/**","packages/**","test_utilities/**","tooling/**","CI_YAML.md"],"recipe":"cocoon/cocoon"},{"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","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\": \"14e300c\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 ruby","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\": \"14e300c\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ci_yaml roller","properties":{"backfill":"false"},"runIf":[".ci.yaml"],"recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux","device_type":"none"}},"mac":{"properties":{"os":"Mac-12|Mac-13","cpu":"x86"}},"mac_arm64":{"properties":{"os":"Mac-12|Mac-13","cpu":"arm64"}},"windows":{"properties":{"os":"Windows","device_type":"none"}}}}
+{"targets":[{"name":"Linux Cocoon","properties":{"add_recipes_cq":"true"},"runIf":[".ci.yaml","analyze/**","app_dart/**","auto_submit/**","cipd_packages/**","cloud_build/**","dashboard/**","dev/**","licenses/**","packages/**","test_utilities/**","tooling/**","CI_YAML.md"],"recipe":"cocoon/cocoon"},{"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","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\": \"14e300c\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Mac_arm64 ruby","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\": \"14e300c\"\n}"},"runIf":["cipd_packages/ruby/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ktlint","bringup":true,"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","properties":{"backfill":"false"},"runIf":[".ci.yaml"],"recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux","device_type":"none"}},"mac":{"properties":{"os":"Mac-12|Mac-13","cpu":"x86"}},"mac_arm64":{"properties":{"os":"Mac-12|Mac-13","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 5331e7c..f3ab94f 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -5161,6 +5161,77 @@
}
}
builders {
+ name: "Linux ktlint"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ 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"'
+ ' },'
+ ' "bringup": true,'
+ ' "cipd_name": "flutter/ktlint/linux-amd64",'
+ ' "clobber": false,'
+ ' "dependencies": [],'
+ ' "device_type": "none",'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Linux",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "cipd_packages/ktlint/tools/build.sh",'
+ ' "upload_packages": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 3600
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "cocoon_main_git"
+ path: "git"
+ }
+ 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 linux_android_aot_engine"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
@@ -64590,6 +64661,78 @@
}
}
builders {
+ name: "Linux ktlint"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ 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"'
+ ' },'
+ ' "bringup": true,'
+ ' "cipd_name": "flutter/ktlint/linux-amd64",'
+ ' "clobber": false,'
+ ' "dependencies": [],'
+ ' "device_type": "none",'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Linux",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "cipd_packages/ktlint/tools/build.sh",'
+ ' "upload_packages": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 3600
+ expiration_secs: 86400
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "cocoon_main_git"
+ path: "git"
+ }
+ 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 linux_android_aot_engine"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
@@ -123702,6 +123845,76 @@
}
}
builders {
+ name: "Linux ktlint"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ 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"'
+ ' },'
+ ' "bringup": true,'
+ ' "cipd_name": "flutter/ktlint/linux-amd64",'
+ ' "clobber": false,'
+ ' "dependencies": [],'
+ ' "device_type": "none",'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": true,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Linux",'
+ ' "rbe_jobs": "200",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "cipd_packages/ktlint/tools/build.sh",'
+ ' "upload_packages": false'
+ '}'
+ execution_timeout_secs: 3600
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ caches {
+ name: "cocoon_main_git"
+ path: "git"
+ }
+ 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 linux_android_aot_engine"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:8"
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 3206234..f5c2d5e 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -38,6 +38,9 @@
name: "buildbucket/luci.flutter.try/Mac_arm64 ruby"
}
builders {
+ name: "buildbucket/luci.flutter.try/Linux ktlint"
+ }
+ builders {
name: "buildbucket/luci.flutter.try/Linux ci_yaml roller"
}
favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
@@ -100,6 +103,11 @@
short_name: "mar"
}
builders {
+ name: "buildbucket/luci.flutter.staging/Linux ktlint"
+ category: "Linux"
+ short_name: "lk"
+ }
+ builders {
name: "buildbucket/luci.flutter.staging/Linux ci_yaml roller"
category: "Linux"
short_name: "lcyr"
@@ -163,6 +171,11 @@
short_name: "mar"
}
builders {
+ name: "buildbucket/luci.flutter.prod/Linux ktlint"
+ category: "Linux"
+ short_name: "lk"
+ }
+ builders {
name: "buildbucket/luci.flutter.prod/Linux ci_yaml roller"
category: "Linux"
short_name: "lcyr"
diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 29e2b2d..a58a2b1 100644
--- a/config/generated/flutter/luci/project.cfg
+++ b/config/generated/flutter/luci/project.cfg
@@ -7,7 +7,7 @@
name: "flutter"
access: "group:all"
lucicfg {
- version: "1.43.4"
+ version: "1.43.5"
package_dir: "../../.."
config_dir: "generated/flutter/luci"
entry_point: "main.star"
