Revert of V8: Show build environment in failure logs

scripts/slave/recipe_modules/v8/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import datetime
 import random
 import re
 import urllib
 
@@ skipping 246 matching lines @@
       env['CXX'] = self.c.gyp_env.CXX
     if self.c.gyp_env.LINK:
       env['LINK'] = self.c.gyp_env.LINK
     if self.c.gyp_env.RANLIB:
       env['RANLIB'] = self.c.gyp_env.RANLIB
     # TODO(machenbach): Make this the default on windows.
     if self.m.chromium.c.gyp_env.GYP_MSVS_VERSION:
       env['GYP_MSVS_VERSION'] = self.m.chromium.c.gyp_env.GYP_MSVS_VERSION
     self.m.chromium.runhooks(env=env, **kwargs)
 
-  @property
-  def build_environment(self):
-    if self.m.properties.get('build_environment'):
-      return self.m.properties['build_environment']
-    if self.bot_type == 'tester':
-      return None
-    build_environment = dict(
-        (k, v) for (k, v) in self.m.chromium.c.gyp_env.as_jsonish().iteritems()
-               if k.startswith('GYP') and v is not None
-    )
-    build_environment.update(self.c.gyp_env.as_jsonish())
-    if 'GYP_DEFINES' in build_environment:
-      # Filter out gomadir.
-      build_environment['GYP_DEFINES'] = ' '.join(
-          d for d in build_environment['GYP_DEFINES'].split()
-            if not d.startswith('gomadir')
-      )
-    return build_environment
-
   def setup_mips_toolchain(self):
     mips_dir = self.m.path['slave_build'].join(MIPS_DIR, 'bin')
     if not self.m.path.exists(mips_dir):
       self.m.gsutil.download_url(
           'gs://chromium-v8/%s' % MIPS_TOOLCHAIN,
           self.m.path['slave_build'],
           name='bootstrapping mips toolchain')
       self.m.step('unzipping',
                ['tar', 'xf', MIPS_TOOLCHAIN],
                cwd=self.m.path['slave_build'])
@@ skipping 411 matching lines @@
     """Returns log lines for all results of a unique command."""
     assert results
     lines = []
 
     # Add common description for multiple runs.
     flaky_suffix = ' (flaky in a repeated run)' if flaky else ''
     lines.append('Test: %s%s' % (results[0]['name'], flaky_suffix))
     lines.append('Flags: %s' % ' '.join(results[0]['flags']))
     lines.append('Command: %s' % results[0]['command'])
     lines.append('')
-    lines.append('Build environment:')
-    build_environment = self.build_environment
-    if build_environment is None:
-      lines.append(
-          'Not available. Please look up the builder\'s configuration.')
-    else:
-      for key in sorted(build_environment):
-        lines.append(' %s: %s' % (key, build_environment[key]))
-    lines.append('')
 
     # Add results for each run of a command.
     for result in sorted(results, key=lambda r: int(r['run'])):
       lines.append('Run #%d' % int(result['run']))
       lines.append('Exit code: %s' % result['exit_code'])
       lines.append('Result: %s' % result['result'])
       if result.get('expected'):
         lines.append('Expected outcomes: %s' % ", ".join(result['expected']))
       lines.append('Duration: %s' % V8Api.format_duration(result['duration']))
       lines.append('')
@@ skipping 230 matching lines @@
           rietveld=str(self.m.properties['rietveld']),
         )
       else:
         # On non-tryservers, we can set the revision to whatever the
         # triggering builder checked out.
         properties['revision'] = self.revision
 
       # TODO(machenbach): Also set meaningful buildbucket tags of triggering
       # parent.
 
-      # Pass build environment to testers if it doesn't exceed buildbot's
-      # limits.
-      # TODO(machenbach): Remove the check in the after-buildbot age.
-      if len(self.m.json.dumps(self.build_environment)) < 1024:
-        properties['build_environment'] = self.build_environment
-
       swarm_hashes = self.m.isolate.isolated_tests
       if swarm_hashes:
         properties['swarm_hashes'] = swarm_hashes
       properties.update(**additional_properties)
       self.m.trigger(*[{
         'builder_name': builder_name,
         'properties': properties,
       } for builder_name in triggers])
 
       if triggers_proxy:
@@ skipping 132 matching lines @@
   def report_culprits(self, culprit_range):
     assert culprit_range
     if len(culprit_range) > 1:
       text = 'Suspecting multiple commits'
     else:
       text = 'Suspecting %s' % culprit_range[0][:8]
 
     step_result = self.m.step(text, cmd=None)
     for culprit in culprit_range:
       step_result.presentation.links[culprit[:8]] = COMMIT_TEMPLATE % culprit