Bug 1429603: Remove mock configuration from build mozharness configs and code; r=jlund
authorTom Prince <mozilla@hocat.ca>
Thu, 04 Jan 2018 13:13:24 -0700
changeset 444723 adf77c633d8fcf0bb64a7b6c50724749c9f83088
parent 444722 8d82d82fa62de336e2ecbf67e859ff107f0992c0
child 444724 dab1ff1d2a108b44331d939b50a93efacd207432
push id124
push userfmarier@mozilla.com
push dateTue, 30 Jan 2018 01:38:36 +0000
reviewersjlund
bugs1429603
milestone60.0a1
Bug 1429603: Remove mock configuration from build mozharness configs and code; r=jlund Differential Revision: https://phabricator.services.mozilla.com/D369
taskcluster/scripts/builder/build-linux.sh
testing/mozharness/configs/builds/releng_base_android_64_builds.py
testing/mozharness/configs/builds/releng_base_linux_32_builds.py
testing/mozharness/configs/builds/releng_base_linux_64_builds.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
testing/mozharness/mozharness/mozilla/building/buildbase.py
testing/mozharness/scripts/fx_desktop_build.py
--- a/taskcluster/scripts/builder/build-linux.sh
+++ b/taskcluster/scripts/builder/build-linux.sh
@@ -117,16 +117,15 @@ fi
 
 cd /builds/worker
 
 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
   ${config_path_cmds} \
   ${config_cmds} \
   $debug_flag \
   $custom_build_variant_cfg_flag \
-  --disable-mock \
   $actions \
   $options \
   --log-level=debug \
   --scm-level=$MOZ_SCM_LEVEL \
   --work-dir=$WORKSPACE/build \
   --branch=${MH_BRANCH} \
   --build-pool=${MH_BUILD_POOL}
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -4,43 +4,27 @@ config = {
     #########################################################################
     ######## ANDROID GENERIC CONFIG KEYS/VAlUES
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'multi-l10n',
         'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     'max_build_output_timeout': 0,
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
-    # mock shtuff
-    'mock_mozilla_dir':  '/builds/mock_mozilla',
-    'mock_target': 'mozilla-centos6-x86_64-android',
-    'mock_files': [
-        ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
-        ('/home/cltbld/.hgrc', '/builds/.hgrc'),
-        ('/home/cltbld/.boto', '/builds/.boto'),
-        ('/builds/gapi.data', '/builds/gapi.data'),
-        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
-        ('/builds/mozilla-api.key', '/builds/mozilla-api.key'),
-        ('/builds/mozilla-fennec-geoloc-api.key', '/builds/mozilla-fennec-geoloc-api.key'),
-        ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
-        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
-    ],
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-fennec-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-fennec-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
         {'filename': '/builds/adjust-sdk.token',
@@ -106,24 +90,16 @@ config = {
         'UPLOAD_USER': '%(stage_username)s',
         'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
         'UPLOAD_TO_TEMP': '1',
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
     },
-    'mock_packages': ['autoconf213', 'mozilla-python27-mercurial', 'yasm',
-                      'ccache', 'zip', "gcc472_0moz1", "gcc473_0moz1",
-                      'java-1.7.0-openjdk-devel', 'zlib-devel',
-                      'glibc-static', 'openssh-clients', 'mpfr',
-                      'wget', 'glibc.i686', 'libstdc++.i686',
-                      'zlib.i686', 'freetype-2.3.11-6.el6_1.8.x86_64',
-                      'ant', 'ant-apache-regexp'
-                      ],
     'src_mozconfig': 'mobile/android/config/mozconfigs/android/nightly',
     #########################################################################
 
     # It's not obvious, but postflight_build is after packaging, so the Gecko
     # binaries are in the object directory, ready to be packaged into the
     # GeckoView AAR.
     'postflight_build_mach_commands': [
         ['android',
--- a/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_32_builds.py
@@ -8,43 +8,26 @@ config = {
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
-    # mock shtuff
-    'mock_mozilla_dir':  '/builds/mock_mozilla',
-    'mock_target': 'mozilla-centos6-x86_64',
-    'mock_files': [
-        ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
-        ('/home/cltbld/.hgrc', '/builds/.hgrc'),
-        ('/home/cltbld/.boto', '/builds/.boto'),
-        ('/builds/gapi.data', '/builds/gapi.data'),
-        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
-        ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
-        ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
-        ('/builds/adjust-sdk.token', '/builds/adjust-sdk.token'),
-        ('/builds/adjust-sdk-beta.token', '/builds/adjust-sdk-beta.token'),
-        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
-    ],
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
         {'filename': '/builds/adjust-sdk.token',
@@ -90,59 +73,12 @@ config = {
         'UPLOAD_USER': '%(stage_username)s',
         'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
         'UPLOAD_TO_TEMP': '1',
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind',
-        ######## 32 bit specific ###########
-        'glibc-static.i686', 'libstdc++-static.i686',
-        'gtk2-devel.i686', 'libnotify-devel.i686',
-        'alsa-lib-devel.i686', 'libcurl-devel.i686',
-        'wireless-tools-devel.i686', 'libX11-devel.i686',
-        'libXt-devel.i686', 'mesa-libGL-devel.i686',
-        'gnome-vfs2-devel.i686', 'GConf2-devel.i686',
-        'pulseaudio-libs-devel.i686',
-        'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
-        # Packages already installed in the mock environment, as x86_64
-        # packages.
-        'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
-        # yum likes to install .x86_64 -devel packages that satisfy .i686
-        # -devel packages dependencies. So manually install the dependencies
-        # of the above packages.
-        'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
-        'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
-        'fontconfig-devel.i686', 'glib2-devel.i686',
-        'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
-        'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
-        'libXcursor-devel.i686', 'libXdamage-devel.i686',
-        'libXdmcp-devel.i686', 'libXext-devel.i686', 'libXfixes-devel.i686',
-        'libXft-devel.i686', 'libXi-devel.i686', 'libXinerama-devel.i686',
-        'libXrandr-devel.i686', 'libXrender-devel.i686',
-        'libXxf86vm-devel.i686', 'libdrm-devel.i686', 'libidn-devel.i686',
-        'libpng-devel.i686', 'libxcb-devel.i686', 'libxml2-devel.i686',
-        'pango-devel.i686', 'perl-devel.i686', 'pixman-devel.i686',
-        'zlib-devel.i686',
-        # Freetype packages need to be installed be version, because a newer
-        # version is available, but we don't want it for Firefox builds.
-        'freetype-2.3.11-6.el6_1.8.i686',
-        'freetype-devel-2.3.11-6.el6_1.8.i686',
-        'freetype-2.3.11-6.el6_1.8.x86_64',
-        ######## 32 bit specific ###########
-    ],
     'mozconfig_platform': 'linux32',
     'mozconfig_variant': 'nightly',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_linux_64_builds.py
@@ -7,43 +7,26 @@ config = {
     # below under the '64 bit specific' code block otherwise, update in this
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
-    # mock shtuff
-    'mock_mozilla_dir':  '/builds/mock_mozilla',
-    'mock_target': 'mozilla-centos6-x86_64',
-    'mock_files': [
-        ('/home/cltbld/.ssh', '/home/mock_mozilla/.ssh'),
-        ('/home/cltbld/.hgrc', '/builds/.hgrc'),
-        ('/home/cltbld/.boto', '/builds/.boto'),
-        ('/builds/gapi.data', '/builds/gapi.data'),
-        ('/builds/relengapi.tok', '/builds/relengapi.tok'),
-        ('/tools/tooltool.py', '/builds/tooltool.py'),
-        ('/builds/mozilla-desktop-geoloc-api.key', '/builds/mozilla-desktop-geoloc-api.key'),
-        ('/builds/crash-stats-api.token', '/builds/crash-stats-api.token'),
-        ('/builds/adjust-sdk.token', '/builds/adjust-sdk.token'),
-        ('/builds/adjust-sdk-beta.token', '/builds/adjust-sdk-beta.token'),
-        ('/usr/local/lib/hgext', '/usr/local/lib/hgext'),
-    ],
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
          'min_scm_level': 1},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
         {'filename': '/builds/adjust-sdk.token',
@@ -90,38 +73,12 @@ config = {
         'UPLOAD_USER': '%(stage_username)s',
         'UPLOAD_SSH_KEY': '/home/mock_mozilla/.ssh/%(stage_ssh_key)s',
         'UPLOAD_TO_TEMP': '1',
     },
     "check_test_env": {
         'MINIDUMP_STACKWALK': '%(abs_tools_dir)s/breakpad/linux64/minidump_stackwalk',
         'MINIDUMP_SAVE_PATH': '%(base_work_dir)s/minidumps',
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'nightly',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py
@@ -8,17 +8,16 @@ config = {
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'vcs_share_base': '/builds/hg-shared',
@@ -48,58 +47,11 @@ config = {
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'LC_ALL': 'C',
         # 32 bit specific
         'PATH': '/usr/local/bin:/usr/lib/ccache:\
 /bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:\
 /tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib",
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind',
-        ######## 32 bit specific ###########
-        'glibc-static.i686', 'libstdc++-static.i686',
-        'gtk2-devel.i686', 'libnotify-devel.i686',
-        'alsa-lib-devel.i686', 'libcurl-devel.i686',
-        'wireless-tools-devel.i686', 'libX11-devel.i686',
-        'libXt-devel.i686', 'mesa-libGL-devel.i686',
-        'gnome-vfs2-devel.i686', 'GConf2-devel.i686',
-        'pulseaudio-libs-devel.i686',
-        'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
-        # Packages already installed in the mock environment, as x86_64
-        # packages.
-        'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
-        # yum likes to install .x86_64 -devel packages that satisfy .i686
-        # -devel packages dependencies. So manually install the dependencies
-        # of the above packages.
-        'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
-        'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
-        'fontconfig-devel.i686', 'glib2-devel.i686',
-        'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
-        'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
-        'libXcursor-devel.i686', 'libXdamage-devel.i686',
-        'libXdmcp-devel.i686', 'libXext-devel.i686', 'libXfixes-devel.i686',
-        'libXft-devel.i686', 'libXi-devel.i686', 'libXinerama-devel.i686',
-        'libXrandr-devel.i686', 'libXrender-devel.i686',
-        'libXxf86vm-devel.i686', 'libdrm-devel.i686', 'libidn-devel.i686',
-        'libpng-devel.i686', 'libxcb-devel.i686', 'libxml2-devel.i686',
-        'pango-devel.i686', 'perl-devel.i686', 'pixman-devel.i686',
-        'zlib-devel.i686',
-        # Freetype packages need to be installed be version, because a newer
-        # version is available, but we don't want it for Firefox builds.
-        'freetype-2.3.11-6.el6_1.8.i686',
-        'freetype-devel-2.3.11-6.el6_1.8.i686',
-        'freetype-2.3.11-6.el6_1.8.x86_64',
-        ######## 32 bit specific ###########
-    ],
     'mozconfig_variant': 'artifact',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'debug_build': True,
     'stage_platform': 'linux-debug',
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py
@@ -8,17 +8,16 @@ config = {
     # code block and also make sure this is synced with
     # releng_base_linux_64_builds.py
 
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'vcs_share_base': '/builds/hg-shared',
@@ -52,58 +51,11 @@ config = {
         # debug-specific
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         # 32 bit specific
         'PATH': '/usr/local/bin:/usr/lib/ccache:\
 /bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:\
 /tools/python27/bin:/tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib",
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind',
-        ######## 32 bit specific ###########
-        'glibc-static.i686', 'libstdc++-static.i686',
-        'gtk2-devel.i686', 'libnotify-devel.i686',
-        'alsa-lib-devel.i686', 'libcurl-devel.i686',
-        'wireless-tools-devel.i686', 'libX11-devel.i686',
-        'libXt-devel.i686', 'mesa-libGL-devel.i686',
-        'gnome-vfs2-devel.i686', 'GConf2-devel.i686',
-        'pulseaudio-libs-devel.i686',
-        'gstreamer-devel.i686', 'gstreamer-plugins-base-devel.i686',
-        # Packages already installed in the mock environment, as x86_64
-        # packages.
-        'glibc-devel.i686', 'libgcc.i686', 'libstdc++-devel.i686',
-        # yum likes to install .x86_64 -devel packages that satisfy .i686
-        # -devel packages dependencies. So manually install the dependencies
-        # of the above packages.
-        'ORBit2-devel.i686', 'atk-devel.i686', 'cairo-devel.i686',
-        'check-devel.i686', 'dbus-devel.i686', 'dbus-glib-devel.i686',
-        'fontconfig-devel.i686', 'glib2-devel.i686',
-        'hal-devel.i686', 'libICE-devel.i686', 'libIDL-devel.i686',
-        'libSM-devel.i686', 'libXau-devel.i686', 'libXcomposite-devel.i686',
-        'libXcursor-devel.i686', 'libXdamage-devel.i686',
-        'libXdmcp-devel.i686', 'libXext-devel.i686', 'libXfixes-devel.i686',
-        'libXft-devel.i686', 'libXi-devel.i686', 'libXinerama-devel.i686',
-        'libXrandr-devel.i686', 'libXrender-devel.i686',
-        'libXxf86vm-devel.i686', 'libdrm-devel.i686', 'libidn-devel.i686',
-        'libpng-devel.i686', 'libxcb-devel.i686', 'libxml2-devel.i686',
-        'pango-devel.i686', 'perl-devel.i686', 'pixman-devel.i686',
-        'zlib-devel.i686',
-        # Freetype packages need to be installed be version, because a newer
-        # version is available, but we don't want it for Firefox builds.
-        'freetype-2.3.11-6.el6_1.8.i686',
-        'freetype-devel-2.3.11-6.el6_1.8.i686',
-        'freetype-2.3.11-6.el6_1.8.x86_64',
-        ######## 32 bit specific ###########
-    ],
     'mozconfig_variant': 'debug-artifact',
     #########################################################################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
     ],
     'stage_platform': 'linux-rusttests',
     'enable_signing': False,
     #### 32 bit build specific #####
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
     ],
     'debug_build': True,
     'stage_platform': 'linux-rusttests-debug',
     'enable_signing': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_add-on-devel.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
 #        'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-add-on-devel',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'secret_files': [
@@ -50,39 +49,13 @@ config = {
         'LC_ALL': 'C',
         ## 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'artifact',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_and_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_reporter_tc.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-reporter',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_asan_tc_and_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_code_coverage.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'linux64-ccov',
     'platform_supports_post_upload_to_latest': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'linux64-debug',
     'debug_build': True,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     'vcs_share_base': '/builds/hg-shared',
     'tooltool_script': ["/builds/tooltool.py"],
     'tooltool_bootstrap': "setup.sh",
@@ -46,37 +45,11 @@ config = {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         ## 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     'mozconfig_variant': 'debug-artifact',
     #######################
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_asan_tc.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-fuzzing-asan',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
     ],
     'stage_platform': 'linux64-fuzzing-debug',
     'publish_nightly_en_US_routes': False,
     'debug_build': True,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_noopt_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'linux64-noopt-debug',
     'debug_build': True,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         # 'update',
     ],
     'stage_platform': 'linux64-rusttests',
     'enable_signing': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
     ],
     'stage_platform': 'linux64-rusttests-debug',
     'debug_build': True,
     'enable_signing': False,
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_searchfox_and_debug.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'vcs_share_base': '/builds/hg-shared',
     'tooltool_script': ["/builds/tooltool.py"],
@@ -43,40 +42,14 @@ config = {
         'SCCACHE_DISABLE': '1',
         ## 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'debug-searchfox-clang',
     #######################
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'vcs_share_base': '/builds/hg-shared',
     'tooltool_script': ["/builds/tooltool.py"],
@@ -40,40 +39,14 @@ config = {
         'LC_ALL': 'C',
         ## 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'debug-static-analysis-clang',
     #######################
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
@@ -1,17 +1,16 @@
 import os
 
 config = {
     # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        'setup-mock',
         'build',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
     'vcs_share_base': '/builds/hg-shared',
     'tooltool_script': ["/builds/tooltool.py"],
@@ -40,40 +39,14 @@ config = {
         'LC_ALL': 'C',
         ## 64 bit specific
         'PATH': '/usr/local/bin:/usr/lib64/ccache:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/tools/git/bin:/tools/python27/bin:\
 /tools/python27-mercurial/bin:/home/cltbld/bin',
         'LD_LIBRARY_PATH': "/tools/gcc-4.3.3/installed/lib64",
         ##
     },
-    'mock_packages': [
-        'autoconf213', 'python', 'mozilla-python27', 'zip', 'mozilla-python27-mercurial',
-        'git', 'ccache', 'perl-Test-Simple', 'perl-Config-General',
-        'yasm', 'wget',
-        'mpfr',  # required for system compiler
-        'xorg-x11-font*',  # fonts required for PGO
-        'imake',  # required for makedepend!?!
-        ### <-- from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'valgrind', 'dbus-x11',
-        ######## 64 bit specific ###########
-        'glibc-static', 'libstdc++-static',
-        'gtk2-devel', 'libnotify-devel',
-        'alsa-lib-devel', 'libcurl-devel', 'wireless-tools-devel',
-        'libX11-devel', 'libXt-devel', 'mesa-libGL-devel', 'gnome-vfs2-devel',
-        'GConf2-devel',
-        ### from releng repo
-        'gcc45_0moz3', 'gcc454_0moz1', 'gcc472_0moz1', 'gcc473_0moz1',
-        'yasm', 'ccache',
-        ###
-        'pulseaudio-libs-devel', 'gstreamer-devel',
-        'gstreamer-plugins-base-devel', 'freetype-2.3.11-6.el6_1.8.x86_64',
-        'freetype-devel-2.3.11-6.el6_1.8.x86_64'
-    ],
     # This doesn't actually inherit from anything.
     'mozconfig_platform': 'linux64',
     'mozconfig_variant': 'opt-static-analysis-clang',
     #######################
     'artifact_flag_build_variant_in_try': None,
 }
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_valgrind.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        #'setup-mock',
         'build',
         #'upload-files',
         #'sendchange',
         'check-test',
         'valgrind-test',
         #'update',
     ],
     'stage_platform': 'linux64-valgrind',
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_add-on-devel.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-#        'setup-mock',
         'build',
         'upload-files',
 #        'sendchange',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'macosx64-add-on-devel',
     'publish_nightly_en_US_routes': False,
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py
@@ -3,17 +3,16 @@ import sys
 
 config = {
     #########################################################################
     ######## MACOSX GENERIC CONFIG KEYS/VAlUES
 
     'default_actions': [
         'clobber',
         'clone-tools',
-        # 'setup-mock',
         'checkout-sources',
         'build',
         'upload-files',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-debug',
     'debug_build': True,
     #### 64 bit build specific #####
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug_searchfox.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-searchfox-debug',
     'debug_build': True,
     'enable_signing': False,
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_noopt_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-noopt-debug',
     'debug_build': True,
     #### 64 bit build specific #####
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-debug',
     'debug_build': True,
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py
@@ -3,17 +3,16 @@ import sys
 
 config = {
     #########################################################################
     ######## MACOSX GENERIC CONFIG KEYS/VAlUES
 
     'default_actions': [
         'clobber',
         'clone-tools',
-        # 'setup-mock',
         'checkout-sources',
         'build',
         'sendchange',
     ],
     "buildbot_json_path": "buildprops.json",
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
--- a/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock',
         'build',
         'upload-files',
         'sendchange',
         'update',  # decided by query_is_nightly()
     ],
     'debug_build': True,
     'stage_platform': 'macosx64-st-an-debug',
     'build_type': 'st-an-debug',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock', windows do not use mock
         'build',
         'upload-files',
 #        'sendchange',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'win32-add-on-devel',
     'build_type': 'add-on-devel',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock', windows do not use mock
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'win32-debug',
     'debug_build': True,
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock', windows do not use mock
         'build',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'win32-st-an-debug',
     'debug_build': True,
     'enable_signing': False,
     'enable_unittest_sendchange': False,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/win32/\
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock', windows do not use mock
         'build',
         'upload-files',
 #        'sendchange',
         'check-test',
 #        'update',
     ],
     'stage_platform': 'win64-add-on-devel',
     'build_type': 'add-on-devel',
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
@@ -1,16 +1,15 @@
 import os
 
 config = {
     'default_actions': [
         'clobber',
         'clone-tools',
         'checkout-sources',
-        # 'setup-mock', windows do not use mock
         'build',
         'upload-files',
         'sendchange',
         'check-test',
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'win64-debug',
     'debug_build': True,
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -37,20 +37,18 @@ from mozharness.mozilla.buildbot import 
     TBPL_EXCEPTION,
     TBPL_FAILURE,
     TBPL_RETRY,
     TBPL_WARNING,
     TBPL_SUCCESS,
     TBPL_WORST_LEVEL_TUPLE,
 )
 from mozharness.mozilla.purge import PurgeMixin
-from mozharness.mozilla.mock import MockMixin
 from mozharness.mozilla.secrets import SecretsMixin
 from mozharness.mozilla.signing import SigningMixin
-from mozharness.mozilla.mock import ERROR_MSGS as MOCK_ERROR_MSGS
 from mozharness.mozilla.testing.errors import TinderBoxPrintRe
 from mozharness.mozilla.testing.unittest import tbox_print_summary
 from mozharness.mozilla.updates.balrog import BalrogMixin
 from mozharness.mozilla.taskcluster_helper import Taskcluster
 from mozharness.base.python import (
     PerfherderResourceOptionsMixin,
     VirtualenvMixin,
 )
@@ -65,17 +63,16 @@ ERROR_MSGS = {
     'undetermined_repo_path': 'The repo could not be determined. \
 Please make sure that either "repo" is in your config or, if \
 you are running this in buildbot, "repo_path" is in your buildbot_config.',
     'comments_undetermined': '"comments" could not be determined. This may be \
 because it was a forced build.',
     'tooltool_manifest_undetermined': '"tooltool_manifest_src" not set, \
 Skipping run_tooltool...',
 }
-ERROR_MSGS.update(MOCK_ERROR_MSGS)
 
 
 ### Output Parsers
 
 TBPL_UPLOAD_ERRORS = [
     {
         'regex': re.compile("Connection timed out"),
         'level': TBPL_RETRY,
@@ -656,34 +653,28 @@ BUILD_BASE_CONFIG_OPTIONS = [
         "action": "store_true",
         "dest": "nightly_build",
         "default": False,
         "help": "Sets the build to run in nightly mode"}],
     [['--who'], {
         "dest": "who",
         "default": '',
         "help": "stores who made the created the buildbot change."}],
-    [["--disable-mock"], {
-        "dest": "disable_mock",
-        "action": "store_true",
-        "help": "do not run under mock despite what gecko-config says",
-    }],
-
 ]
 
 
 def generate_build_ID():
     return time.strftime("%Y%m%d%H%M%S", time.localtime(time.time()))
 
 
 def generate_build_UID():
     return uuid.uuid4().hex
 
 
-class BuildScript(BuildbotMixin, PurgeMixin, MockMixin, BalrogMixin,
+class BuildScript(BuildbotMixin, PurgeMixin, BalrogMixin,
                   SigningMixin, VirtualenvMixin, MercurialScript,
                   SecretsMixin, PerfherderResourceOptionsMixin):
     def __init__(self, **kwargs):
         # objdir is referenced in _query_abs_dirs() so let's make sure we
         # have that attribute before calling BaseScript.__init__
         self.objdir = None
         super(BuildScript, self).__init__(**kwargs)
         # epoch is only here to represent the start of the buildbot build
@@ -829,17 +820,17 @@ or run without that action (ie: --no-{ac
                 sys.executable, os.path.join(dirs['abs_src_dir'], 'mach'), 'python',
                 print_conf_setting_path, app_ini_path,
                 'App', prop
             ]
             env = self.query_build_env()
             # dirs['abs_obj_dir'] can be different from env['MOZ_OBJDIR'] on
             # mac, and that confuses mach.
             del env['MOZ_OBJDIR']
-            return self.get_output_from_command_m(cmd,
+            return self.get_output_from_command(cmd,
                 cwd=dirs['abs_obj_dir'], env=env)
         else:
             return None
 
     def query_builduid(self):
         c = self.config
         if self.builduid:
             return self.builduid
@@ -1205,18 +1196,18 @@ or run without that action (ie: --no-{ac
             if auth_file:
                 cmd.extend(['--authentication-file', auth_file])
         cache = c['env'].get('TOOLTOOL_CACHE')
         if cache:
             cmd.extend(['--cache-dir', cache])
         if toolchains:
             cmd.extend(toolchains.split())
         self.info(str(cmd))
-        self.run_command_m(cmd, cwd=dirs['abs_src_dir'], halt_on_failure=True,
-                           env=env)
+        self.run_command(cmd, cwd=dirs['abs_src_dir'], halt_on_failure=True,
+                         env=env)
 
     def query_revision(self, source_path=None):
         """ returns the revision of the build
 
          first will look for it in buildbot_properties and then in
          buildbot_config. Failing that, it will actually poll the source of
          the repo if it exists yet.
 
@@ -1369,17 +1360,17 @@ or run without that action (ie: --no-{ac
             {'ini_name': 'Version', 'prop_name': 'appVersion'},
             {'ini_name': 'Name', 'prop_name': 'appName'}
         ]
         env = self.query_build_env()
         # dirs['abs_obj_dir'] can be different from env['MOZ_OBJDIR'] on
         # mac, and that confuses mach.
         del env['MOZ_OBJDIR']
         for prop in properties_needed:
-            prop_val = self.get_output_from_command_m(
+            prop_val = self.get_output_from_command(
                 base_cmd + [prop['ini_name']], cwd=dirs['abs_obj_dir'],
                 halt_on_failure=halt_on_failure, env=env
             )
             self.set_buildbot_property(prop['prop_name'],
                                        prop_val,
                                        write_to_file=True)
 
         if self.config.get('is_automation'):
@@ -1695,17 +1686,17 @@ or run without that action (ie: --no-{ac
             # See bug 1364651 before considering changing.
             mach = [
                 os.path.join(os.environ['MOZILLABUILD'], 'msys', 'bin', 'bash.exe'),
                 os.path.join(dirs['abs_src_dir'], 'mach')
             ]
         else:
             mach = [sys.executable, 'mach']
 
-        return_code = self.run_command_m(
+        return_code = self.run_command(
             command=mach + ['--log-no-times', 'build', '-v'],
             cwd=dirs['abs_src_dir'],
             env=env,
             output_timeout=self.config.get('max_build_output_timeout', 60 * 40)
         )
         if return_code:
             self.return_code = self.worst_level(
                 EXIT_STATUS_DICT[TBPL_FAILURE],  self.return_code,
@@ -1759,53 +1750,53 @@ or run without that action (ie: --no-{ac
             '--config-file',
             'multi_locale/android-mozharness-build.json',
             '--pull-locale-source',
             '--add-locales',
             '--package-multi',
             '--summary',
         ]
 
-        self.run_command_m(cmd, env=self.query_build_env(), cwd=base_work_dir,
-                           halt_on_failure=True)
+        self.run_command(cmd, env=self.query_build_env(), cwd=base_work_dir,
+                         halt_on_failure=True)
 
         package_cmd = [
             'make',
             'echo-variable-PACKAGE',
             'AB_CD=multi',
         ]
-        package_filename = self.get_output_from_command_m(
+        package_filename = self.get_output_from_command(
             package_cmd,
             cwd=objdir,
         )
         if not package_filename:
             self.fatal("Unable to determine the package filename for the multi-l10n build. Was trying to run: %s" % package_cmd)
 
         self.info('Multi-l10n package filename is: %s' % package_filename)
 
         parser = MakeUploadOutputParser(config=self.config,
                                         log_obj=self.log_obj,
                                         use_package_as_marfile=True,
                                         package_filename=package_filename,
                                         )
         upload_cmd = ['make', 'upload', 'AB_CD=multi']
-        self.run_command_m(upload_cmd,
-                           env=self.query_mach_build_env(multiLocale=False),
-                           cwd=objdir, halt_on_failure=True,
-                           output_parser=parser)
+        self.run_command(upload_cmd,
+                         env=self.query_mach_build_env(multiLocale=False),
+                         cwd=objdir, halt_on_failure=True,
+                         output_parser=parser)
         for prop in parser.matches:
             self.set_buildbot_property(prop,
                                        parser.matches[prop],
                                        write_to_file=True)
         upload_files_cmd = [
             'make',
             'echo-variable-UPLOAD_FILES',
             'AB_CD=multi',
         ]
-        output = self.get_output_from_command_m(
+        output = self.get_output_from_command(
             upload_files_cmd,
             cwd=objdir,
         )
         files = shlex.split(output)
         abs_files = [os.path.abspath(os.path.join(objdir, f)) for f in files]
         self._taskcluster_upload(abs_files, self.routes_json['l10n'],
                                  locale='multi')
 
@@ -1818,38 +1809,38 @@ or run without that action (ie: --no-{ac
 
     def _execute_postflight_build_mach_command(self, mach_command_args):
         env = self.query_build_env()
         env.update(self.query_mach_build_env())
 
         command = [sys.executable, 'mach', '--log-no-times']
         command.extend(mach_command_args)
 
-        self.run_command_m(
+        self.run_command(
             command=command,
             cwd=self.query_abs_dirs()['abs_src_dir'],
             env=env, output_timeout=self.config.get('max_build_output_timeout', 60 * 20),
             halt_on_failure=True,
         )
 
     def preflight_package_source(self):
         self._get_mozconfig()
 
     def package_source(self):
         """generates source archives and uploads them"""
         env = self.query_build_env()
         env.update(self.query_mach_build_env())
         dirs = self.query_abs_dirs()
 
-        self.run_command_m(
+        self.run_command(
             command=[sys.executable, 'mach', '--log-no-times', 'configure'],
             cwd=dirs['abs_src_dir'],
             env=env, output_timeout=60*3, halt_on_failure=True,
         )
-        self.run_command_m(
+        self.run_command(
             command=[
                 'make', 'source-package', 'hg-bundle', 'source-upload',
                 'HG_BUNDLE_REVISION=%s' % self.query_revision(),
                 'UPLOAD_HG_BUNDLE=1',
             ],
             cwd=dirs['abs_obj_dir'],
             env=env, output_timeout=60*45, halt_on_failure=True,
         )
@@ -1866,17 +1857,17 @@ or run without that action (ie: --no-{ac
         if not env.get("UPLOAD_PATH"):
             self.warning("Skipping signing manifest generation. Set "
                          "UPLOAD_PATH to enable.")
             return
 
         dirs = self.query_abs_dirs()
         objdir = dirs['abs_obj_dir']
 
-        output = self.get_output_from_command_m(
+        output = self.get_output_from_command(
             command=['make', 'echo-variable-SOURCE_CHECKSUM_FILE'],
             cwd=objdir,
         )
         files = shlex.split(output)
         abs_files = [os.path.abspath(os.path.join(objdir, f)) for f in files]
         manifest_file = os.path.join(env["UPLOAD_PATH"],
                                      "signing_manifest.json")
         self.write_to_file(manifest_file,
@@ -1898,20 +1889,20 @@ or run without that action (ie: --no-{ac
             'build',
             '-v',
             '--keep-going',
             'check',
         ]
 
         parser = CheckTestCompleteParser(config=c,
                                          log_obj=self.log_obj)
-        return_code = self.run_command_m(command=cmd,
-                                         cwd=dirs['abs_src_dir'],
-                                         env=env,
-                                         output_parser=parser)
+        return_code = self.run_command(command=cmd,
+                                       cwd=dirs['abs_src_dir'],
+                                       env=env,
+                                       output_parser=parser)
         tbpl_status = parser.evaluate_parser(return_code)
         return_code = EXIT_STATUS_DICT[tbpl_status]
 
         if return_code:
             self.return_code = self.worst_level(
                 return_code,  self.return_code,
                 AUTOMATION_EXIT_CODES[::-1]
             )
@@ -2299,17 +2290,17 @@ or run without that action (ie: --no-{ac
             return
 
 
     def valgrind_test(self):
         '''Execute mach's valgrind-test for memory leaks'''
         env = self.query_build_env()
         env.update(self.query_mach_build_env())
 
-        return_code = self.run_command_m(
+        return_code = self.run_command(
             command=[sys.executable, 'mach', 'valgrind-test'],
             cwd=self.query_abs_dirs()['abs_src_dir'],
             env=env, output_timeout=self.config.get('max_build_output_timeout', 60 * 40)
         )
         if return_code:
             self.return_code = self.worst_level(
                 EXIT_STATUS_DICT[TBPL_FAILURE],  self.return_code,
                 AUTOMATION_EXIT_CODES[::-1]
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -32,17 +32,16 @@ class FxDesktopBuild(BuildScript, TryToo
     def __init__(self):
         buildscript_kwargs = {
             'config_options': BUILD_BASE_CONFIG_OPTIONS + copy.deepcopy(try_config_options),
             'all_actions': [
                 'get-secrets',
                 'clobber',
                 'clone-tools',
                 'checkout-sources',
-                'setup-mock',
                 'build',
                 'upload-files',  # upload from BB to TC
                 'sendchange',
                 'check-test',
                 'valgrind-test',
                 'package-source',
                 'generate-source-signing-manifest',
                 'multi-l10n',
@@ -236,19 +235,16 @@ class FxDesktopBuild(BuildScript, TryToo
         }
         abs_dirs.update(dirs)
         self.abs_dirs = abs_dirs
         return self.abs_dirs
 
         # Actions {{{2
         # read_buildbot_config in BuildingMixin
         # clobber in BuildingMixin -> PurgeMixin
-        # if Linux config:
-        # reset_mock in BuildingMixing -> MockMixin
-        # setup_mock in BuildingMixing (overrides MockMixin.mock_setup)
 
     def set_extra_try_arguments(self, action, success=None):
         """ Override unneeded method from TryToolsMixin """
         pass
 
     @script.PreScriptRun
     def suppress_windows_modal_dialogs(self, *args, **kwargs):
         if self._is_windows():