Rename CT bots back to "Ubuntu"

Speculative fix for decode failure

Bug: skia:6818
Change-Id: I7db0afb87f42cc8372782409cfe74fdb715f95f0
Reviewed-on: https://skia-review.googlesource.com/21362
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Eric Boren <borenet@google.com>

2 files changed, 136 insertions, 137 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 0346797ae3..01ad762b1f 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -157,8 +157,8 @@
   "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
   "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
   "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
-  "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
-  "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
+  "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
+  "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
   "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
   "Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug",
@@ -304,9 +304,9 @@
   "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN",
   "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN",
   "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN",
-  "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
-  "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
-  "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
   "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext",
   "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
   "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f425c964dd..8d199b0232 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -939,28 +939,28 @@
         "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
       ]
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
+        "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
       ]
     },
-    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
+        "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs"
       ]
     },
-    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs"
+        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
       ]
     },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
+    "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs"
+        "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
       ]
     },
     "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
@@ -1815,41 +1815,40 @@
         "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs"
       ]
     },
-    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN"
+        "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs"
       ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN"
       ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs"
-      ],
-      "trigger": "weekly"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-ASAN"
+      ]
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+    "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN": {
       "priority": 0.8,
       "tasks": [
-        "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs"
+        "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Release-TSAN"
       ]
     },
     "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
@@ -7404,6 +7403,50 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
@@ -7508,50 +7551,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
     "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -13640,6 +13639,72 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
+      "dimensions": [
+        "pool:SkiaCT"
+      ],
+      "execution_timeout_ns": 86400000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "ct_skps",
+        "repository=<(REPO)",
+        "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "io_timeout_ns": 3600000000000,
+      "isolate": "ct_skps_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Ubuntu14-Clang-Golo-GPU-GT610-x86_64-Debug-ASAN": {
       "cipd_packages": [
         {
@@ -13796,72 +13861,6 @@
       "max_attempts": 1,
       "priority": 0.8
     },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
-    "Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs": {
-      "dimensions": [
-        "pool:SkiaCT"
-      ],
-      "execution_timeout_ns": 86400000000000,
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "ct_skps",
-        "repository=<(REPO)",
-        "buildername=Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "io_timeout_ns": 3600000000000,
-      "isolate": "ct_skps_skia.isolate",
-      "priority": 0.8
-    },
     "Test-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-PreAbandonGpuContext": {
       "cipd_packages": [
         {