Backed out changeset 52e365586577 (bug 1552563) for failing test_getUserMedia_basicScreenshare.html on a CLOSED TREE

taskcluster/scripts/tester/test-linux.sh

@@ -6,9 +6,11 @@ echo "running as" $(id)
 
 # Detect release version.
 . /etc/lsb-release
-if [ "${DISTRIB_RELEASE}" != "16.04" ]; then
+if [ "${DISTRIB_RELEASE}" == "12.04" ]; then
-    echo "Ubuntu 16.04 required"
+    echo "Ubuntu 12.04 not supported"
     exit 1
+elif [ "${DISTRIB_RELEASE}" == "16.04" ]; then
+    UBUNTU_1604=1
 fi
 
 ####
@@ -25,7 +27,6 @@ fi
 : MOZHARNESS_OPTIONS            ${MOZHARNESS_OPTIONS}
 : NEED_XVFB                     ${NEED_XVFB:=true}
 : NEED_WINDOW_MANAGER           ${NEED_WINDOW_MANAGER:=false}
-: NEED_COMPIZ                   ${NEED_COMPIZ}
 : NEED_PULSEAUDIO               ${NEED_PULSEAUDIO:=false}
 : START_VNC                     ${START_VNC:=false}
 : TASKCLUSTER_INTERACTIVE       ${TASKCLUSTER_INTERACTIVE:=false}
@@ -150,14 +151,18 @@ if $NEED_WINDOW_MANAGER; then
     # credit card numbers.
     eval `dbus-launch --sh-syntax`
     eval `echo '' | /usr/bin/gnome-keyring-daemon -r -d --unlock --components=secrets`
+
+    if [ "${UBUNTU_1604}" ]; then
+        # start compiz for our window manager
+        compiz 2>&1 &
+        #TODO: how to determine if compiz starts correctly?
+    fi
 fi
 
-if $NEED_COMPIZ; then
+if [ "${UBUNTU_1604}" ]; then
-    compiz 2>&1 &
+    maybe_start_pulse
 fi
 
-maybe_start_pulse
-
 # For telemetry purposes, the build process wants information about the
 # source it is running
 export MOZ_SOURCE_REPO="${GECKO_HEAD_REPOSITORY}"

taskcluster/taskgraph/transforms/job/mozharness_test.py

@@ -107,36 +107,11 @@ def mozharness_test_on_docker(config, job, taskdesc):
         'MOZILLA_BUILD_URL': {'task-reference': installer_url},
         'NEED_PULSEAUDIO': 'true',
         'NEED_WINDOW_MANAGER': 'true',
-        'NEED_COMPIZ': 'true',
         'ENABLE_E10S': str(bool(test.get('e10s'))).lower(),
         'MOZ_AUTOMATION': '1',
         'WORKING_DIR': '/builds/worker',
     })
 
-    # by default, require compiz unless proven otherwise, hence a whitelist.
-    # See https://bugzilla.mozilla.org/show_bug.cgi?id=1552563
-    # if using regex this list can be shortened greatly.
-    suites_not_need_compiz = [
-        'mochitest-webgl1-core',
-        'mochitest-webgl1-ext',
-        'mochitest-media',
-        'mochitest-plain-gpu',
-        'mochitest-browser-chrome-screenshots',
-        'gtest',
-        'cppunittest',
-        'jsreftest',
-        'crashtest',
-        'reftest',
-        'reftest-no-accel',
-        'web-platform-tests',
-        'web-platform-tests-reftests',
-        'xpcshell'
-    ]
-    if job['run']['test']['suite'] in suites_not_need_compiz or (
-            job['run']['test']['suite'] == 'mochitest-plain-chunked' and
-            job['run']['test']['try-name'] == 'mochitest-plain-headless'):
-        env['NEED_COMPIZ'] = 'false'
-
     if mozharness.get('mochitest-flavor'):
         env['MOCHITEST_FLAVOR'] = mozharness['mochitest-flavor']