Bug 1452179: [mozharness] Get rid of pip configs when they match the default; r=bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D911 --HG-- extra : rebase_source : 647f56eb3688b80c66995683b8b46e622ba1812a
2018-04-11 10:12:35 -06:00 · 2018-04-11 10:12:35 -06:00 · f570d83a4b
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@ -22,10 +22,6 @@ config = {
    "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": {
--- a/testing/mozharness/configs/awsy/linux_config.py
+++ b/testing/mozharness/configs/awsy/linux_config.py
@ -23,7 +23,6 @@ config = {
        "http://pypi.pub.build.mozilla.org/pub",
    ],
    "cmd_timeout": 6500,
-    "pip_index": False,
    "exes": {
    },
    "title": os.uname()[1].lower().split('.')[0],
--- a/testing/mozharness/configs/awsy/macosx_config.py
+++ b/testing/mozharness/configs/awsy/macosx_config.py
@ -16,7 +16,6 @@ config = {
        "http://pypi.pub.build.mozilla.org/pub",
    ],
    "cmd_timeout": 6500,
-    "pip_index": False,
    "exes": {
    },
    "title": os.uname()[1].lower().split('.')[0],
--- a/testing/mozharness/configs/awsy/taskcluster_windows_config.py
+++ b/testing/mozharness/configs/awsy/taskcluster_windows_config.py
@ -13,10 +13,6 @@ config = {
        '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/builds/releng_base_android_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_android_64_builds.py
@ -52,8 +52,6 @@ config = {
    'vcs_share_base': '/builds/hg-shared',
    'objdir': 'obj-firefox',
    'multi_locale': True,
-    'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
-    'pip_index': 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
@ -26,10 +26,6 @@ config = {
        "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(),
--- a/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
+++ b/testing/mozharness/configs/firefox_ui_tests/qa_jenkins.py
@ -5,10 +5,6 @@ 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
@ -22,10 +22,6 @@ config = {
        ],
    },

-    # 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
@ -4,11 +4,6 @@
 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
@ -11,11 +11,6 @@ config = {
        '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
@ -3,5 +3,4 @@ config = {
        "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
@ -14,7 +14,6 @@ config = {
        "http://pypi.pvt.build.mozilla.org/pub",
        "http://pypi.pub.build.mozilla.org/pub",
    ],
-    "pip_index": False,

    "buildbot_json_path": "buildprops.json",

--- a/testing/mozharness/configs/marionette/windows_config.py
+++ b/testing/mozharness/configs/marionette/windows_config.py
@ -16,7 +16,6 @@ config = {
        "http://pypi.pvt.build.mozilla.org/pub",
        "http://pypi.pub.build.mozilla.org/pub",
    ],
-    "pip_index": False,

    "buildbot_json_path": "buildprops.json",

--- a/testing/mozharness/configs/marionette/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/marionette/windows_taskcluster_config.py
@ -13,11 +13,6 @@ config = {
        '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',
--- a/testing/mozharness/configs/releng_infra_configs/builders.py
+++ b/testing/mozharness/configs/releng_infra_configs/builders.py
@ -36,7 +36,6 @@ config.update({
        "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
@ -58,6 +58,5 @@ config.update({
        "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
@ -27,7 +27,6 @@ config = {
        "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": [
--- a/testing/mozharness/configs/talos/linux_config.py
+++ b/testing/mozharness/configs/talos/linux_config.py
@ -18,7 +18,6 @@ config = {
        "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",
--- a/testing/mozharness/configs/talos/mac_config.py
+++ b/testing/mozharness/configs/talos/mac_config.py
@ -21,7 +21,6 @@ config = {
        "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",
--- a/testing/mozharness/configs/talos/windows_config.py
+++ b/testing/mozharness/configs/talos/windows_config.py
@ -11,7 +11,6 @@ config = {
    "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",
--- a/testing/mozharness/configs/talos/windows_taskcluster_config.py
+++ b/testing/mozharness/configs/talos/windows_taskcluster_config.py
@ -11,10 +11,6 @@ config = {
    "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'),
--- a/testing/mozharness/configs/talos/windows_vm_config.py
+++ b/testing/mozharness/configs/talos/windows_vm_config.py
@ -11,7 +11,6 @@ config = {
    "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",
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@ -39,7 +39,6 @@ config = {
        "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,
--- a/testing/mozharness/configs/unittests/mac_unittest.py
+++ b/testing/mozharness/configs/unittests/mac_unittest.py
@ -13,7 +13,6 @@ config = {
        "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,
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@ -33,10 +33,6 @@ config = {
    "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",
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@ -27,7 +27,6 @@ config = {
        "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",
--- a/testing/mozharness/configs/web_platform_tests/prod_config.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config.py
@ -21,7 +21,6 @@ config = {
        "http://pypi.pub.build.mozilla.org/pub",
    ],

-    "pip_index": False,

    "buildbot_json_path": "buildprops.json",

--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows.py
@ -30,7 +30,6 @@ config = {
        "http://pypi.pub.build.mozilla.org/pub",
    ],

-    "pip_index": False,

    "buildbot_json_path": "buildprops.json",

--- a/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
+++ b/testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
@ -25,12 +25,6 @@ config = {
        '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",
    ],
--- a/testing/mozharness/configs/web_platform_tests/test_config.py
+++ b/testing/mozharness/configs/web_platform_tests/test_config.py
@ -24,9 +24,4 @@ config = {
        '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
@ -30,10 +30,4 @@ config = {
        'install',
        'run-tests',
    ],
-
-    "find_links": [
-        "http://pypi.pub.build.mozilla.org/pub",
-    ],
-
-    "pip_index": False,
 }