Add fuchsia_r48_engine builders, per http://go/flutter-self-service-branches.
See https://fxbug.dev/97248.
Change-Id: Ic376c5740efba9dfef907f086de6bfed50cab4b6
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/28960
Reviewed-by: Chase Latta <chaselatta@google.com>
Reviewed-by: Casey Hillers <chillers@google.com>
Commit-Queue: Darren Chan <chandarren@google.com>
diff --git a/config/generated/ci_yaml/engine_fuchsia_r48_config.json b/config/generated/ci_yaml/engine_fuchsia_r48_config.json
new file mode 100644
index 0000000..f6997db
--- /dev/null
+++ b/config/generated/ci_yaml/engine_fuchsia_r48_config.json
@@ -0,0 +1 @@
+{"targets":[{"name":"Linux Fuchsia","timeout":90,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27"},"recipe":"engine/engine"},{"name":"Linux Fuchsia FEMU","timeout":60,"properties":{"add_recipes_cq":"true","build_fuchsia":"true","fuchsia_ctl_version":"version:0.0.27"},"recipe":"engine/femu_test"}],"enabledBranches":["main","flutter-\\d+\\.\\d+-candidate\\.\\d+","fuchsia_r48"],"platformProperties":{"linux":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n {\"name\":\"builder_linux_engine\",\"path\":\"builder\"},\n {\"name\":\"gradle\",\"path\":\"gradle\"},\n {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"},\n {\"dependency\": \"gradle_cache\"}\n]","device_type":"none","os":"Linux","cores":"8"}},"mac":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n {\"name\":\"flutter_cocoapods\",\"path\":\"cocoapods\"},\n {\"name\":\"osx_sdk_13a233_13_15\",\"path\":\"osx_sdk\"},\n {\"name\":\"builder_mac_engine\",\"path\":\"builder\"},\n {\"name\":\"openjdk\",\"path\":\"java\"},\n {\"name\":\"xcode_runtime_ios_13_0\",\"path\":\"xcode_runtime_ios_13_0\"},\n {\"name\":\"xcode_runtime_ios_15_0\",\"path\":\"xcode_runtime_ios_15_0\"}\n]","dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","mac_model":"Macmini8,1","os":"Mac-12","runtime_versions":"[\n \"ios-13-0\",\n \"ios-15-0\"\n]","xcode":"13a233"}},"windows":{"properties":{"build_host":"false","build_fuchsia":"false","build_android_debug":"false","build_android_aot":"false","build_android_vulkan":"false","build_ios":"false","build_windows_uwp":"false","build_android_jit_release":"false","gcs_goldens_bucket":"","ios_debug":"false","ios_profile":"false","ios_release":"false","no_bitcode":"false","caches":"[\n {\"name\":\"builder_win_engine\",\"path\":\"builder\"},\n {\"name\":\"openjdk\",\"path\":\"java\"}\n]","dependencies":"[\n {\"dependency\": \"open_jdk\", \"version\": \"version:1.8.0u202-b08\"}\n]","device_type":"none","os":"Windows-10"}}}}
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 1fb7fa2..7bdab88 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -16124,6 +16124,186 @@
}
}
builders {
+ name: "Linux fuchsia_r48 Fuchsia"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cores:8"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ dimensions: "pool:luci.flutter.prod"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "flutter-2.13-candidate.0"
+ 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": false,'
+ ' "build_android_aot": false,'
+ ' "build_android_debug": false,'
+ ' "build_android_jit_release": false,'
+ ' "build_android_vulkan": false,'
+ ' "build_fuchsia": true,'
+ ' "build_host": false,'
+ ' "build_ios": false,'
+ ' "build_windows_uwp": false,'
+ ' "clobber": false,'
+ ' "cores": "8",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:1.8.0u202-b08"'
+ ' },'
+ ' {'
+ ' "dependency": "gradle_cache"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "fuchsia_ctl_version": "version:0.0.27",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "fuchsia_r48",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "ios_debug": false,'
+ ' "ios_profile": false,'
+ ' "ios_release": false,'
+ ' "mastername": "client.flutter",'
+ ' "no_bitcode": false,'
+ ' "os": "Linux",'
+ ' "recipe": "engine/engine",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 16200
+ caches {
+ name: "builder_linux_engine"
+ path: "builder"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ 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: "Linux fuchsia_r48 Fuchsia FEMU"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cores:8"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ dimensions: "pool:luci.flutter.prod"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "flutter-2.13-candidate.0"
+ 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": false,'
+ ' "build_android_aot": false,'
+ ' "build_android_debug": false,'
+ ' "build_android_jit_release": false,'
+ ' "build_android_vulkan": false,'
+ ' "build_fuchsia": true,'
+ ' "build_host": false,'
+ ' "build_ios": false,'
+ ' "build_windows_uwp": false,'
+ ' "clobber": false,'
+ ' "cores": "8",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:1.8.0u202-b08"'
+ ' },'
+ ' {'
+ ' "dependency": "gradle_cache"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "fuchsia_ctl_version": "version:0.0.27",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "fuchsia_r48",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "ios_debug": false,'
+ ' "ios_profile": false,'
+ ' "ios_release": false,'
+ ' "mastername": "client.flutter",'
+ ' "no_bitcode": false,'
+ ' "os": "Linux",'
+ ' "recipe": "engine/femu_test",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 10800
+ caches {
+ name: "builder_linux_engine"
+ path: "builder"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ 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: "Linux gradle_desugar_classes_test"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "device_type:none"
@@ -131907,6 +132087,188 @@
}
}
builders {
+ name: "Linux fuchsia_r48 Fuchsia"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cores:8"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "flutter-2.13-candidate.0"
+ 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": false,'
+ ' "build_android_aot": false,'
+ ' "build_android_debug": false,'
+ ' "build_android_jit_release": false,'
+ ' "build_android_vulkan": false,'
+ ' "build_fuchsia": true,'
+ ' "build_host": false,'
+ ' "build_ios": false,'
+ ' "build_windows_uwp": false,'
+ ' "clobber": false,'
+ ' "cores": "8",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:1.8.0u202-b08"'
+ ' },'
+ ' {'
+ ' "dependency": "gradle_cache"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "fuchsia_ctl_version": "version:0.0.27",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "fuchsia_r48",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "ios_debug": false,'
+ ' "ios_profile": false,'
+ ' "ios_release": false,'
+ ' "mastername": "client.flutter",'
+ ' "no_bitcode": false,'
+ ' "os": "Linux",'
+ ' "recipe": "engine/engine",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 16200
+ expiration_secs: 86400
+ caches {
+ name: "builder_linux_engine"
+ path: "builder"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ 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: "Linux fuchsia_r48 Fuchsia FEMU"
+ swarming_host: "chromium-swarm.appspot.com"
+ dimensions: "cores:8"
+ dimensions: "device_type:none"
+ dimensions: "os:Linux"
+ dimensions: "pool:luci.flutter.staging"
+ exe {
+ cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
+ cipd_version: "flutter-2.13-candidate.0"
+ 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": false,'
+ ' "build_android_aot": false,'
+ ' "build_android_debug": false,'
+ ' "build_android_jit_release": false,'
+ ' "build_android_vulkan": false,'
+ ' "build_fuchsia": true,'
+ ' "build_host": false,'
+ ' "build_ios": false,'
+ ' "build_windows_uwp": false,'
+ ' "clobber": false,'
+ ' "cores": "8",'
+ ' "dependencies": ['
+ ' {'
+ ' "dependency": "open_jdk",'
+ ' "version": "version:1.8.0u202-b08"'
+ ' },'
+ ' {'
+ ' "dependency": "gradle_cache"'
+ ' }'
+ ' ],'
+ ' "device_type": "none",'
+ ' "fuchsia_ctl_version": "version:0.0.27",'
+ ' "gcs_goldens_bucket": "",'
+ ' "git_branch": "fuchsia_r48",'
+ ' "git_repo": "engine",'
+ ' "gold_tryjob": false,'
+ ' "goma_jobs": "200",'
+ ' "ios_debug": false,'
+ ' "ios_profile": false,'
+ ' "ios_release": false,'
+ ' "mastername": "client.flutter",'
+ ' "no_bitcode": false,'
+ ' "os": "Linux",'
+ ' "recipe": "engine/femu_test",'
+ ' "upload_packages": true,'
+ ' "use_cas": true'
+ '}'
+ priority: 30
+ execution_timeout_secs: 10800
+ expiration_secs: 86400
+ caches {
+ name: "builder_linux_engine"
+ path: "builder"
+ }
+ caches {
+ name: "gradle"
+ path: "gradle"
+ }
+ caches {
+ name: "openjdk"
+ path: "java"
+ }
+ 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: "Linux gradle_desugar_classes_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 ded7baa..6468d10 100644
--- a/config/generated/flutter/luci/luci-milo.cfg
+++ b/config/generated/flutter/luci/luci-milo.cfg
@@ -12307,6 +12307,16 @@
category: "Linux"
short_name: "lffff"
}
+ builders {
+ name: "buildbucket/luci.flutter.staging/Linux fuchsia_r48 Fuchsia"
+ category: "Linux"
+ short_name: "lfrf"
+ }
+ builders {
+ name: "buildbucket/luci.flutter.staging/Linux fuchsia_r48 Fuchsia FEMU"
+ category: "Linux"
+ short_name: "lfrff"
+ }
favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
}
consoles {
@@ -12542,6 +12552,24 @@
favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
}
consoles {
+ id: "fuchsia_r48_engine"
+ name: "fuchsia_r48_engine"
+ repo_url: "https://flutter.googlesource.com/mirrors/engine"
+ refs: "regexp:refs/heads/fuchsia_r48"
+ manifest_name: "REVISION"
+ builders {
+ name: "buildbucket/luci.flutter.prod/Linux fuchsia_r48 Fuchsia"
+ category: "Linux"
+ short_name: "lfrf"
+ }
+ builders {
+ name: "buildbucket/luci.flutter.prod/Linux fuchsia_r48 Fuchsia FEMU"
+ category: "Linux"
+ short_name: "lfrff"
+ }
+ favicon_url: "https://storage.googleapis.com/flutter_infra/favicon.ico"
+}
+consoles {
id: "infra"
name: "infra"
repo_url: "https://flutter.googlesource.com/infra"
diff --git a/config/generated/flutter/luci/luci-scheduler.cfg b/config/generated/flutter/luci/luci-scheduler.cfg
index 6120b36..aba274f 100644
--- a/config/generated/flutter/luci/luci-scheduler.cfg
+++ b/config/generated/flutter/luci/luci-scheduler.cfg
@@ -17668,6 +17668,15 @@
}
}
trigger {
+ id: "fuchsia_r48-gitiles-trigger-engine"
+ realm: "prod"
+ acl_sets: "prod"
+ gitiles {
+ repo: "https://flutter.googlesource.com/mirrors/engine"
+ refs: "regexp:refs/heads/fuchsia_r48"
+ }
+}
+trigger {
id: "gitiles-trigger-ideviceinstaller"
realm: "prod"
acl_sets: "prod"
diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 61da59d..1b70f14 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.30.11"
+ version: "1.30.10"
package_dir: "../../.."
config_dir: "generated/flutter/luci"
entry_point: "main.star"
diff --git a/config/lib/release_branches/branches.json b/config/lib/release_branches/branches.json
index 10a3734..bebf4ae 100644
--- a/config/lib/release_branches/branches.json
+++ b/config/lib/release_branches/branches.json
@@ -39,6 +39,11 @@
"testing_ref": "refs/heads/fuchsia_f7",
"recipes_ref": "flutter-2.5-candidate.5",
"version": "2_5_0"
+ },
+ "fuchsia_r48": {
+ "testing_ref": "refs/heads/fuchsia_r48",
+ "recipes_ref": "flutter-2.13-candidate.0",
+ "version": "2_13_0"
}
}
}
