Merge mozilla-central to b2g-inbound, a=merge CLOSED TREE
authorNigel Babu <nigelbabu@gmail.com>
Wed, 21 Oct 2015 11:10:53 +0530
changeset 303774 1c228d8375dd766a7adb0a015b12e9277d18f2fe
parent 303773 c20a8e16ba880402f2f2f6c566e7eef70207a116 (current diff)
parent 303766 bdae48998e3ba50477dc83a989620dc9e72cc65f (diff)
child 303775 3cc49a416a2181a329b213d78f491dbcbf4af791
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone44.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
Merge mozilla-central to b2g-inbound, a=merge CLOSED TREE
--- a/testing/mozharness/configs/hazards/build_b2g.py
+++ b/testing/mozharness/configs/hazards/build_b2g.py
@@ -9,15 +9,16 @@ config = {
       'get-blobs',
       'clobber-shell',
       'configure-shell',
       'build-shell',
       'clobber-analysis',
       'setup-analysis',
       'run-analysis',
       'collect-analysis-output',
-      'upload-analysis',
+      # Temporarily disabled - see bug 1211402
+      #'upload-analysis',
       'check-expectations',
    ],
 
     'sixgill_manifest': "build/sixgill-b2g.manifest",
     'b2g_target_compiler_prefix': "target_compiler/gcc/linux-x86/arm/arm-linux-androideabi-4.7/bin/arm-linux-androideabi-",
 }
--- a/testing/mozharness/scripts/spidermonkey_build.py
+++ b/testing/mozharness/scripts/spidermonkey_build.py
@@ -110,17 +110,18 @@ class SpidermonkeyBuild(MockMixin,
                                 'get-blobs',
                                 'clobber-shell',
                                 'configure-shell',
                                 'build-shell',
                                 'clobber-analysis',
                                 'setup-analysis',
                                 'run-analysis',
                                 'collect-analysis-output',
-                                'upload-analysis',
+                                # Temporary - see bug 1211402
+                                #'upload-analysis',
                                 'check-expectations',
                             ],
                             config={
                                 'default_vcs': 'hgtool',
                                 'vcs_share_base': os.environ.get('HG_SHARE_BASE_DIR'),
                                 'ccache': True,
                                 'buildbot_json_path': os.environ.get('PROPERTIES_FILE'),
                                 'tools_repo': 'https://hg.mozilla.org/build/tools',