From c3cda2a39a16458684c06fc0a12501164675a5bb Mon Sep 17 00:00:00 2001
From: Iris Hsiao <ihsiao@mozilla.com>
Date: Thu, 5 Jan 2017 12:21:35 -0500
Subject: [PATCH] Backed out changeset 5ddb2e58bb74 (bug 1287099)

---
 taskcluster/ci/test/test-platforms.yml        |  9 -------
 taskcluster/ci/test/test-sets.yml             | 24 -------------------
 taskcluster/ci/test/tests.yml                 |  3 ---
 .../recipes/ubuntu1204-test-system-setup.sh   |  8 -------
 .../recipes/ubuntu1604-test-system-setup.sh   |  9 -------
 5 files changed, 53 deletions(-)

diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index e0076f8db5ba..f0b99afd08a6 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -15,15 +15,6 @@
 ##
 # Linux platforms (matching /linux.*/)
 
-linux32/debug:
-    build-platform: linux/debug
-    test-sets:
-        - linux32-tests
-linux32/opt:
-    build-platform: linux/opt
-    test-sets:
-        -  linux32-tests
-
 linux64/debug:
     build-platform: linux64/debug
     test-sets:
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 51a71c2253ab..e84a83978e21 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -151,30 +151,6 @@ macosx64-tests-talos:
     - talos-svgr
     - talos-tp5o
 
-linux32-tests:
-    - cppunit
-    - crashtest
-    - external-media-tests
-    - firefox-ui-functional-local
-    - firefox-ui-functional-remote
-    - gtest
-    - jittest
-    - jsreftest
-    - marionette
-    - mochitest
-    - mochitest-a11y
-    - mochitest-browser-chrome
-    - mochitest-chrome
-    - mochitest-clipboard
-    - mochitest-devtools-chrome
-    - mochitest-gpu
-    - mochitest-jetpack
-    - mochitest-media
-    - mochitest-webgl
-    - web-platform-tests
-    - web-platform-tests-reftests
-    - xpcshell
-
 android-common-tests:
     - cppunit
     - crashtest
diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml
index 51d8530c3c91..bb07a3e9323e 100644
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -381,8 +381,6 @@ mochitest-browser-chrome:
     chunks:
         by-test-platform:
             linux64-jsdcov/opt: 35
-            linux64/debug: 12
-            linux32/debug: 12
             linux64-asan/opt: 10
             default: 7
     e10s:
@@ -395,7 +393,6 @@ mochitest-browser-chrome:
             linux64-jsdcov/opt: 7200
             linux64-ccov/opt: 7200
             linux64/debug: 5400
-            linux32/debug: 5400
             default: 3600
     mozharness:
         script: desktop_unittest.py
diff --git a/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh b/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh
index 3f6120994366..528b10ecac7d 100644
--- a/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh
+++ b/taskcluster/docker/recipes/ubuntu1204-test-system-setup.sh
@@ -257,14 +257,6 @@ apt-get -q -y --force-yes install \
 mesa_version=$(dpkg-query -s libgl1-mesa-dri-lts-saucy | grep ^Version | awk '{ print $2 }')
 [ "$mesa_version" = "9.2.1-1ubuntu3~precise1mozilla2" ] || exit 1
 
-# additional packages for linux32 tests
-apt-get -q -y --force-yes install \
-    libcanberra-gtk-module:i386 \
-    libcanberra-gtk3-module:i386 \
-    libdbus-glib-1-2:i386 \
-    libgtk-3-0:i386 \
-    openjdk-7-jdk:i386
-
 # revert the list of repos
 cp sources.list.orig /etc/apt/sources.list
 apt-get update
diff --git a/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh b/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
index 29602c1d5d50..c0b55be188bd 100644
--- a/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
+++ b/taskcluster/docker/recipes/ubuntu1604-test-system-setup.sh
@@ -159,15 +159,6 @@ apt-get -q -y -f install \
     libgl1-mesa-glx \
     mesa-common-dev
 
-# additional packages for linux32 tests
-sudo dpkg --add-architecture i386
-apt-get update
-apt-get -q -y -f install \
-    libavcodec-ffmpeg-extra56:i386 \
-    libdbus-glib-1-2:i386 \
-    libgtk-3-0:i386 \
-    openjdk-8-jdk:i386
-
 # revert the list of repos
 cp sources.list.orig /etc/apt/sources.list
 apt-get update