Bug 1189897 - Undo the Android changes from bug 1172918. r=jmaher, a=test-only
authorWilliam Lachance <wlachance@mozilla.com>
Fri, 31 Jul 2015 17:38:42 -0400
changeset 269126 e81559b5c0d37212803b7ffaaa9c79775732123a
parent 269125 f57b52fa0a5843cbd837177aef5e2c6b503c3906
child 269127 e9d391fdf0bee5881aa77a7ce1f5465ecbb40118
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-esr52@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, test-only
bugs1189897, 1172918
milestone41.0a2
Bug 1189897 - Undo the Android changes from bug 1172918. r=jmaher, a=test-only
testing/mozharness/configs/android/android_panda_talos_releng.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,16 +12,18 @@ 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/scripts/android_panda_talos.py
+++ b/testing/mozharness/scripts/android_panda_talos.py
@@ -378,16 +378,22 @@ 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))