From 8d93701b0ae4f9501fa42e7f60edea3b21de7e55 Mon Sep 17 00:00:00 2001
From: Mike Shal <mshal@mozilla.com>
Date: Thu, 2 Jun 2016 14:23:09 -0400
Subject: [PATCH] Bug 1276352 - Fix platforms to match buildbot convention;
 r=dustin, garndt MozReview-Commit-ID: 62fKVy2UEUd

---
 taskcluster/ci/legacy/tasks/builds/base_linux32.yml     | 6 +++---
 taskcluster/ci/legacy/tasks/builds/dbg_linux32.yml      | 8 ++++----
 taskcluster/ci/legacy/tasks/builds/dbg_linux64-asan.yml | 6 +++---
 taskcluster/ci/legacy/tasks/builds/dbg_linux64.yml      | 6 +++---
 taskcluster/ci/legacy/tasks/builds/dbg_macosx64.yml     | 6 +++---
 taskcluster/ci/legacy/tasks/builds/opt_linux32.yml      | 2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/taskcluster/ci/legacy/tasks/builds/base_linux32.yml b/taskcluster/ci/legacy/tasks/builds/base_linux32.yml
index 2ab4f8bd0bd2..a6cfcaf90351 100644
--- a/taskcluster/ci/legacy/tasks/builds/base_linux32.yml
+++ b/taskcluster/ci/legacy/tasks/builds/base_linux32.yml
@@ -1,13 +1,13 @@
 $inherits:
   from: 'tasks/builds/firefox_docker_base.yml'
   variables:
-    build_name: 'linux32'
+    build_name: 'linux'
 task:
   #workerType: ..
 
   routes:
-    - 'index.buildbot.branches.{{project}}.linux32'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux32'
+    - 'index.buildbot.branches.{{project}}.linux'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux'
 
   scopes:
     - 'docker-worker:cache:tooltool-cache'
diff --git a/taskcluster/ci/legacy/tasks/builds/dbg_linux32.yml b/taskcluster/ci/legacy/tasks/builds/dbg_linux32.yml
index a69a75f8e095..01e55fa3fca1 100644
--- a/taskcluster/ci/legacy/tasks/builds/dbg_linux32.yml
+++ b/taskcluster/ci/legacy/tasks/builds/dbg_linux32.yml
@@ -1,12 +1,12 @@
 $inherits:
   from: 'tasks/builds/base_linux32.yml'
   variables:
-    build_name: 'linux32'
-    build_type: 'dbg'
+    build_name: 'linux'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux32 Dbg'
-      description: 'Linux32 Dbg'
+      name: '[TC] Linux32 Debug'
+      description: 'Linux32 Debug'
 
   routes:
     - 'coalesce.v1.builds.{{project}}.dbg_linux32'
diff --git a/taskcluster/ci/legacy/tasks/builds/dbg_linux64-asan.yml b/taskcluster/ci/legacy/tasks/builds/dbg_linux64-asan.yml
index 14ce42506367..bf2611687ae7 100644
--- a/taskcluster/ci/legacy/tasks/builds/dbg_linux64-asan.yml
+++ b/taskcluster/ci/legacy/tasks/builds/dbg_linux64-asan.yml
@@ -2,11 +2,11 @@ $inherits:
   from: 'tasks/builds/base_linux64.yml'
   variables:
     build_name: 'linux64-asan'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux64 ASan Dbg'
-      description: 'Linux64 ASan Dbg'
+      name: '[TC] Linux64 ASan Debug'
+      description: 'Linux64 ASan Debug'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-asan'
diff --git a/taskcluster/ci/legacy/tasks/builds/dbg_linux64.yml b/taskcluster/ci/legacy/tasks/builds/dbg_linux64.yml
index b1552ce67e8a..c84b1c7a336b 100644
--- a/taskcluster/ci/legacy/tasks/builds/dbg_linux64.yml
+++ b/taskcluster/ci/legacy/tasks/builds/dbg_linux64.yml
@@ -2,11 +2,11 @@ $inherits:
   from: 'tasks/builds/base_linux64.yml'
   variables:
     build_name: 'linux64'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux64 Dbg'
-      description: 'Linux64 Dbg'
+      name: '[TC] Linux64 Debug'
+      description: 'Linux64 Debug'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-debug'
diff --git a/taskcluster/ci/legacy/tasks/builds/dbg_macosx64.yml b/taskcluster/ci/legacy/tasks/builds/dbg_macosx64.yml
index 89d93fb56f60..ba97b55dcb3e 100644
--- a/taskcluster/ci/legacy/tasks/builds/dbg_macosx64.yml
+++ b/taskcluster/ci/legacy/tasks/builds/dbg_macosx64.yml
@@ -2,11 +2,11 @@ $inherits:
   from: 'tasks/builds/base_macosx64.yml'
   variables:
     build_name: 'macosx64'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] MacOSX64 Dbg'
-      description: 'MacOSX64 Dbg'
+      name: '[TC] MacOSX64 Debug'
+      description: 'MacOSX64 Debug'
 
   workerType: dbg-macosx64
 
diff --git a/taskcluster/ci/legacy/tasks/builds/opt_linux32.yml b/taskcluster/ci/legacy/tasks/builds/opt_linux32.yml
index b836477a4c4a..0c82117963e0 100644
--- a/taskcluster/ci/legacy/tasks/builds/opt_linux32.yml
+++ b/taskcluster/ci/legacy/tasks/builds/opt_linux32.yml
@@ -1,7 +1,7 @@
 $inherits:
   from: 'tasks/builds/base_linux32.yml'
   variables:
-    build_name: 'linux32'
+    build_name: 'linux'
     build_type: 'opt'
 task:
   metadata: