Roll cocoon to 34824e1c4f8d4e3595468c970ddb66782dd3d002
Roller-URL: https://ci.chromium.org/b/8809350309244194849
Cq-Cl-Tag: roller-builder:Linux ci_yaml roller
Cq-Cl-Tag: roller-bid:8809350309244194849
CQ-Do-Not-Cancel-Tryjobs: true
Change-Id: I4ba01e8bd881c06635bdd74dfee420de3f58e898
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/31803
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 06a0544..583ba6e 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"},"recipe":"cocoon/cocoon"},{"name":"Linux device_doctor","properties":{"add_recipes_cq":"true"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Mac device_doctor","properties":{"add_recipes_cq":"true"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Windows device_doctor","properties":{"add_recipes_cq":"true"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Linux ci_yaml roller","properties":{"add_recipes_cq":"true"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux"}},"mac":{"properties":{"os":"Mac-12","cpu":"x86"}},"windows":{"properties":{"os":"Windows"}}}}
+{"targets":[{"name":"Linux Cocoon","properties":{"add_recipes_cq":"true"},"recipe":"cocoon/cocoon"},{"name":"Linux device_doctor","properties":{"add_recipes_cq":"true","script":"device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/linux-amd64"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Mac device_doctor","properties":{"add_recipes_cq":"true","script":"device_doctor/tool/build.sh","cipd_name":"flutter/device_doctor/mac-amd64"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Windows device_doctor","properties":{"add_recipes_cq":"true","script":"device_doctor/tool/build.bat","cipd_name":"flutter/device_doctor/windows-amd64"},"postsubmit":false,"runIf":["device_doctor/**",".ci.yaml"],"recipe":"cocoon/device_doctor"},{"name":"Mac codesign","bringup":true,"properties":{"add_recipes_cq":"true","script":"codesign/tool/build.sh","cipd_name":"flutter/codesign/mac-amd64"},"postsubmit":false,"runIf":["codesign/**",".ci.yaml"],"recipe":"cocoon/cipd"},{"name":"Linux ci_yaml roller","properties":{"add_recipes_cq":"true"},"recipe":"infra/ci_yaml"}],"enabledBranches":["main"],"platformProperties":{"linux":{"properties":{"os":"Linux"}},"mac":{"properties":{"os":"Mac-12","cpu":"x86"}},"windows":{"properties":{"os":"Windows"}}}}
diff --git a/config/generated/flutter/luci/commit-queue.cfg b/config/generated/flutter/luci/commit-queue.cfg
index 9ee72dd..d99b220 100644
--- a/config/generated/flutter/luci/commit-queue.cfg
+++ b/config/generated/flutter/luci/commit-queue.cfg
@@ -61,6 +61,9 @@
name: "flutter/try/Linux device_doctor"
}
builders {
+ name: "flutter/try/Mac codesign"
+ }
+ builders {
name: "flutter/try/Mac device_doctor"
}
builders {
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index a9fb270..dbeb2ad 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -9755,6 +9755,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/linux-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -9764,6 +9765,7 @@
' "mastername": "client.flutter",'
' "os": "Linux",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": true'
'}'
priority: 30
@@ -58321,6 +58323,69 @@
}
}
builders {
+ name: "Mac codesign"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
+ dimensions: "os:Mac-12"
+ dimensions: "pool:luci.flutter.prod"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$fuchsia/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$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,'
+ ' "cipd_name": "flutter/codesign/mac-amd64",'
+ ' "clobber": false,'
+ ' "cpu": "x86",'
+ ' "dependencies": [],'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Mac-12",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "codesign/tool/build.sh",'
+ ' "upload_packages": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 5400
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ 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.buildbucket.agent.cipd_installation"
+ value: 0
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac customer_testing"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
@@ -58524,6 +58589,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/mac-amd64",'
' "clobber": false,'
' "cpu": "x86",'
' "dependencies": [],'
@@ -58534,6 +58600,7 @@
' "mastername": "client.flutter",'
' "os": "Mac-12",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": true'
'}'
priority: 30
@@ -87491,6 +87558,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/windows-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -87500,6 +87568,7 @@
' "mastername": "client.flutter",'
' "os": "Windows",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.bat",'
' "upload_packages": true'
'}'
priority: 30
@@ -107203,6 +107272,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/linux-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -107212,6 +107282,7 @@
' "mastername": "client.flutter",'
' "os": "Linux",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": true'
'}'
priority: 30
@@ -156569,6 +156640,70 @@
}
}
builders {
+ name: "Mac codesign"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
+ dimensions: "os:Mac-12"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$fuchsia/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$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,'
+ ' "cipd_name": "flutter/codesign/mac-amd64",'
+ ' "clobber": false,'
+ ' "cpu": "x86",'
+ ' "dependencies": [],'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Mac-12",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "codesign/tool/build.sh",'
+ ' "upload_packages": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 5400
+ expiration_secs: 86400
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ 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.buildbucket.agent.cipd_installation"
+ value: 0
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac customer_testing"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
@@ -156773,6 +156908,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/mac-amd64",'
' "clobber": false,'
' "cpu": "x86",'
' "dependencies": [],'
@@ -156783,6 +156919,7 @@
' "mastername": "client.flutter",'
' "os": "Mac-12",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": true'
'}'
priority: 30
@@ -190521,6 +190658,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/windows-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -190530,6 +190668,7 @@
' "mastername": "client.flutter",'
' "os": "Windows",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.bat",'
' "upload_packages": true'
'}'
priority: 30
@@ -202520,6 +202659,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/linux-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -202529,6 +202669,7 @@
' "mastername": "client.flutter",'
' "os": "Linux",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": false'
'}'
execution_timeout_secs: 5400
@@ -220834,6 +220975,68 @@
}
}
builders {
+ name: "Mac codesign"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cpu:x86"
+ dimensions: "os:Mac-12"
+ dimensions: "pool:luci.flutter.try"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "refs/heads/main"
+ cmd: "luciexe"
+ }
+ properties:
+ '{'
+ ' "$fuchsia/goma": {'
+ ' "server": "rbe-prod1.endpoints.fuchsia-infra-goma-prod.cloud.goog"'
+ ' },'
+ ' "$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,'
+ ' "cipd_name": "flutter/codesign/mac-amd64",'
+ ' "clobber": false,'
+ ' "cpu": "x86",'
+ ' "dependencies": [],'
+ ' "git_branch": "main",'
+ ' "git_repo": "cocoon",'
+ ' "gold_tryjob": true,'
+ ' "goma_jobs": "200",'
+ ' "mastername": "client.flutter",'
+ ' "os": "Mac-12",'
+ ' "recipe": "cocoon/cipd",'
+ ' "script": "codesign/tool/build.sh",'
+ ' "upload_packages": false'
+ '}'
+ execution_timeout_secs: 5400
+ caches {
+ name: "cocoon_main_builder"
+ path: "builder"
+ }
+ 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.buildbucket.agent.cipd_installation"
+ value: 0
+ }
+ experiments {
+ key: "luci.recipes.use_python3"
+ value: 100
+ }
+ }
+ builders {
name: "Mac customer_testing"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86"
@@ -221033,6 +221236,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/mac-amd64",'
' "clobber": false,'
' "cpu": "x86",'
' "dependencies": [],'
@@ -221043,6 +221247,7 @@
' "mastername": "client.flutter",'
' "os": "Mac-12",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.sh",'
' "upload_packages": false'
'}'
execution_timeout_secs: 5400
@@ -232155,6 +232360,7 @@
' },'
' "add_recipes_cq": true,'
' "bringup": false,'
+ ' "cipd_name": "flutter/device_doctor/windows-amd64",'
' "clobber": false,'
' "dependencies": [],'
' "git_branch": "main",'
@@ -232164,6 +232370,7 @@
' "mastername": "client.flutter",'
' "os": "Windows",'
' "recipe": "cocoon/device_doctor",'
+ ' "script": "device_doctor/tool/build.bat",'
' "upload_packages": false'
'}'
execution_timeout_secs: 5400
diff --git a/config/generated/flutter/luci/luci-milo.cfg b/config/generated/flutter/luci/luci-milo.cfg
index 86e2e57..4cce521 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -20,6 +20,9 @@
name: "buildbucket/luci.flutter.try/Windows device_doctor"
}
builders {
+ name: "buildbucket/luci.flutter.try/Mac codesign"
+ }
+ builders {
name: "buildbucket/luci.flutter.try/Linux ci_yaml roller"
}
favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
@@ -52,6 +55,11 @@
short_name: "wdd"
}
builders {
+ name: "buildbucket/luci.flutter.staging/Mac codesign"
+ category: "Mac"
+ short_name: "mc"
+ }
+ builders {
name: "buildbucket/luci.flutter.staging/Linux ci_yaml roller"
category: "Linux"
short_name: "lcyr"
@@ -85,6 +93,11 @@
short_name: "wdd"
}
builders {
+ name: "buildbucket/luci.flutter.prod/Mac codesign"
+ category: "Mac"
+ short_name: "mc"
+ }
+ builders {
name: "buildbucket/luci.flutter.prod/Linux ci_yaml roller"
category: "Linux"
short_name: "lcyr"
