Bug 1262730 - Rename b2g tooltool manifests. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Apr 2016 13:59:49 +0900
changeset 348806 c928ea5c499bb540b03a48aef7a8ded828df5116
parent 348805 dfff0b460314765f76adf63cce6ebe255afb0a24
child 348807 11edf75d48c6b3d2c4ada21841f027367777b230
push id14928
push userbmo:mh+mozilla@glandium.org
push dateFri, 08 Apr 2016 05:15:03 +0000
reviewersmshal
bugs1262730, 1255876
milestone48.0a1
Bug 1262730 - Rename b2g tooltool manifests. r=mshal Somehow, while every non-b2g tooltool manifest has a .manifest extension, the b2g ones have a .tt extension that confuses mozreview (bug 1255876). Let's just rename these files.
b2g/config/aries/config.json
b2g/config/aries/releng-aries.manifest
b2g/config/aries/releng-aries.tt
b2g/config/dolphin/config.json
b2g/config/dolphin/releng-dolphin.manifest
b2g/config/dolphin/releng-dolphin.tt
b2g/config/emulator-ics/config.json
b2g/config/emulator-ics/releng-emulator-ics.manifest
b2g/config/emulator-ics/releng-emulator-ics.tt
b2g/config/emulator-jb/config.json
b2g/config/emulator-jb/releng-emulator-jb.manifest
b2g/config/emulator-jb/releng-emulator-jb.tt
b2g/config/emulator-kk/config.json
b2g/config/emulator-kk/releng-emulator-kk.manifest
b2g/config/emulator-kk/releng-emulator-kk.tt
b2g/config/emulator-l/config.json
b2g/config/emulator-l/releng-emulator-l.manifest
b2g/config/emulator-l/releng-emulator-l.tt
b2g/config/emulator-x86-kk/config.json
b2g/config/emulator-x86-kk/releng-emulator-kk.manifest
b2g/config/emulator-x86-kk/releng-emulator-kk.tt
b2g/config/emulator-x86-l/config.json
b2g/config/emulator-x86-l/releng-emulator-l.manifest
b2g/config/emulator-x86-l/releng-emulator-l.tt
b2g/config/emulator/config.json
b2g/config/emulator/releng-emulator.manifest
b2g/config/emulator/releng-emulator.tt
b2g/config/flame-kk/config.json
b2g/config/flame-kk/releng-flame-kk.manifest
b2g/config/flame-kk/releng-flame-kk.tt
b2g/config/flame/config.json
b2g/config/flame/releng-flame.manifest
b2g/config/flame/releng-flame.tt
b2g/config/nexus-4-kk/config.json
b2g/config/nexus-4-kk/releng-mako.manifest
b2g/config/nexus-4-kk/releng-mako.tt
b2g/config/nexus-4/config.json
b2g/config/nexus-4/releng-mako.manifest
b2g/config/nexus-4/releng-mako.tt
b2g/config/nexus-5-l/config.json
b2g/config/nexus-5-l/releng-nexus5.manifest
b2g/config/nexus-5-l/releng-nexus5.tt
testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml
testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml
testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml
testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml
--- a/b2g/config/aries/config.json
+++ b/b2g/config/aries/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-aries.tt",
+    "tooltool_manifest": "releng-aries.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "dosfstools"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["", "blobfree"],
     "upload_files": [
rename from b2g/config/dolphin/releng-dolphin.tt
rename to b2g/config/aries/releng-aries.manifest
--- a/b2g/config/dolphin/config.json
+++ b/b2g/config/dolphin/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-dolphin.tt",
+    "tooltool_manifest": "releng-dolphin.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "bc"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["kernelheader", ""],
     "upload_files": [
rename from b2g/config/aries/releng-aries.tt
rename to b2g/config/dolphin/releng-dolphin.manifest
--- a/b2g/config/emulator-ics/config.json
+++ b/b2g/config/emulator-ics/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-ics.tt",
+    "tooltool_manifest": "releng-emulator-ics.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator/releng-emulator.tt
rename to b2g/config/emulator-ics/releng-emulator-ics.manifest
--- a/b2g/config/emulator-jb/config.json
+++ b/b2g/config/emulator-jb/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-jb.tt",
+    "tooltool_manifest": "releng-emulator-jb.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-x86-l/releng-emulator-l.tt
rename to b2g/config/emulator-jb/releng-emulator-jb.manifest
--- a/b2g/config/emulator-kk/config.json
+++ b/b2g/config/emulator-kk/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-kk.tt",
+    "tooltool_manifest": "releng-emulator-kk.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-x86-kk/releng-emulator-kk.tt
rename to b2g/config/emulator-kk/releng-emulator-kk.manifest
--- a/b2g/config/emulator-l/config.json
+++ b/b2g/config/emulator-l/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-l.tt",
+    "tooltool_manifest": "releng-emulator-l.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-l/releng-emulator-l.tt
rename to b2g/config/emulator-l/releng-emulator-l.manifest
--- a/b2g/config/emulator-x86-kk/config.json
+++ b/b2g/config/emulator-x86-kk/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-kk.tt",
+    "tooltool_manifest": "releng-emulator-kk.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-kk/releng-emulator-kk.tt
rename to b2g/config/emulator-x86-kk/releng-emulator-kk.manifest
--- a/b2g/config/emulator-x86-l/config.json
+++ b/b2g/config/emulator-x86-l/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator-l.tt",
+    "tooltool_manifest": "releng-emulator-l.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-jb/releng-emulator-jb.tt
rename to b2g/config/emulator-x86-l/releng-emulator-l.manifest
--- a/b2g/config/emulator/config.json
+++ b/b2g/config/emulator/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-emulator.tt",
+    "tooltool_manifest": "releng-emulator.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["droid", "package-emulator", "package-tests"],
     "upload_files": [
rename from b2g/config/emulator-ics/releng-emulator-ics.tt
rename to b2g/config/emulator/releng-emulator.manifest
--- a/b2g/config/flame-kk/config.json
+++ b/b2g/config/flame-kk/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-flame-kk.tt",
+    "tooltool_manifest": "releng-flame-kk.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "dosfstools", "java-1.6.0-openjdk"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["", "blobfree"],
     "upload_files": [
rename from b2g/config/flame-kk/releng-flame-kk.tt
rename to b2g/config/flame-kk/releng-flame-kk.manifest
--- a/b2g/config/flame/config.json
+++ b/b2g/config/flame/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-flame.tt",
+    "tooltool_manifest": "releng-flame.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2", "dosfstools"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": [],
     "upload_files": [
rename from b2g/config/flame/releng-flame.tt
rename to b2g/config/flame/releng-flame.manifest
--- a/b2g/config/nexus-4-kk/config.json
+++ b/b2g/config/nexus-4-kk/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-mako.tt",
+    "tooltool_manifest": "releng-mako.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["", "blobfree"],
     "upload_files": [
rename from b2g/config/nexus-4-kk/releng-mako.tt
rename to b2g/config/nexus-4-kk/releng-mako.manifest
--- a/b2g/config/nexus-4/config.json
+++ b/b2g/config/nexus-4/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-mako.tt",
+    "tooltool_manifest": "releng-mako.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": [],
     "upload_files": [
rename from b2g/config/nexus-4/releng-mako.tt
rename to b2g/config/nexus-4/releng-mako.manifest
--- a/b2g/config/nexus-5-l/config.json
+++ b/b2g/config/nexus-5-l/config.json
@@ -1,11 +1,11 @@
 {
     "config_version": 2,
-    "tooltool_manifest": "releng-nexus5.tt",
+    "tooltool_manifest": "releng-nexus5.manifest",
     "mock_target": "mozilla-centos6-x86_64",
     "mock_packages": ["ccache", "make", "bison", "flex", "gcc", "g++", "mpfr", "zlib-devel", "ncurses-devel", "zip", "autoconf213", "glibc-static", "perl-Digest-SHA", "wget", "alsa-lib", "atk", "cairo", "dbus-glib", "fontconfig", "freetype", "glib2", "gtk2", "libXRender", "libXt", "pango", "mozilla-python27-mercurial", "openssh-clients", "nss-devel", "glibc-devel.i686", "libstdc++.i686", "zlib-devel.i686", "ncurses-devel.i686", "libX11-devel.i686", "mesa-libGL-devel.i686", "mesa-libGL-devel", "libX11-devel", "git", "libxml2"],
     "mock_files": [
         ["/home/cltbld/.ssh", "/home/mock_mozilla/.ssh"],
         ["/builds/crash-stats-api.token", "/builds/crash-stats-api.token"]
     ],
     "build_targets": ["", "blobfree"],
     "upload_files": [
rename from b2g/config/nexus-5-l/releng-nexus5.tt
rename to b2g/config/nexus-5-l/releng-nexus5.manifest
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_debug.yml
@@ -24,9 +24,9 @@ task:
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-ics-debug: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-ics-debug-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator'
       B2G_DEBUG: 1
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_ics_opt.yml
@@ -26,9 +26,9 @@ task:
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-ics-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-ics-opt-objdir-gecko: /home/worker/objdir-gecko
 
     env:
       TARGET: 'emulator'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-ics/releng-emulator-ics.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_debug.yml
@@ -25,12 +25,12 @@ task:
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-jb-debug: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-jb-debug-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
       B2G_DEBUG: 1
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.manifest'
       # This setting is to offset the number of arugments passsed into docker run
       # for https://github.com/docker/docker/issues/14203
       DOCKER_OVERRIDE: 1
--- a/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_jb_opt.yml
@@ -22,9 +22,9 @@ task:
         platform: b2g-emu-jb
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-jb-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-jb-opt-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-jb'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-jb/releng-emulator-jb.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_debug.yml
@@ -24,13 +24,13 @@ task:
         platform: b2g-emu-kk
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-kk-debug: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-kk-debug-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.manifest'
       B2G_DEBUG: 1
       # This setting is to offset the number of arugments passsed into docker run
       # for https://github.com/docker/docker/issues/14203
       DOCKER_OVERRIDE: 1
--- a/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_kk_opt.yml
@@ -25,9 +25,9 @@ task:
         platform: b2g-emu-kk
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-kk-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-kk-opt-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-kk/releng-emulator-kk.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_debug.yml
@@ -24,10 +24,10 @@ task:
         platform: b2g-emu-l
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-l-debug: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-l-debug-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.manifest'
       B2G_DEBUG: 1
--- a/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_l_opt.yml
@@ -22,9 +22,9 @@ task:
         platform: b2g-emu-l
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-l-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-l-opt-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-l/releng-emulator-l.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_debug.yml
@@ -24,10 +24,10 @@ task:
         platform: b2g-emu-x86-kk
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-kk-x86-debug: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-kk-x86-debug-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.manifest'
       B2G_DEBUG: 1
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_kk_opt.yml
@@ -22,9 +22,9 @@ task:
         platform: b2g-emu-x86-kk
 
   payload:
     cache:
       level-{{level}}-{{project}}-emulator-kk-x86-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-kk-x86-opt-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-kk'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-kk/releng-emulator-kk.manifest'
--- a/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml
+++ b/testing/taskcluster/tasks/builds/b2g_emulator_x86_l_opt.yml
@@ -29,9 +29,9 @@ task:
         cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
         buildbot_step 'Build' ./build-emulator-x86.sh $HOME/workspace
 
     cache:
       level-{{level}}-{{project}}-emulator-l-x86-opt: /home/worker/workspace
       level-{{level}}-{{project}}-emulator-l-x86-opt-objdir-gecko: /home/worker/objdir-gecko
     env:
       TARGET: 'emulator-x86-l'
-      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-l/releng-emulator-l.tt'
+      TOOLTOOL_MANIFEST: 'b2g/config/emulator-x86-l/releng-emulator-l.manifest'