Backed out changeset 5e04c49d2d10 (bug 1362164) because it depends on bug 1362148 which is being backed out.

testing/mozharness/configs/builds/releng_base_android_64_builds.py

@@ -48,6 +48,7 @@ config = {
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
     ],
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_base_linux_32_builds.py

@@ -57,6 +57,7 @@ config = {
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
     ],
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_base_linux_64_builds.py

@@ -56,6 +56,7 @@ config = {
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/adjust-sdk-beta.token',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
     ],
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_base_mac_64_builds.py

@@ -23,6 +23,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_base_mac_64_cross_builds.py

@@ -28,6 +28,7 @@ config = {
          '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'},
     ],
+    'enable_ccache': True,
     'enable_check_test': False,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox/',

testing/mozharness/configs/builds/releng_base_windows_32_builds.py

@@ -34,6 +34,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': 'C:/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,

testing/mozharness/configs/builds/releng_base_windows_64_builds.py

@@ -34,6 +34,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': 'C:/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': [sys.executable,

testing/mozharness/configs/builds/releng_sub_linux_configs/32_artifact.py

@@ -24,6 +24,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_linux_configs/32_debug_artifact.py

@@ -26,6 +26,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': MOZ_OBJDIR,
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_linux_configs/64_artifact.py

@@ -25,6 +25,7 @@ config = {
          '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'},
     ],
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_linux_configs/64_debug_artifact.py

@@ -17,6 +17,7 @@ config = {
         "buildbot": "/tools/buildbot/bin/buildbot",
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': MOZ_OBJDIR,
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py

@@ -16,6 +16,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py

@@ -16,6 +16,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_mac_configs/64_artifact.py

@@ -20,6 +20,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'tooltool_script': ["/builds/tooltool.py"],

testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug_artifact.py

@@ -22,6 +22,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
     'objdir': MOZ_OBJDIR,
     # debug specific

testing/mozharness/configs/builds/taskcluster_firefox_win32_clang.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win32_clang_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win32_qr_opt.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_asan_opt.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_clang.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_clang_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_qr_debug.py

@@ -28,6 +28,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_win64_qr_opt.py

@@ -28,6 +28,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_32_addondevel.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_64_addondevel.py

@@ -33,6 +33,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': False,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py

@@ -32,6 +32,7 @@ config = {
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
+    'enable_ccache': False,
     'vcs_share_base': os.path.join('y:', os.sep, 'hg-shared'),
     'objdir': 'obj-firefox',
     'tooltool_script': [

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -1037,6 +1037,21 @@ or run without that action (ie: --no-{action})"
 
         return post_upload_cmd
 
+    def _ccache_z(self):
+        """clear ccache stats."""
+        dirs = self.query_abs_dirs()
+        env = self.query_build_env()
+        self.run_command(command=['ccache', '-z'],
+                         cwd=dirs['base_work_dir'],
+                         env=env)
+
+    def _ccache_s(self):
+        """print ccache stats. only done for unix like platforms"""
+        dirs = self.query_abs_dirs()
+        env = self.query_build_env()
+        cmd = ['ccache', '-s']
+        self.run_command(cmd, cwd=dirs['abs_src_dir'], env=env)
+
     def _rm_old_package(self):
         """rm the old package."""
         c = self.config
@@ -1585,6 +1600,9 @@ or run without that action (ie: --no-{action})"
 
     def preflight_build(self):
         """set up machine state for a complete build."""
+        c = self.config
+        if c.get('enable_ccache'):
+            self._ccache_z()
         if not self.query_is_nightly():
             # the old package should live in source dir so we don't need to do
             # this for nighties since we clobber the whole work_dir in
@@ -1729,6 +1747,9 @@ or run without that action (ie: --no-{action})"
 
     def postflight_build(self):
         """grabs properties from post build and calls ccache -s"""
+        if self.config.get('enable_ccache'):
+            self._ccache_s()
+
         # A list of argument lists.  Better names gratefully accepted!
         mach_commands = self.config.get('postflight_build_mach_commands', [])
         for mach_command in mach_commands: