Bug 1241644 - when using --spsProfile, do not upload data to graph server/perfherder; r=wlach

MozReview-Commit-ID: Fzx7s9VX9vj

--HG--
extra : rebase_source : 2132dadf4247d5bd0175f7a83a564a9edb588e9a

testing/mozharness/mozharness/mozilla/testing/talos.py

@@ -429,7 +429,8 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
 
             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)

testing/talos/talos/config.py

@@ -311,9 +311,11 @@ def get_global_overrides(config):
     global_overrides = {}
     for key in GLOBAL_OVERRIDES:
         # get global overrides for all tests
-        value = config.pop(key)
+        value = config[key]
         if value is not None:
             global_overrides[key] = value
+        if key != 'sps_profile':
+            config.pop(key)
 
     # add noChrome to global overrides (HACK)
     noChrome = config.pop('noChrome')

testing/talos/talos/output.py

@@ -194,7 +194,8 @@ class Output(object):
 
         # This is the output that treeherder expects to find when parsing the
         # log file
-        LOG.info("PERFHERDER_DATA: %s" % json.dumps(results))
+        if 'spsProfile' not in self.results.extra_options:
+            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)

testing/talos/talos/run_tests.py

@@ -169,7 +169,7 @@ def run_tests(config, browser_config):
     talos_results = TalosResults()
 
     # results links
-    if not browser_config['develop']:
+    if not browser_config['develop'] and not config['sps_profile']:
         results_urls = dict(
             # another hack; datazilla stands for Perfherder
             # and do not require url, but a non empty dict is required...
@@ -186,6 +186,9 @@ def run_tests(config, browser_config):
     if config['e10s']:
         talos_results.add_extra_option('e10s')
 
+    if config['sps_profile']:
+        talos_results.add_extra_option('spsProfile')
+
     testname = None
     # run the tests
     timer = utils.Timer()
@@ -224,7 +227,7 @@ def run_tests(config, browser_config):
     # output results
     if results_urls:
         talos_results.output(results_urls)
-        if browser_config['develop']:
+        if browser_config['develop'] or config['sps_profile']:
             print ("Thanks for running Talos locally. Results are in %s"
                    % (results_urls['output_urls']))