[CP-beta]Increase number of 'Mac tool_integration_tests' subshards (#189299)
This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/blob/main/docs/releases/Flutter-Cherrypick-Process.md#automatically-creates-a-cherry-pick-request)
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.
### Issue Link:
What is the link to the issue this cherry-pick is addressing?
https://github.com/flutter/flutter/issues/189039
### Impact Description:
What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)?
Does it impact development (ex. flutter doctor crashes when Android Studio is installed),
or the shipping of production apps (the app crashes on launch).
This information is for domain experts and release engineers to understand the consequences of saying yes or no to the cherry pick.
Release builders should match main. These builders were renamed in https://github.com/flutter/flutter/pull/189040 to increase the number of shards. Without this change, the beta release branch will try to run the old builder names and fail because the infra config is missing.
There will be a follow-up cherry-pick to bring it out of bringup when they pass in post-submit https://github.com/flutter/flutter/pull/189368
### Changelog Description:
Explain this cherry pick:
* In one line that is accessible to most Flutter developers.
* That describes the state prior to the fix.
* That includes which platforms are impacted.
See [best practices](https://github.com/flutter/flutter/blob/main/docs/releases/Hotfix-Documentation-Best-Practices.md) for examples.
< Replace with changelog description here >
[flutter/189039] Improve speed of Mac Flutter tool integration tests in CI
### Workaround:
Is there a workaround for this issue?
No
### Risk:
What is the risk level of this cherry-pick?
### Test Coverage:
Are you confident that your fix is well-tested by automated tests?
### Validation Steps:
What are the steps to validate that this fix works?
This PR correctly skips `Mac tool_integration_tests` in presubmit.
diff --git a/.ci.yaml b/.ci.yaml
index cf96a07..4bbe9f0 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -4568,8 +4568,9 @@
- engine/**
- DEPS
- - name: Mac tool_integration_tests_1_5
+ - name: Mac tool_integration_tests_1
recipe: flutter/flutter_drone
+ bringup: true
timeout: 60
properties:
cpu: arm64
@@ -4583,10 +4584,9 @@
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
]
shard: tool_integration_tests
- subshard: "1_5"
+ subshard: "1_10"
tags: >
["framework", "hostonly", "shard", "mac"]
- test_timeout_secs: "2700"
runIf:
- dev/**
- packages/flutter_tools/**
@@ -4595,8 +4595,9 @@
- engine/**
- DEPS
- - name: Mac tool_integration_tests_2_5
+ - name: Mac tool_integration_tests_2
recipe: flutter/flutter_drone
+ bringup: true
timeout: 60
properties:
cpu: arm64
@@ -4610,10 +4611,9 @@
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
]
shard: tool_integration_tests
- subshard: "2_5"
+ subshard: "2_10"
tags: >
["framework", "hostonly", "shard", "mac"]
- test_timeout_secs: "2700"
runIf:
- dev/**
- packages/flutter_tools/**
@@ -4622,8 +4622,9 @@
- engine/**
- DEPS
- - name: Mac tool_integration_tests_3_5
+ - name: Mac tool_integration_tests_3
recipe: flutter/flutter_drone
+ bringup: true
timeout: 60
properties:
cpu: arm64
@@ -4637,10 +4638,9 @@
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
]
shard: tool_integration_tests
- subshard: "3_5"
+ subshard: "3_10"
tags: >
["framework", "hostonly", "shard", "mac"]
- test_timeout_secs: "2700"
runIf:
- dev/**
- packages/flutter_tools/**
@@ -4649,8 +4649,9 @@
- engine/**
- DEPS
- - name: Mac tool_integration_tests_4_5
+ - name: Mac tool_integration_tests_4
recipe: flutter/flutter_drone
+ bringup: true
timeout: 60
properties:
cpu: arm64
@@ -4664,10 +4665,9 @@
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
]
shard: tool_integration_tests
- subshard: "4_5"
+ subshard: "4_10"
tags: >
["framework", "hostonly", "shard", "mac"]
- test_timeout_secs: "2700"
runIf:
- dev/**
- packages/flutter_tools/**
@@ -4676,8 +4676,9 @@
- engine/**
- DEPS
- - name: Mac tool_integration_tests_5_5
+ - name: Mac tool_integration_tests_5
recipe: flutter/flutter_drone
+ bringup: true
timeout: 60
properties:
cpu: arm64
@@ -4691,10 +4692,144 @@
{"dependency": "goldctl", "version": "git_revision:031e93819017b95c3f2dfe463189c7b8d02f2f83"}
]
shard: tool_integration_tests
- subshard: "5_5"
+ subshard: "5_10"
tags: >
["framework", "hostonly", "shard", "mac"]
- test_timeout_secs: "2700"
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+ - engine/**
+ - DEPS
+
+ - name: Mac tool_integration_tests_6
+ recipe: flutter/flutter_drone
+ bringup: true
+ timeout: 60
+ properties:
+ cpu: arm64
+ add_recipes_cq: "true"
+ dependencies: >-
+ [
+ {"dependency": "android_sdk", "version": "version:36v9unmodified"},
+ {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
+ {"dependency": "open_jdk", "version": "version:21"},
+ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+ {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+ ]
+ shard: tool_integration_tests
+ subshard: "6_10"
+ tags: >
+ ["framework", "hostonly", "shard", "mac"]
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+ - engine/**
+ - DEPS
+
+ - name: Mac tool_integration_tests_7
+ recipe: flutter/flutter_drone
+ bringup: true
+ timeout: 60
+ properties:
+ cpu: arm64
+ add_recipes_cq: "true"
+ dependencies: >-
+ [
+ {"dependency": "android_sdk", "version": "version:36v9unmodified"},
+ {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
+ {"dependency": "open_jdk", "version": "version:21"},
+ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+ {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+ ]
+ shard: tool_integration_tests
+ subshard: "7_10"
+ tags: >
+ ["framework", "hostonly", "shard", "mac"]
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+ - engine/**
+ - DEPS
+
+ - name: Mac tool_integration_tests_8
+ recipe: flutter/flutter_drone
+ bringup: true
+ timeout: 60
+ properties:
+ cpu: arm64
+ add_recipes_cq: "true"
+ dependencies: >-
+ [
+ {"dependency": "android_sdk", "version": "version:36v9unmodified"},
+ {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
+ {"dependency": "open_jdk", "version": "version:21"},
+ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+ {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+ ]
+ shard: tool_integration_tests
+ subshard: "8_10"
+ tags: >
+ ["framework", "hostonly", "shard", "mac"]
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+ - engine/**
+ - DEPS
+
+ - name: Mac tool_integration_tests_9
+ recipe: flutter/flutter_drone
+ bringup: true
+ timeout: 60
+ properties:
+ cpu: arm64
+ add_recipes_cq: "true"
+ dependencies: >-
+ [
+ {"dependency": "android_sdk", "version": "version:36v9unmodified"},
+ {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
+ {"dependency": "open_jdk", "version": "version:21"},
+ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+ {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+ ]
+ shard: tool_integration_tests
+ subshard: "9_10"
+ tags: >
+ ["framework", "hostonly", "shard", "mac"]
+ runIf:
+ - dev/**
+ - packages/flutter_tools/**
+ - bin/**
+ - .ci.yaml
+ - engine/**
+ - DEPS
+
+ - name: Mac tool_integration_tests_10
+ recipe: flutter/flutter_drone
+ bringup: true
+ timeout: 60
+ properties:
+ cpu: arm64
+ add_recipes_cq: "true"
+ dependencies: >-
+ [
+ {"dependency": "android_sdk", "version": "version:36v9unmodified"},
+ {"dependency": "chrome_and_driver", "version": "version:145.0.7632.117"},
+ {"dependency": "open_jdk", "version": "version:21"},
+ {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
+ {"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
+ ]
+ shard: tool_integration_tests
+ subshard: "10_10"
+ tags: >
+ ["framework", "hostonly", "shard", "mac"]
runIf:
- dev/**
- packages/flutter_tools/**
