From 8ff692acf4ad71ec740855f9a2709c5f85517c99 Mon Sep 17 00:00:00 2001
From: Alexander Thomas <athom@google.com>
Date: Tue, 25 Sep 2018 19:03:54 +0000
Subject: [PATCH] [infra] Remove Dart 1 builders from the CQ (Part I)

* Remove obsolete vm-kernel-legacy and analyzer-cfe builders.

Change-Id: I6b316359b1a2c5ce2adcf276578a9b9be5db5c15
Reviewed-on: https://dart-review.googlesource.com/76480
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Alexander Thomas <athom@google.com>
---
 tools/bots/test_matrix.json | 59 +++++--------------------------------
 tools/infra/config/cq.cfg   |  2 --
 2 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index 9fe04ff44717a..ab4eb094461f4 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -373,12 +373,13 @@
       "options": {
         "vm-options": ["--no-enable-malloc-hooks"]
     }},
-    "dartk-(linux|mac)-(debug|release)-x64": { },
+    "dartk-(linux|mac)-(debug|release)-(ia32|x64)": { },
     "dartk-checked-linux-release-x64": {
       "options": {
         "checked": true
     }},
     "dartk-win-release-x64": { },
+    "dartk-(linux|mac|win)-product-x64": { },
     "dartk-linux-(debug|release)-simdbc64": { },
     "dartk-linux-release-(simarm|simarm64)": { },
     "dartk-optcounter-linux-release-x64": {
@@ -386,10 +387,6 @@
         "builder-tag": "optimization_counter_threshold",
         "vm-options": ["--optimization-counter-threshold=5"]
       }},
-    "dartk-legacy-linux-release-x64": {
-      "options": {
-        "preview-dart-2": false
-      }},
     "dartk-reload-linux-(debug|release)-x64": {
       "options": {
         "hot-reload": true
@@ -432,12 +429,6 @@
         "enable-asserts": true,
         "use-sdk": true
       }},
-    "analyzer-cfe-(linux|mac|win)": {
-      "options": {
-        "compiler": "dart2analyzer",
-        "use-cfe": true,
-        "use-sdk": true
-      }},
     "analyzer-fasta_parser-linux": {
       "options": {
         "compiler": "dart2analyzer",
@@ -625,39 +616,17 @@
         {
           "name": "vm ia32 tests",
           "arguments": [
-            "-nvm-legacy-linux-debug-ia32",
+            "-ndartk-linux-debug-ia32",
             "vm"]
         },
         {
           "name": "vm x64 tests",
           "arguments": [
-            "-nvm-legacy-linux-debug-x64",
+            "-ndartk-linux-debug-x64",
             "vm"]
         }
       ]
     },
-    {
-      "builders": [
-        "vm-kernel-legacy-linux-release-x64"
-      ],
-      "meta": {
-        "description": "Tests the vm with dartk in legacy mode."
-      },
-      "steps": [
-        {
-          "name": "build dart",
-          "script": "tools/build.py",
-          "arguments": ["runtime_kernel"]
-        },
-        {
-          "name": "vm legacy tests",
-          "arguments": [
-            "-ndartk-legacy-linux-release-x64"],
-          "fileset": "vm-kernel",
-          "shards": 10
-        }
-      ]
-    },
     {
       "builders": [
         "vm-kernel-precomp-linux-debug-x64",
@@ -761,12 +730,15 @@
       "builders": [
         "vm-kernel-linux-debug-simdbc64",
         "vm-kernel-linux-debug-x64",
+        "vm-kernel-linux-product-x64",
         "vm-kernel-linux-release-simarm",
         "vm-kernel-linux-release-simarm64",
         "vm-kernel-linux-release-simdbc64",
         "vm-kernel-linux-release-x64",
         "vm-kernel-mac-debug-x64",
+        "vm-kernel-mac-product-x64",
         "vm-kernel-mac-release-x64",
+        "vm-kernel-win-product-x64",
         "vm-kernel-win-release-x64"
       ],
       "meta": {
@@ -1621,23 +1593,6 @@
         }
       ]
     },
-    {
-      "builders": [
-        "analyzer-use-cfe-linux",
-        "analyzer-use-cfe-mac",
-        "analyzer-use-cfe-win"
-      ],
-      "meta": {
-        "description": "The configuration used by the analyzer builders running --use-cfe."
-      },
-      "steps": [
-        {
-          "name": "build dart",
-          "script": "tools/build.py",
-          "arguments": ["create_sdk"]
-        }
-      ]
-    },
     {
       "builders": ["analyzer-analysis-server-linux"],
       "meta": {
diff --git a/tools/infra/config/cq.cfg b/tools/infra/config/cq.cfg
index 758bbb79c9be7..a756831be49c3 100644
--- a/tools/infra/config/cq.cfg
+++ b/tools/infra/config/cq.cfg
@@ -33,8 +33,6 @@ verifiers {
       builders { name: "vm-kernel-linux-release-x64-try" }
       builders { name: "vm-kernel-mac-release-x64-try" experiment_percentage: 5 }
       builders { name: "vm-linux-product-x64-try" }
-      builders { name: "vm-linux-release-x64-try" }
-      builders { name: "vm-mac-release-x64-try" }
     }
     try_job_retry_config {
       try_job_retry_quota: 0