[infra] Prepare test matrix for the Dart 1 removal
* Remove all obsolete builders (only the try jobs used the test matrix).
* Add all missing Dart 2 builders.
Change-Id: I5c97e34928beb9023d87aaa638f759af16a7ccc4
Reviewed-on: https://dart-review.googlesource.com/c/77881
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: Siva Annamalai <asiva@google.com>
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index f76465f..6e247ce 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -180,109 +180,11 @@
"vm-options": ["-DuseFastaParser=true"],
"builder-tag": "analyzer_use_fasta"
}},
- "vm-legacy-(linux|mac|win)-(debug|release)-(ia32|x64)": {
+ "dartk-asan-linux-release-(ia32|x64)": {
"options": {
- "preview-dart-2": false,
- "builder-tag": "swarming"
- }},
- "vm-legacy-checked-(linux|mac|win)-(debug|release)-(ia32|x64)": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "swarming"
- }},
- "vm-legacy-linux-debug-simarm": {
- "options": {
- "preview-dart-2": false,
- "builder-tag": "swarming"
- }},
- "vm-legacy-checked-linux-debug-simarm": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "swarming"
- }},
- "vm-legacy-linux-release-(simarm|simarm64)": {
- "options": {
- "preview-dart-2": false,
- "builder-tag": "swarming"
- }},
- "vm-legacy-checked-linux-release-(simarm|simarm64)": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "swarming"
- }},
- "vm-legacy-mac-(debug|release)-simdbc64": {
- "options": {
- "preview-dart-2": false,
- "builder-tag": "swarming"
- }},
- "vm-legacy-checked-mac-(debug|release)-simdbc64": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "swarming"
- }},
- "vm-legacy-asan-linux-release-x64": {
- "options": {
- "preview-dart-2": false,
"builder-tag": "asan",
"timeout": 240
}},
- "vm-legacy-checked-asan-linux-release-x64": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "asan",
- "timeout": 240
- }},
- "vm-legacy-optcounter-linux-release-(ia32|x64)": {
- "options": {
- "preview-dart-2": false,
- "builder-tag": "optimization_counter_threshold",
- "vm-options": ["--optimization-counter-threshold=5"]
- }},
- "vm-legacy-optcounter-checked-linux-release-(ia32|x64)": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "builder-tag": "optimization_counter_threshold",
- "vm-options": ["--optimization-counter-threshold=5"]
- }},
- "vm-legacy-reload-linux-(debug|release)-x64": {
- "options": {
- "preview-dart-2": false,
- "hot-reload": true
- }},
- "vm-legacy-reload-checked-linux-(debug|release)-x64": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "hot-reload": true
- }},
- "vm-legacy-reload-mac-(debug|release)-simdbc64": {
- "options": {
- "preview-dart-2": false,
- "hot-reload": true
- }},
- "vm-legacy-reload-checked-mac-(debug|release)-simdbc64": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "hot-reload": true
- }},
- "vm-legacy-reload-rollback-linux-(debug|release)-x64": {
- "options": {
- "preview-dart-2": false,
- "hot-reload-rollback": true
- }},
- "vm-legacy-reload-rollback-checked-linux-(debug|release)-x64": {
- "options": {
- "preview-dart-2": false,
- "checked": true,
- "hot-reload-rollback": true
- }},
"dart2js-(linux|mac|win)-chrome": {
"options": {
"use-sdk": true
@@ -374,11 +276,11 @@
"options": {
"checked": true
}},
- "dartk-win-release-x64": { },
+ "dartk-win-(debug|release)-(ia32|x64)": { },
"dartk-(linux|mac|win)-product-x64": { },
- "dartk-linux-(debug|release)-simdbc64": { },
+ "dartk-(linux|mac)-(debug|release)-simdbc64": { },
"dartk-linux-release-(simarm|simarm64)": { },
- "dartk-optcounter-linux-release-x64": {
+ "dartk-optcounter-linux-release-(ia32|x64)": {
"options": {
"builder-tag": "optimization_counter_threshold",
"vm-options": ["--optimization-counter-threshold=5"]
@@ -541,47 +443,6 @@
},
{
"builders": [
- "vm-linux-debug-ia32",
- "vm-linux-debug-simarm",
- "vm-linux-debug-x64",
- "vm-linux-release-ia32",
- "vm-linux-release-simarm",
- "vm-linux-release-simarm64",
- "vm-linux-release-x64",
- "vm-mac-debug-ia32",
- "vm-mac-debug-simdbc64",
- "vm-mac-debug-x64",
- "vm-mac-release-ia32",
- "vm-mac-release-simdbc64",
- "vm-mac-release-x64",
- "vm-win-debug-ia32",
- "vm-win-debug-x64",
- "vm-win-release-ia32",
- "vm-win-release-x64"
- ],
- "meta": {
- "description": "This configuration is used by the vm debug and vm release builders."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": ["runtime"]
- },
- {
- "name": "vm tests",
- "arguments": [
- "-nvm-legacy-${system}-${mode}-${arch}"]
- },
- {
- "name": "checked vm tests",
- "arguments": [
- "-nvm-legacy-checked-${system}-${mode}-${arch}"]
- }
- ]
- },
- {
- "builders": [
"vm-canary-linux-debug"
],
"meta": {
@@ -633,8 +494,7 @@
{
"name": "vm tests",
"arguments": [
- "-ndartkp-${system}-${mode}-${arch}",
- "-v"
+ "-ndartkp-${system}-${mode}-${arch}"
],
"fileset": "vm-kernel",
"shards": 10
@@ -660,8 +520,7 @@
{
"name": "vm tests",
"arguments": [
- "-ndartkp-obfuscate-${system}-${mode}-${arch}",
- "-v"
+ "-ndartkp-obfuscate-${system}-${mode}-${arch}"
],
"fileset": "vm-kernel",
"shards": 10
@@ -670,35 +529,23 @@
},
{
"builders": [
- "vm-asan-linux-release-x64"
+ "vm-kernel-asan-linux-release-ia32",
+ "vm-kernel-asan-linux-release-x64"
],
"meta": {
"description": "This configuration is used by the vm builders with address sanitizing (asan). We have to run gn.py with the DART_USE_ASAN options, which we do by running generate_buildfiles."
},
"steps": [
{
- "name": "generate build files with ASAN_USE_DART=1",
- "script": "tools/generate_buildfiles.py",
- "environment": {"DART_USE_ASAN": 1}
- },
- {
"name": "build dart",
"script": "tools/build.py",
- "arguments": ["-v", "runtime"]
+ "arguments": ["runtime"],
+ "environment": {"DART_USE_ASAN": 1}
},
{
"name": "vm tests",
"arguments": [
- "-nvm-legacy-asan-linux-release-x64"],
- "environment": {
- "ASAN_OPTIONS": "handle_segv=0:detect_stack_use_after_return=0",
- "ASAN_SYMBOLIZER_PATH": "buildtools/linux-x64/clang/bin/llvm-symbolizer"
- }
- },
- {
- "name": "checked vm tests",
- "arguments": [
- "-nvm-legacy-checked-asan-linux-release-x64"],
+ "-ndartk-asan-linux-release-${arch}"],
"environment": {
"ASAN_OPTIONS": "handle_segv=0:detect_stack_use_after_return=0",
"ASAN_SYMBOLIZER_PATH": "buildtools/linux-x64/clang/bin/llvm-symbolizer"
@@ -708,6 +555,7 @@
},
{
"builders": [
+ "vm-kernel-linux-debug-ia32",
"vm-kernel-linux-debug-simdbc64",
"vm-kernel-linux-debug-x64",
"vm-kernel-linux-product-x64",
@@ -715,10 +563,15 @@
"vm-kernel-linux-release-simarm64",
"vm-kernel-linux-release-simdbc64",
"vm-kernel-linux-release-x64",
+ "vm-kernel-mac-debug-simdbc64",
"vm-kernel-mac-debug-x64",
"vm-kernel-mac-product-x64",
+ "vm-kernel-mac-release-simdbc64",
"vm-kernel-mac-release-x64",
+ "vm-kernel-win-debug-ia32",
+ "vm-kernel-win-debug-x64",
"vm-kernel-win-product-x64",
+ "vm-kernel-win-release-ia32",
"vm-kernel-win-release-x64"
],
"meta": {
@@ -918,34 +771,7 @@
},
{
"builders": [
- "vm-optcounter-threshold-linux-release-ia32",
- "vm-optcounter-threshold-linux-release-x64"
- ],
- "meta": {
- "description": "This is the configuration for the optcounter builders, under the vm-misc group. They run the same tests as the ordinary VM builders, but add extra options to the vm."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": [
- "runtime"
- ]
- },
- {
- "name": "vm tests",
- "arguments": [
- "-nvm-legacy-optcounter-linux-release-${arch}"]
- },
- {
- "name": "checked vm tests",
- "arguments": [
- "-nvm-legacy-optcounter-checked-linux-release-${arch}"]
- }
- ]
- },
- {
- "builders": [
+ "vm-kernel-optcounter-threshold-linux-release-ia32",
"vm-kernel-optcounter-threshold-linux-release-x64"
],
"meta": {
@@ -962,7 +788,7 @@
{
"name": "vm tests",
"arguments": [
- "-ndartk-optcounter-linux-release-x64"],
+ "-ndartk-optcounter-linux-release-${arch}"],
"fileset": "vm-kernel",
"shards": 10
}
@@ -970,34 +796,6 @@
},
{
"builders": [
- "vm-reload-linux-debug-x64",
- "vm-reload-linux-release-x64",
- "vm-reload-mac-debug-simdbc64",
- "vm-reload-mac-release-simdbc64"
- ],
- "meta": {
- "description": "This is the configuration for the hot reload builders."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": ["runtime"]
- },
- {
- "name": "vm tests",
- "arguments": [
- "-nvm-legacy-reload-${system}-${mode}-${arch}"]
- },
- {
- "name": "checked vm tests",
- "arguments": [
- "-nvm-legacy-reload-checked-${system}-${mode}-${arch}"]
- }
- ]
- },
- {
- "builders": [
"vm-kernel-reload-linux-debug-x64",
"vm-kernel-reload-linux-release-x64",
"vm-kernel-reload-mac-debug-simdbc64",
@@ -1021,32 +819,6 @@
},
{
"builders": [
- "vm-reload-rollback-linux-debug-x64",
- "vm-reload-rollback-linux-release-x64"
- ],
- "meta": {
- "description": "This is the configuration for reload rollback builders."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": ["runtime"]
- },
- {
- "name": "vm tests",
- "arguments": [
- "-nvm-legacy-reload-rollback-linux-${mode}-x64"]
- },
- {
- "name": "checked vm tests",
- "arguments": [
- "-nvm-legacy-reload-rollback-checked-linux-${mode}-x64"]
- }
- ]
- },
- {
- "builders": [
"vm-kernel-reload-rollback-linux-debug-x64",
"vm-kernel-reload-rollback-linux-release-x64"
],
