Bug 1452179: [mozharness] Get rid of pip configs when they match the default; r=bhearsum
authorTom Prince <mozilla@hocat.ca>
Wed, 11 Apr 2018 10:12:35 -0600
changeset 468378 8758f6f2e9fb73c70ed940364d5a8ecbf0dbc17f
parent 468316 5cc5665abf82c6b5480145a17e1927ae35118cdd
child 468379 48284706be226e959ad20c4f293d3b970cd24a90
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum
bugs1452179
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1452179: [mozharness] Get rid of pip configs when they match the default; r=bhearsum Differential Revision: https://phabricator.services.mozilla.com/D911
testing/mozharness/configs/android/android_common.py
testing/mozharness/configs/awsy/linux_config.py
testing/mozharness/configs/awsy/macosx_config.py
testing/mozharness/configs/awsy/taskcluster_windows_config.py
testing/mozharness/configs/builds/releng_base_android_64_builds.py
testing/mozharness/configs/builds/releng_base_firefox.py
testing/mozharness/configs/developer_config.py
testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
testing/mozharness/configs/firefox_ui_tests/releng_release.py
testing/mozharness/configs/firefox_ui_tests/taskcluster.py
testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py
testing/mozharness/configs/internal_pypi.py
testing/mozharness/configs/marionette/prod_config.py
testing/mozharness/configs/marionette/windows_config.py
testing/mozharness/configs/marionette/windows_taskcluster_config.py
testing/mozharness/configs/releng_infra_configs/builders.py
testing/mozharness/configs/releng_infra_configs/testers.py
testing/mozharness/configs/talos/linux64_config_taskcluster.py
testing/mozharness/configs/talos/linux_config.py
testing/mozharness/configs/talos/mac_config.py
testing/mozharness/configs/talos/windows_config.py
testing/mozharness/configs/talos/windows_taskcluster_config.py
testing/mozharness/configs/talos/windows_vm_config.py
testing/mozharness/configs/unittests/linux_unittest.py
testing/mozharness/configs/unittests/mac_unittest.py
testing/mozharness/configs/unittests/win_taskcluster_unittest.py
testing/mozharness/configs/unittests/win_unittest.py
testing/mozharness/configs/web_platform_tests/prod_config.py
testing/mozharness/configs/web_platform_tests/prod_config_windows.py
testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
testing/mozharness/configs/web_platform_tests/test_config.py
testing/mozharness/configs/web_platform_tests/test_config_windows.py
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -17,20 +17,16 @@ config = {
         'install',
         'run-tests',
     ],
     "tooltool_cache": "/builds/worker/tooltool_cache",
     "tooltool_servers": ['http://relengapi/tooltool/'],
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "avds_dir": "/builds/worker/workspace/build/.android",
     "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
 
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
--- a/testing/mozharness/configs/awsy/linux_config.py
+++ b/testing/mozharness/configs/awsy/linux_config.py
@@ -18,17 +18,16 @@ config = {
     "binary_path": BINARY_PATH,
     "installer_path": INSTALLER_PATH,
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "cmd_timeout": 6500,
-    "pip_index": False,
     "exes": {
     },
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
--- a/testing/mozharness/configs/awsy/macosx_config.py
+++ b/testing/mozharness/configs/awsy/macosx_config.py
@@ -11,17 +11,16 @@ config = {
     "log_name": "awsy",
     "installer_path": INSTALLER_PATH,
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "cmd_timeout": 6500,
-    "pip_index": False,
     "exes": {
     },
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
--- a/testing/mozharness/configs/awsy/taskcluster_windows_config.py
+++ b/testing/mozharness/configs/awsy/taskcluster_windows_config.py
@@ -8,20 +8,16 @@ external_tools_path = os.path.join(
 )
 
 config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
 
     "download_minidump_stackwalk": True,
     "download_symbols": "ondemand",
 
     "default_actions": [
         'clobber',
         'download-and-extract',
         "populate-webroot",
--- a/testing/mozharness/configs/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@@ -47,18 +47,16 @@ config = {
         {'filename': '/builds/pocket-api-nightly.token',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/pocket-api-nightly.token',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
 
     ],
     'vcs_share_base': '/builds/hg-shared',
     'objdir': 'obj-firefox',
     'multi_locale': True,
-    'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
-    'pip_index': False,
     #########################################################################
 
 
     #########################################################################
     'base_name': 'Android 2.3 %(branch)s',
     'platform': 'android',
     'stage_platform': 'android',
     'enable_max_vsize': False,
--- a/testing/mozharness/configs/builds/releng_base_firefox.py
+++ b/testing/mozharness/configs/builds/releng_base_firefox.py
@@ -1,6 +1,4 @@
 config = {
     'objdir': 'obj-firefox',
     'app_name': 'browser',
-    'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
-    'pip_index': False,
 }
--- a/testing/mozharness/configs/developer_config.py
+++ b/testing/mozharness/configs/developer_config.py
@@ -21,20 +21,16 @@ config = {
         ("http://pvtbuilds.pvt.build", "https://pvtbuilds"),
     ],
 
     # General local variable overwrite
     "exes": {
         "gittool.py": os.path.join(LOCAL_WORKDIR, "gittool.py"),
     },
 
-    # Pip
-    "find_links": ["http://pypi.pub.build.mozilla.org/pub"],
-    "pip_index": False,
-
     # Talos related
     "python_webserver": True,
     "virtualenv_path": '%s/build/venv' % os.getcwd(),
     "preflight_run_cmd_suites": [],
     "postflight_run_cmd_suites": [],
 
     # Tooltool related
     "tooltool_cache": os.path.join(LOCAL_WORKDIR, "builds/tooltool_cache"),
--- a/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
+++ b/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
@@ -1,15 +1,11 @@
 # Default configuration as used by Mozmill CI (Jenkins)
 
 
 config = {
     # Tests run in mozmill-ci do not use RelEng infra
     'developer_mode': True,
 
-    # PIP
-    'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
-    'pip_index': False,
-
     # mozcrash support
     'download_minidump_stackwalk': True,
     'download_symbols': 'ondemand',
 }
--- a/testing/mozharness/configs/firefox_ui_tests/releng_release.py
+++ b/testing/mozharness/configs/firefox_ui_tests/releng_release.py
@@ -17,16 +17,12 @@ config = {
     'exes': {
         'gittool.py': [
             # Bug 1227079 - Python executable eeded to get it executed on Windows
             sys.executable,
             os.path.join(external_tools_path, 'gittool.py')
         ],
     },
 
-    # PIP
-    'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
-    'pip_index': False,
-
     # mozcrash support
     'download_minidump_stackwalk': True,
     'download_symbols': 'ondemand',
 }
--- a/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
+++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster.py
@@ -1,14 +1,9 @@
 # Config file for firefox ui tests run via TaskCluster.
 
 
 config = {
     "vcs_share_base": "/builds/hg-shared",
 
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
-
     "download_minidump_stackwalk": True,
     "tooltool_cache": "/builds/worker/tooltool-cache",
 }
--- a/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py
+++ b/testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py
@@ -6,16 +6,11 @@ import sys
 
 config = {
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
 
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
-
     "download_minidump_stackwalk": True,
     "download_symbols": "ondemand",
 }
--- a/testing/mozharness/configs/internal_pypi.py
+++ b/testing/mozharness/configs/internal_pypi.py
@@ -1,7 +1,6 @@
 config = {
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    'pip_index': False,
 }
--- a/testing/mozharness/configs/marionette/prod_config.py
+++ b/testing/mozharness/configs/marionette/prod_config.py
@@ -9,17 +9,16 @@ config = {
     "test_manifest": "unit-tests.ini",
 
     "vcs_share_base": HG_SHARE_BASE_DIR,
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
 
     "buildbot_json_path": "buildprops.json",
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
--- a/testing/mozharness/configs/marionette/windows_config.py
+++ b/testing/mozharness/configs/marionette/windows_config.py
@@ -11,17 +11,16 @@ config = {
         'python': 'c:/mozilla-build/python27/python',
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
 
     "buildbot_json_path": "buildprops.json",
 
     "default_actions": [
         'clobber',
         'read-buildbot-config',
         'download-and-extract',
         'create-virtualenv',
--- a/testing/mozharness/configs/marionette/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
@@ -8,21 +8,16 @@ config = {
     "test_manifest": "unit-tests.ini",
 
     "virtualenv_path": 'venv',
     "exes": {
         'python': sys.executable,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
 
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
-
     "default_actions": [
         'clobber',
         'download-and-extract',
         'create-virtualenv',
         'install',
         'run-tests',
     ],
     "default_blob_upload_servers": [
--- a/testing/mozharness/configs/releng_infra_configs/builders.py
+++ b/testing/mozharness/configs/releng_infra_configs/builders.py
@@ -31,12 +31,11 @@ PLATFORM_CONFIG = {
 
 config = PLATFORM_CONFIG[platform_name()]
 # Generic values
 config.update({
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    'pip_index': False,
     'virtualenv_path': 'venv',
 })
 
--- a/testing/mozharness/configs/releng_infra_configs/testers.py
+++ b/testing/mozharness/configs/releng_infra_configs/testers.py
@@ -53,11 +53,10 @@ PLATFORM_CONFIG = {
 
 config = PLATFORM_CONFIG[platform_name()]
 # Generic values
 config.update({
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    'pip_index': False,
     'virtualenv_path': 'venv',
 })
--- a/testing/mozharness/configs/talos/linux64_config_taskcluster.py
+++ b/testing/mozharness/configs/talos/linux64_config_taskcluster.py
@@ -22,17 +22,16 @@ config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": INSTALLER_PATH,
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
     "exes": exes,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@@ -13,17 +13,16 @@ config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
--- a/testing/mozharness/configs/talos/mac_config.py
+++ b/testing/mozharness/configs/talos/mac_config.py
@@ -16,17 +16,16 @@ config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
     "title": os.uname()[1].lower().split('.')[0],
     "default_actions": [
         "clobber",
         "read-buildbot-config",
         "download-and-extract",
         "populate-webroot",
         "create-virtualenv",
         "install",
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@@ -6,17 +6,16 @@ PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
-    "pip_index": False,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
         'tooltool.py': [PYTHON, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
--- a/testing/mozharness/configs/talos/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/talos/windows_taskcluster_config.py
@@ -6,20 +6,16 @@ PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'venv')
 
 config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
-    "pip_index": False,
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
     "title": socket.gethostname().split('.')[0],
     "default_actions": [
         "populate-webroot",
         "create-virtualenv",
--- a/testing/mozharness/configs/talos/windows_vm_config.py
+++ b/testing/mozharness/configs/talos/windows_vm_config.py
@@ -6,17 +6,16 @@ PYTHON = sys.executable
 PYTHON_DLL = 'c:/mozilla-build/python27/python27.dll'
 VENV_PATH = os.path.join(os.getcwd(), 'build/venv')
 
 config = {
     "log_name": "talos",
     "buildbot_json_path": "buildprops.json",
     "installer_path": "installer.exe",
     "virtualenv_path": VENV_PATH,
-    "pip_index": False,
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
     "exes": {
         'python': PYTHON,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
     },
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -34,17 +34,16 @@ else:
 
 #####
 config = {
     "buildbot_json_path": "buildprops.json",
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
         "mochitest": "runtests.py",
         "reftest": "runreftest.py",
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@@ -8,17 +8,16 @@ DISABLE_SCREEN_SAVER = False
 ADJUST_MOUSE_AND_SCREEN = False
 #####
 config = {
     "buildbot_json_path": "buildprops.json",
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
-    "pip_index": False,
     ###
     "installer_path": INSTALLER_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "exe_suffix": EXE_SUFFIX,
     "run_file_names": {
         "mochitest": "runtests.py",
         "reftest": "runreftest.py",
         "xpcshell": "runxpcshelltests.py",
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -28,20 +28,16 @@ config = {
     },
     ###
     "installer_path": INSTALLER_PATH,
     "binary_path": BINARY_PATH,
     "xpcshell_name": XPCSHELL_NAME,
     "virtualenv_modules": ['pypiwin32'],
     "virtualenv_path": 'venv',
 
-    "find_links": [
-        "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",
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -22,17 +22,16 @@ config = {
     "xpcshell_name": XPCSHELL_NAME,
     "virtualenv_path": 'venv',
     "virtualenv_modules": ['pywin32'],
 
     "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",
         "cppunittest": "runcppunittests.py",
         "gtest": "rungtests.py",
         "jittest": "jit_test.py",
--- a/testing/mozharness/configs/web_platform_tests/prod_config.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config.py
@@ -16,17 +16,16 @@ config = {
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
 
-    "pip_index": False,
 
     "buildbot_json_path": "buildprops.json",
 
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
 
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
@@ -25,17 +25,16 @@ config = {
         'hg': 'c:/mozilla-build/hg/hg',
     },
 
     "find_links": [
         "http://pypi.pvt.build.mozilla.org/pub",
         "http://pypi.pub.build.mozilla.org/pub",
     ],
 
-    "pip_index": False,
 
     "buildbot_json_path": "buildprops.json",
 
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
 
     "blob_uploader_auth_file" : os.path.join(os.getcwd(), "oauth.txt"),
--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@@ -20,22 +20,16 @@ config = {
         "--certutil-binary=%(test_install_path)s/bin/certutil",
     ],
 
     "exes": {
         'python': sys.executable,
         'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
     },
 
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-
-    "pip_index": False,
-
     "default_blob_upload_servers": [
          "https://blobupload.elasticbeanstalk.com",
     ],
 
     "run_cmd_checks_enabled": True,
     "preflight_run_cmd_suites": [
         {
             'name': 'disable_screen_saver',
--- a/testing/mozharness/configs/web_platform_tests/test_config.py
+++ b/testing/mozharness/configs/web_platform_tests/test_config.py
@@ -19,14 +19,9 @@ config = {
         'clobber',
         'download-and-extract',
         'create-virtualenv',
         'pull',
         'install',
         'run-tests',
     ],
 
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-
-    "pip_index": False,
 }
--- a/testing/mozharness/configs/web_platform_tests/test_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/test_config_windows.py
@@ -25,15 +25,9 @@ config = {
     "default_actions": [
         'clobber',
         'download-and-extract',
         'create-virtualenv',
         'pull',
         'install',
         'run-tests',
     ],
-
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-
-    "pip_index": False,
 }