Bug 1298715 - Update mozharness win config for external media tests. r?maja_zf draft
authorBryce Van Dyk <bvandyk@mozilla.com>
Mon, 29 Aug 2016 11:31:47 +1200
changeset 406543 c667a9b47131202acbed2c5e0667e16f968f37f0
parent 404651 bd7645928990649c84609d3f531e803c2d41f269
child 529684 30cae185ffedd8a8e835e4b18a648edb64c5baa9
push id27754
push userbvandyk@mozilla.com
push dateSun, 28 Aug 2016 23:32:20 +0000
reviewersmaja_zf
bugs1298715
milestone51.0a1
Bug 1298715 - Update mozharness win config for external media tests. r?maja_zf The Windows config for the external media tests is out of date. These changes update the paths in the config, as well as removing unneeded config. MozReview-Commit-ID: KWcbs12Y4jD
testing/mozharness/configs/mediatests/buildbot_windows_config.py
--- a/testing/mozharness/configs/mediatests/buildbot_windows_config.py
+++ b/testing/mozharness/configs/mediatests/buildbot_windows_config.py
@@ -3,29 +3,21 @@ import sys
 import mozharness
 
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
     'external_tools',
 )
 
 config = {
-    "virtualenv_python_dll": 'c:/mozilla-build/python27/python27.dll',
     "virtualenv_path": 'venv',
     "exes": {
-        'python': 'c:/mozilla-build/python27/python',
-        'virtualenv': ['c:/mozilla-build/python27/python', 'c:/mozilla-build/buildbotve/virtualenv.py'],
-        'hg': 'c:/mozilla-build/hg/hg',
-        'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
-                       '%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
-        'tooltool.py': [sys.executable, 'C:/mozilla-build/tooltool.py'],
-        'hgtool.py': [sys.executable,
-                      os.path.join(external_tools_path, 'hgtool.py')],
-
-
+        'python': 'c:/mozilla-build/python/python',
+        'virtualenv': 'c:/mozilla-build/python/Scripts/virtualenv.exe',
+        'tooltool.py': "c:/mozilla-build/tooltool.py",
     },
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
 
@@ -38,17 +30,16 @@ config = {
         'create-virtualenv',
         'install',
         'run-media-tests',
     ],
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
-    "in_tree_config": "config/mozharness/marionette.py",
     "download_minidump_stackwalk": True,
     "download_symbols": "ondemand",
 
     "suite_definitions": {
         "media-tests": {
             "options": [],
         },
         "media-youtube-tests": {