Bug 1172918 - clean up talos options that are not used (mozharness bits). r=jmaher a=test-only
authorJulien Pagès <j.parkouss@gmail.com>
Tue, 04 Aug 2015 08:48:51 -0400
changeset 281786 39e74b17e433da85068e30abfe0626b470cbaa3a
parent 281785 167c75d38d791dfba91f73adbb21ccd61c9c5a6f
child 281787 d127112a8f501ea1c1d4a77e7ef8ea65bfd792e7
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, test-only
bugs1172918
milestone41.0a2
Bug 1172918 - clean up talos options that are not used (mozharness bits). r=jmaher a=test-only
testing/mozharness/configs/android/android_panda_talos_releng.py
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
testing/mozharness/scripts/android_panda_talos.py
--- a/testing/mozharness/configs/android/android_panda_talos_releng.py
+++ b/testing/mozharness/configs/android/android_panda_talos_releng.py
@@ -12,18 +12,16 @@ config = {
         "preflight_talos": "remotePerfConfigurator.py",
         "talos": "run_tests.py",
     },
     "retry_url":  "http://talos-bundles.pvt.build.mozilla.org/zips/retry.zip",
     "verify_path":  "/builds/sut_tools/verify.py",
     "install_app_path":  "/builds/sut_tools/installApp.py",
     "talos_from_code_url": "https://hg.mozilla.org/%s/raw-file/%s/testing/talos/talos_from_code.py",
     "talos_json_url": "https://hg.mozilla.org/%s/raw-file/%s/testing/talos/talos.json",
-    "datazilla_urls": ["https://datazilla.mozilla.org/talos"],
-    "datazilla_authfile": os.path.join(os.getcwd(), "oauth.txt"),
     #remotePerfConfigurator.py options
     "preflight_talos_options": [
         "-v", "-e", "%(app_name)s",
         "-t", "%(hostname)s",
         "--branchName=%(talos_branch)s",
         "--resultsServer=graphs.mozilla.org",
         "--resultsLink=/server/collect.cgi",
         "--noChrome",
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@@ -15,18 +15,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",
-    "datazilla_urls": ["https://datazilla.mozilla.org/talos"],
-    "datazilla_authfile": os.path.join(os.getcwd(), "oauth.txt"),
     "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
@@ -25,18 +25,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",
-    "datazilla_urls": ["https://datazilla.mozilla.org/talos"],
-    "datazilla_authfile": os.path.join(os.getcwd(), "oauth.txt"),
     "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
@@ -24,18 +24,16 @@ config = {
         '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",
-    "datazilla_urls": ["https://datazilla.mozilla.org/talos"],
-    "datazilla_authfile": os.path.join(os.getcwd(), "oauth.txt"),
     "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
@@ -439,23 +439,16 @@ class Talos(TestingMixin, MercurialScrip
         kw_options.update(kw)
         # talos expects tests to be in the format (e.g.) 'ts:tp5:tsvg'
         tests = kw_options.get('activeTests')
         if tests and not isinstance(tests, basestring):
             tests = ':'.join(tests)  # Talos expects this format
             kw_options['activeTests'] = tests
         for key, value in kw_options.items():
             options.extend(['--%s' % key, value])
-        # add datazilla results urls
-        for url in self.config.get('datazilla_urls', []):
-            options.extend(['--datazilla-url', url])
-        # add datazilla authfile
-        authfile = self.config.get('datazilla_authfile')
-        if authfile:
-            options.extend(['--authfile', authfile])
         # configure profiling options
         options.extend(self.query_sps_profile_options())
         # extra arguments
         if args is None:
             args = self.query_talos_options()
         options += args
 
         return options
--- a/testing/mozharness/scripts/android_panda_talos.py
+++ b/testing/mozharness/scripts/android_panda_talos.py
@@ -378,22 +378,16 @@ class PandaTalosTest(TestingMixin, Mercu
            talos_json_config['extra_options'].get('android'):
             for option in self.talos_json_config['extra_options']['android']:
                 options.append(option % {
                     'apk_path': self.apk_path })
 
         if self.config['%s_options' % suite_category]:
             for option in self.config['%s_options' % suite_category]:
                 options.append(option % str_format_values)
-            for url in self.config.get('datazilla_urls', []):
-                options.extend(['--datazilla-url', url])
-            # add datazilla authfile
-            authfile = self.config.get('datazilla_authfile')
-            if authfile:
-                options.extend(['--authfile', authfile])
             abs_base_cmd = base_cmd + options
             return abs_base_cmd
         else:
             self.warning("Suite options for %s could not be determined."
                          "\nIf you meant to have options for this suite, "
                          "please make sure they are specified in your "
                          "config under %s_options" %
                          (suite_category, suite_category))