Bug 1186844 - remove deprecated 'results_urls' options when running talos from harness
authorJulien Pagès <j.parkouss@gmail.com>
Sat, 25 Jul 2015 11:33:09 +0200
changeset 254639 b1165227cd7382daa11a01257f8214f8df72656d
parent 254638 59f70ba8d1ab732b945ba2c7db8489103d62bc9d
child 254640 ddfcd5c87f76700e388f712ecd4825f1d6170775
push id14246
push userryanvm@gmail.com
push dateMon, 27 Jul 2015 14:44:11 +0000
treeherderfx-team@c2e8b03c28bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1186844
milestone42.0a1
Bug 1186844 - remove deprecated 'results_urls' options when running talos from harness
testing/mozharness/configs/talos/linux_config.py
testing/mozharness/configs/talos/mac_config.py
testing/mozharness/configs/talos/windows_config.py
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@@ -14,17 +14,16 @@ config = {
     ],
     "pip_index": False,
     "use_talos_json": True,
     "exes": {
         'python': PYTHON,
         'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
     },
     "title": os.uname()[1].lower().split('.')[0],
-    "results_url": "http://graphs.mozilla.org/server/collect.cgi",
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "clone-talos",
         "create-virtualenv",
         "install",
         "run-tests",
--- a/testing/mozharness/configs/talos/mac_config.py
+++ b/testing/mozharness/configs/talos/mac_config.py
@@ -24,17 +24,16 @@ config = {
     ],
     "pip_index": False,
     "use_talos_json": True,
     "exes": {
         'python': PYTHON,
         'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
     },
     "title": os.uname()[1].lower().split('.')[0],
-    "results_url": "http://graphs.mozilla.org/server/collect.cgi",
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "clone-talos",
         "create-virtualenv",
         "install",
         "run-tests",
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@@ -23,17 +23,16 @@ config = {
         'virtualenv': [PYTHON, 'c:/mozilla-build/buildbotve/virtualenv.py'],
         'easy_install': ['%s/scripts/python' % VENV_PATH,
                          '%s/scripts/easy_install-2.7-script.py' % VENV_PATH],
         'mozinstall': ['%s/scripts/python' % VENV_PATH,
                        '%s/scripts/mozinstall-script.py' % VENV_PATH],
         'hg': 'c:/mozilla-build/hg/hg',
     },
     "title": socket.gethostname().split('.')[0],
-    "results_url": "http://graphs.mozilla.org/server/collect.cgi",
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "clone-talos",
         "create-virtualenv",
         "install",
         "run-tests",
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -69,22 +69,16 @@ class TalosOutputParser(OutputParser):
 
 talos_config_options = [
     [["-a", "--tests"],
      {'action': 'extend',
       "dest": "tests",
       "default": [],
       "help": "Specify the tests to run"
       }],
-    [["--results-url"],
-     {'action': 'store',
-      'dest': 'results_url',
-      'default': None,
-      'help': "URL to send results to"
-      }],
 ]
 
 
 class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
     """
     install and run Talos tests:
     https://wiki.mozilla.org/Buildbot/Talos
     """
@@ -158,21 +152,16 @@ class Talos(TestingMixin, MercurialScrip
                                               'install',
                                               'run-tests',
                                               ])
         kwargs.setdefault('config', {})
         super(Talos, self).__init__(**kwargs)
 
         self.workdir = self.query_abs_dirs()['abs_work_dir']  # convenience
 
-        # results output
-        self.results_url = self.config.get('results_url')
-        if self.results_url is None:
-            # use a results_url by default based on the class name in the working directory
-            self.results_url = 'file://%s' % os.path.join(self.workdir, self.__class__.__name__.lower() + '.txt')
         self.installer_url = self.config.get("installer_url")
         self.talos_json_url = self.config.get("talos_json_url")
         self.talos_json = self.config.get("talos_json")
         self.talos_json_config = self.config.get("talos_json_config")
         self.talos_path = os.path.join(self.workdir, 'talos_repo')
         self.has_cloned_talos = False
         self.tests = None
         self.pagesets_url = None
@@ -417,18 +406,17 @@ class Talos(TestingMixin, MercurialScrip
         # talos options
         options = ['-v', ]  # hardcoded options (for now)
         if self.config.get('python_webserver', True):
             options.append('--develop')
         # talos can't gather data if the process name ends with '.exe'
         if binary_path.endswith('.exe'):
             binary_path = binary_path[:-4]
         kw_options = {'output': 'talos.yml',  # options overwritten from **kw
-                      'executablePath': binary_path,
-                      'results_url': self.results_url}
+                      'executablePath': binary_path}
         kw_options['activeTests'] = self.query_tests()
         if self.config.get('title'):
             kw_options['title'] = self.config['title']
         if self.config.get('branch'):
             kw_options['branchName'] = self.config['branch']
         if self.symbols_path:
             kw_options['symbolsPath'] = self.symbols_path
         kw_options.update(kw)