Bug 1241644 - when using --spsProfile, do not upload data to graph server; r?jmaher draft
authorRob Wood <rwood@mozilla.com>
Tue, 10 May 2016 16:52:55 -0400
changeset 381202 40b7fb16af10035424a4ca137e79e69e32d982a9
parent 381201 e072bfcd1d6bab6db34b85cb0e2cbca62ba43293
child 381203 e5a4fb9819da757fa97da215c19d045702e91f85
push id21425
push userrwood@mozilla.com
push dateFri, 24 Jun 2016 17:31:35 +0000
reviewersjmaher
bugs1241644
milestone50.0a1
Bug 1241644 - when using --spsProfile, do not upload data to graph server; r?jmaher MozReview-Commit-ID: 1do7sSWVPBG
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/talos/talos/output.py
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -424,12 +424,13 @@ class Talos(TestingMixin, MercurialScrip
                 log_level = WARNING
                 tbpl_level = TBPL_WARNING
             if self.return_code == 4:
                 log_level = WARNING
                 tbpl_level = TBPL_RETRY
 
             parser.update_worst_log_and_tbpl_levels(log_level, tbpl_level)
         else:
-            self._validate_treeherder_data(parser)
+            if not self.sps_profile:
+                self._validate_treeherder_data(parser)
 
         self.buildbot_status(parser.worst_tbpl_status,
                              level=parser.worst_log_level)
--- a/testing/talos/talos/output.py
+++ b/testing/talos/talos/output.py
@@ -125,20 +125,21 @@ class PerfherderOutput(Output):
         """
 
         # parse the results url
         results_url_split = utils.urlsplit(results_url)
         results_scheme, results_server, results_path, _, _ = results_url_split
 
         # This is the output that treeherder expects to find when parsing the
         # log file
-        LOG.info("PERFHERDER_DATA: %s" % json.dumps(results))
         if results_scheme in ('file'):
             json.dump(results, file(results_path, 'w'), indent=2,
                       sort_keys=True)
+        else:
+            LOG.info("PERFHERDER_DATA: %s" % json.dumps(results))
 
     def post(self, results, server, path, scheme, tbpl_output):
         """conform to current code- not needed for perfherder"""
         pass
 
     def construct_results(self, vals, testname):
         if 'responsiveness' in testname:
             return filter.responsiveness_Metric([val for (val, page) in vals])