Bug 1314463 - remove proxxy and pypi.pvt config for tc win tests; r?jmaher draft
authorRob Thijssen <rthijssen@mozilla.com>
Tue, 01 Nov 2016 23:29:54 +0000
changeset 432412 ce161e2822381664005cd85f3c6ce9064da9f3a1
parent 432230 3e73fd638e687a4d7f46613586e5156b8e2af846
child 535642 95e009b4a740d1d30e8534d0521dc46ba44cea28
push id34302
push userrthijssen@mozilla.com
push dateTue, 01 Nov 2016 23:31:13 +0000
reviewersjmaher
bugs1314463
milestone52.0a1
Bug 1314463 - remove proxxy and pypi.pvt config for tc win tests; r?jmaher MozReview-Commit-ID: Al4McqCJIIy
testing/mozharness/configs/marionette/windows_taskcluster_config.py
testing/mozharness/configs/mediatests/taskcluster_windows_config.py
testing/mozharness/configs/unittests/win_taskcluster_unittest.py
testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
--- a/testing/mozharness/configs/marionette/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
@@ -15,18 +15,18 @@ config = {
             sys.executable,
             os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
         ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
 
+    "proxxy": {},
     "find_links": [
-        "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
 
     "default_actions": [
         'clobber',
         'download-and-extract',
         'create-virtualenv',
--- a/testing/mozharness/configs/mediatests/taskcluster_windows_config.py
+++ b/testing/mozharness/configs/mediatests/taskcluster_windows_config.py
@@ -15,18 +15,18 @@ config = {
         'virtualenv': [
             sys.executable,
             os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
         ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
+    "proxxy": {},
     "find_links": [
-        "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
 
     "default_actions": [
         'clobber',
         'download-and-extract',
         'create-virtualenv',
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -23,18 +23,18 @@ config = {
     },
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "virtualenv_path": 'venv',
     "virtualenv_python_dll": os.path.join(os.path.dirname(sys.executable), "python27.dll"),
 
+    "proxxy": {},
     "find_links": [
-        "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "pip_index": False,
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
         "mochitest": "runtests.py",
         "reftest": "runreftest.py",
         "xpcshell": "runxpcshelltests.py",
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@@ -26,18 +26,18 @@ config = {
             sys.executable,
             os.path.join(os.path.dirname(sys.executable), 'Lib', 'site-packages', 'virtualenv.py')
         ],
         'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
         'tooltool.py': [sys.executable, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
 
+    "proxxy": {},
     "find_links": [
-        "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
 
     "pip_index": False,
 
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],