Bug 1796508 - Remove xvfb.sh where we don't use it. r=taskgraph-reviewers,releng-reviewers,jlorenzo,jcristau

Differential Revision: https://phabricator.services.mozilla.com/D159829

taskcluster/docker/debian-build/Dockerfile

@@ -46,9 +46,4 @@ RUN apt-get update && \
       uuid \
       wget \
       x11-utils \
-      xvfb \
       zip
-
-# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
-# %include taskcluster/docker/recipes/xvfb.sh
-COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh

taskcluster/docker/partner-repack/Dockerfile

@@ -17,8 +17,4 @@ RUN apt-get update && \
       unzip \
       zip
 
-# Add wrapper scripts for xvfb for repackage.sh, and interactive sessions
-# %include taskcluster/docker/recipes/xvfb.sh
-COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
-
 COPY known_hosts /etc/ssh/ssh_known_hosts

taskcluster/docker/valgrind-build/Dockerfile

@@ -59,4 +59,8 @@ RUN apt-get update && apt-get install \
     libxt6-dbgsym \
     libxxf86vm1-dbg \
     valgrind-dbg \
+    xvfb \
     zlib1g-dbgsym
+
+# %include taskcluster/docker/recipes/xvfb.sh
+COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh

taskcluster/scripts/builder/build-l10n.sh

@@ -4,8 +4,6 @@ set -x -e
 
 echo "running as" $(id)
 
-. /builds/worker/scripts/xvfb.sh
-
 ####
 # Taskcluster friendly wrapper for performing fx desktop l10n repacks via mozharness.
 # Based on ./build-linux.sh
@@ -23,8 +21,6 @@ echo "running as" $(id)
 
 : MOZ_SCM_LEVEL                 ${MOZ_SCM_LEVEL:=1}
 
-: NEED_XVFB                     ${NEED_XVFB:=false}
-
 : MOZ_SCM_LEVEL                 ${MOZ_SCM_LEVEL:=1}
 
 : WORKSPACE                     ${WORKSPACE:=/builds/worker/workspace}
@@ -45,18 +41,6 @@ export TINDERBOX_OUTPUT=1
 if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
 if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
 
-cleanup() {
-    local rv=$?
-    cleanup_xvfb
-    exit $rv
-}
-trap cleanup EXIT INT
-
-# run XVfb in the background, if necessary
-if $NEED_XVFB; then
-    start_xvfb '1024x768x24' 2
-fi
-
 # set up mozharness configuration, via command line, env, etc.
 
 # $TOOLTOOL_CACHE bypasses mozharness completely and is read by tooltool_wrapper.sh to set the

taskcluster/scripts/builder/repackage.sh

@@ -4,8 +4,6 @@ set -x -e
 
 echo "running as" $(id)
 
-. /builds/worker/scripts/xvfb.sh
-
 ####
 # Taskcluster friendly wrapper for performing fx desktop builds via mozharness.
 ####
@@ -44,13 +42,6 @@ export MOZ_SIMPLE_PACKAGE_NAME=target
 if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
 if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
 
-cleanup() {
-    local rv=$?
-    cleanup_xvfb
-    exit $rv
-}
-trap cleanup EXIT INT
-
 # set up mozharness configuration, via command line, env, etc.
 
 debug_flag=""