Bug 1278718 - Use the same setup for clang and binutils on TC as on buildbot. r=kmoir
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 08 Jun 2016 11:06:35 +0900
changeset 301839 6f4f910b4da63472dfa778b069d5ca1fa43d3bf8
parent 301838 c03ed1e5700b6dd2edd6c4756428cf1b4e943578
child 301840 c70c3d933ee89de37cb7c308045482436db4dc89
push id30343
push usercbook@mozilla.com
push dateThu, 16 Jun 2016 07:07:13 +0000
treeherdermozilla-central@6b40db156570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskmoir
bugs1278718
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1278718 - Use the same setup for clang and binutils on TC as on buildbot. r=kmoir
browser/config/tooltool-manifests/linux64/asan-tc.manifest
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
deleted file mode 100644
--- a/browser/config/tooltool-manifests/linux64/asan-tc.manifest
+++ /dev/null
@@ -1,27 +0,0 @@
-[
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "clang 3.9.0/r262971",
-"size": 117866656,
-"visibility": "public",
-"digest": "5529b4549e39838faf0f276fb5d1d9cf9972295a8fb2451e25b0490e4a94822bff9646d723cc3137bfc2eb7e7bcff8a25a331b881ec6ca0b73e29fd7dbb972f5",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
- "unpack": true
- },
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
-]
--- 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
@@ -14,17 +14,17 @@ config = {
         'check-test',
         # 'generate-build-stats',
         # 'update',
     ],
     'stage_platform': 'linux64-asan',
     'publish_nightly_en_US_routes': False,
     'build_type': 'asan',
     'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan-tc.manifest",
+asan.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
@@ -34,15 +34,15 @@ asan-tc.manifest",
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         ## 64 bit specific
-        'PATH': '/home/worker/workspace/build/src/gcc/bin:/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:\
+        'PATH': '/tools/buildbot/bin:/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',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/nightly-asan',
     #######################
 }
--- 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
@@ -15,17 +15,17 @@ config = {
         # 'generate-build-stats',
         # 'update',
     ],
     'stage_platform': 'linux64-asan-debug',
     'publish_nightly_en_US_routes': False,
     'build_type': 'asan-debug',
     'debug_build': True,
     'tooltool_manifest_src': "browser/config/tooltool-manifests/linux64/\
-asan-tc.manifest",
+asan.manifest",
     'platform_supports_post_upload_to_latest': False,
     'enable_signing': False,
     'enable_talos_sendchange': False,
     #### 64 bit build specific #####
     'env': {
         'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
         'MOZ_AUTOMATION': '1',
         'DISPLAY': ':2',
@@ -35,15 +35,15 @@ asan-tc.manifest",
         'TOOLTOOL_CACHE': '/builds/tooltool_cache',
         'TOOLTOOL_HOME': '/builds',
         'MOZ_CRASHREPORTER_NO_REPORT': '1',
         'CCACHE_DIR': '/builds/ccache',
         'CCACHE_COMPRESS': '1',
         'CCACHE_UMASK': '002',
         'LC_ALL': 'C',
         ## 64 bit specific
-        'PATH': '/home/worker/workspace/build/src/gcc/bin:/tools/buildbot/bin:/usr/local/bin:/usr/lib64/ccache:/bin:\
+        'PATH': '/tools/buildbot/bin:/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',
     },
     'src_mozconfig': 'browser/config/mozconfigs/linux64/debug-asan',
     #######################
 }