[infra] Remove obsolete analyzer test configurations
The --preview-dart-2 flag flip makes it unecessary to:
* Test Dart 2 configs in host-checked mode.
* Test --checked and --strong together.
* Test --preview-dart-2 and --strong separately.
Change-Id: I1738d351c866fb95fd9e1249f5f4ffb88169e106
Reviewed-on: https://dart-review.googlesource.com/59900
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index a12dfc9..2007e17 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -1579,106 +1579,6 @@
},
{
"builders": [
- "analyzer-linux-release-strong-hostchecked"
- ],
- "meta": {
- "description": "This configuration is used by the analyzer CQ builder running in strong and hostchecked mode."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": ["create_sdk"]
- },
- {
- "name": "analyze tests",
- "arguments": [
- "--compiler=dart2analyzer",
- "--host-checked",
- "--strong"
- ]
- },
- {
- "name": "analyze pkg tests",
- "arguments": [
- "--compiler=dart2analyzer",
- "--host-checked",
- "--strong",
- "pkg"
- ]
- },
- {
- "name": "analyze tests checked",
- "arguments": [
- "--checked",
- "--compiler=dart2analyzer",
- "--host-checked",
- "--strong"
- ]
- },
- {
- "name": "analyze pkg tests checked",
- "arguments": [
- "--checked",
- "--compiler=dart2analyzer",
- "--host-checked",
- "--strong",
- "pkg"
- ]
- },
- {
- "name": "analyze tests preview-dart2",
- "arguments": [
- "--compiler=dart2analyzer",
- "--host-checked",
- "--strong",
- "--preview-dart-2"
- ]
- },
- {
- "name": "analyzer unit tests",
- "arguments": [
- "--checked",
- "--compiler=none",
- "--no-preview-dart-2",
- "--use-sdk",
- "pkg/analyzer"
- ]
- },
- {
- "name": "analysis_server unit tests",
- "arguments": [
- "--checked",
- "--compiler=none",
- "--no-preview-dart-2",
- "--use-sdk",
- "pkg/analysis_server"
- ]
- },
- {
- "name": "analyzer_cli unit tests",
- "arguments": [
- "--checked",
- "--compiler=none",
- "--no-preview-dart-2",
- "--use-sdk",
- "pkg/analyzer_cli"
- ]
- },
- {
- "name": "analyzer_plugin unit tests",
- "arguments": [
- "--checked",
- "--compiler=none",
- "--no-preview-dart-2",
- "--use-sdk",
- "pkg/analyzer_plugin"
- ]
- }
- ]
- },
- {
- "builders": [
"analyzer-strong-linux-release",
"analyzer-strong-mac-release",
"analyzer-strong-win-release"
@@ -1693,44 +1593,22 @@
"arguments": ["create_sdk"]
},
{
- "name": "analyze tests",
- "arguments": ["--compiler=dart2analyzer", "--strong", "--use-sdk"]
- },
- {
"name": "analyze pkg tests",
"arguments": [
"--compiler=dart2analyzer",
+ "--preview-dart-2",
"--strong",
"--use-sdk",
"pkg"
]
},
{
- "name": "analyze tests checked",
- "arguments": [
- "--checked",
- "--compiler=dart2analyzer",
- "--strong",
- "--use-sdk"
- ]
- },
- {
- "name": "analyze pkg tests checked",
- "arguments": [
- "--checked",
- "--compiler=dart2analyzer",
- "--use-sdk",
- "--strong",
- "pkg"
- ]
- },
- {
"name": "analyze tests preview-dart2",
"arguments": [
"--compiler=dart2analyzer",
+ "--preview-dart-2",
"--strong",
- "--use-sdk",
- "--preview-dart-2"
+ "--use-sdk"
]
}
]
diff --git a/tools/infra/config/cq.cfg b/tools/infra/config/cq.cfg
index bae7a15..9c3f0bf 100644
--- a/tools/infra/config/cq.cfg
+++ b/tools/infra/config/cq.cfg
@@ -19,7 +19,8 @@
try_job {
buckets {
name: "luci.dart.try"
- builders { name: "analyzer-linux-release-strong-hostchecked-try" }
+ builders { name: "analyzer-linux-release-try" }
+ builders { name: "analyzer-strong-linux-release-try" }
builders { name: "benchmark-linux-try" }
builders { name: "dart-sdk-windows-try" }
builders { name: "dart2js-linux-d8-hostchecked-try" }
