From 80119cb9009dc9af7d523f3437467e8933860260 Mon Sep 17 00:00:00 2001
From: Joshua Litt <joshualitt@google.com>
Date: Wed, 8 Dec 2021 17:04:51 +0000
Subject: [PATCH] [infra] Add dart2js-canary builder.

Change-Id: Ibf41b38e2ee590aed46f4f763f103c0e42bca311
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/221985
Reviewed-by: Mark Zhou <markzipan@google.com>
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Joshua Litt <joshualitt@google.com>
---
 tools/bots/test_matrix.json | 72 ++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 9 deletions(-)

diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index c060e704df1..7a644b36dd5 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -543,6 +543,11 @@
       }
     },
     "dart2js-(linux|mac|win)-chrome": {
+      "options": {
+        "use-sdk": true
+      }
+    },
+    "dart2js-canary-(linux|mac|win)-chrome": {
       "options": {
         "use-sdk": true,
         "dart2js-options": [
@@ -691,9 +696,9 @@
         ]
       }
     },
-    "dart2js-modern-(linux|mac|win)-d8": {
+    "dart2js-canary-(linux|mac|win)-d8": {
       "options": {
-        "builder-tag": "dart2js_modern",
+        "builder-tag": "dart2js_canary",
         "use-sdk": true,
         "dart2js-options": [
           "--canary"
@@ -2396,6 +2401,62 @@
         }
       ]
     },
+    {
+      "builders": [
+        "dart2js-canary-x64"
+      ],
+      "meta": {
+        "description": "dart2js canary tests."
+      },
+      "steps": [
+        {
+          "name": "build dart",
+          "script": "tools/build.py",
+          "arguments": [
+            "create_sdk",
+            "dart2js_bot"
+          ]
+        },
+        {
+          "name": "dart2js canary d8 tests",
+          "arguments": [
+            "-ndart2js-canary-linux-d8",
+            "language",
+            "corelib",
+            "web"
+          ],
+          "shards": 6,
+          "fileset": "web_platform_hostasserts_nnbd"
+        },
+        {
+          "name": "dart2js canary chrome tests",
+          "arguments": [
+            "-ndart2js-canary-linux-chrome",
+            "web"
+          ],
+          "shards": 3,
+          "fileset": "web_platform_hostasserts_nnbd"
+        },
+        {
+          "name": "dart2js canary lib tests",
+          "arguments": [
+            "-ndart2js-canary-linux-chrome",
+            "lib"
+          ],
+          "shards": 3,
+          "fileset": "web_platform_hostasserts_nnbd"
+        },
+        {
+          "name": "dart2js canary co19 tests",
+          "arguments": [
+            "-ndart2js-canary-linux-chrome",
+            "co19"
+          ],
+          "shards": 6,
+          "fileset": "web_platform_hostasserts_nnbd"
+        }
+      ]
+    },
     {
       "builders": [
         "dart2js-unit-linux-x64-release"
@@ -2643,13 +2704,6 @@
             "web_2"
           ]
         },
-        {
-          "name": "dart2js --canary smoke tests",
-          "arguments": [
-            "-ndart2js-modern-linux-d8",
-            "web_2"
-          ]
-        },
         {
           "name": "dart2js d8 fragment merging tests",
           "arguments": [