Backed out changeset 2dc80314c97e to make the change in buildbot instead
authorNick Thomas <nthomas@mozilla.com>
Thu, 16 Apr 2015 15:35:50 +1200 (2015-04-16)
changeset 3887 1d37d6e92c7f239d48f7bb70002bf8139d3bb663
parent 3885 2dc80314c97eeb2163490f5049a89655879d4b92
child 3889 27b25791af9b3167c874978cca6a234094691f82
push id3073
push usernthomas@mozilla.com
push dateThu, 16 Apr 2015 03:36:48 +0000 (2015-04-16)
backs out2dc80314c97eeb2163490f5049a89655879d4b92
Backed out changeset 2dc80314c97e to make the change in buildbot instead
configs/builds/releng_base_mac_64_builds.py
configs/builds/releng_sub_mac_configs/64_debug.py
configs/builds/releng_sub_mac_configs/64_graphene.py
configs/builds/releng_sub_mac_configs/64_mulet.py
configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
--- a/configs/builds/releng_base_mac_64_builds.py
+++ b/configs/builds/releng_base_mac_64_builds.py
@@ -42,18 +42,16 @@ config = {
     #########################################################################
     ###### 64 bit specific ######
     'base_name': 'OS X 10.7 %(branch)s',
     'platform': 'macosx64',
     'stage_platform': 'macosx64',
     'enable_max_vsize': False,
     'use_platform_in_symbols_extra_buildid': True,
     'env': {
-        # disable sccache for bug 1154377
-        'SCCACHE_DISABLE': '1',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': 'obj-firefox',
         # SYMBOL_SERVER_HOST is dictated from build_pool_specifics.py
         'SYMBOL_SERVER_HOST': '%(symbol_server_host)s',
         'SYMBOL_SERVER_SSH_KEY': "/Users/cltbld/.ssh/ffxbld_rsa",
         'SYMBOL_SERVER_USER': 'ffxbld',
--- a/configs/builds/releng_sub_mac_configs/64_debug.py
+++ b/configs/builds/releng_sub_mac_configs/64_debug.py
@@ -12,18 +12,16 @@ config = {
         'update',  # decided by query_is_nightly()
     ],
     'stage_platform': 'macosx64-debug',
     'debug_build': True,
     'objdir': 'obj-firefox',
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
-        # disable sccache for bug 1154377
-        'SCCACHE_DISABLE': '1',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': 'obj-firefox',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
--- a/configs/builds/releng_sub_mac_configs/64_graphene.py
+++ b/configs/builds/releng_sub_mac_configs/64_graphene.py
@@ -11,18 +11,16 @@ config = {
     'stage_product': 'b2g',
     'enable_signing': False,
     'enable_talos_sendchange': False,
     'enable_unittest_sendchange': False,
     'enable_count_ctors': False,
     'objdir': 'obj-graphene',
     #### 64 bit build specific #####
     'env': {
-        # disable sccache for bug 1154377
-        'SCCACHE_DISABLE': '1',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': 'obj-graphene',
         'TINDERBOX_OUTPUT': '1',
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
--- a/configs/builds/releng_sub_mac_configs/64_mulet.py
+++ b/configs/builds/releng_sub_mac_configs/64_mulet.py
@@ -11,18 +11,16 @@ config = {
     'tooltool_manifest_src': "b2g/dev/config/tooltool-manifests/macosx64/releng.manifest",
     'objdir': 'obj-firefox',
     'enable_signing': False,
     'enable_unittest_sendchange': False,
     'enable_talos_sendchange': False,
     'enable_check_test': False,
     #### 64 bit build specific #####
     'env': {
-        # disable sccache for bug 1154377
-        'SCCACHE_DISABLE': '1',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': 'obj-firefox',
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
--- a/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
+++ b/configs/builds/releng_sub_mac_configs/64_stat_and_debug.py
@@ -18,18 +18,16 @@ config = {
 clang.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     'enable_unittest_sendchange': False,
     'objdir': MOZ_OBJDIR,
     #### 64 bit build specific #####
     'env': {
-        # disable sccache for bug 1154377
-        'SCCACHE_DISABLE': '1',
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'HG_SHARE_BASE_DIR': '/builds/hg-shared',
         'MOZ_OBJDIR': MOZ_OBJDIR,
         'TINDERBOX_OUTPUT': '1',
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',