Bug 1304176 - Remove PIP_TRUSTED_HOST and trust-host pip.conf option; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Tue, 20 Sep 2016 14:02:08 -0700
changeset 417182 fcc14f64db50a6cd36db871b0d6bc0045b8bcd62
parent 417181 70b233393273cbad194bcf0defe47206a08b96c3
child 417183 93562be5a75bc8d0994bcc068dfa2f3584c4c636
push id30356
push userbmo:gps@mozilla.com
push dateFri, 23 Sep 2016 19:11:51 +0000
reviewersted
bugs1304176
milestone52.0a1
Bug 1304176 - Remove PIP_TRUSTED_HOST and trust-host pip.conf option; r?ted The Python code is now intelligent enough to add this flag on the command line if supported. Eliminate the copy pasta and help prevent cargo culting. MozReview-Commit-ID: H4rbjbbgtRd
testing/docker/android-gradle-build/dot-config/pip/pip.conf
testing/docker/desktop-build/dot-config/pip/pip.conf
testing/docker/desktop-test/dot-files/config/pip/pip.conf
testing/docker/desktop1604-test/dot-files/config/pip/pip.conf
testing/docker/tester/dot-config/pip/pip.conf
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/mediatests/jenkins_config.py
--- a/testing/docker/android-gradle-build/dot-config/pip/pip.conf
+++ b/testing/docker/android-gradle-build/dot-config/pip/pip.conf
@@ -1,4 +1,2 @@
 [global]
 disable-pip-version-check = true
-trusted-host = pypi.pub.build.mozilla.org
-
--- a/testing/docker/desktop-build/dot-config/pip/pip.conf
+++ b/testing/docker/desktop-build/dot-config/pip/pip.conf
@@ -1,4 +1,2 @@
 [global]
 disable-pip-version-check = true
-trusted-host = pypi.pub.build.mozilla.org
-
--- a/testing/docker/desktop-test/dot-files/config/pip/pip.conf
+++ b/testing/docker/desktop-test/dot-files/config/pip/pip.conf
@@ -1,4 +1,2 @@
 [global]
 disable-pip-version-check = true
-trusted-host = pypi.pub.build.mozilla.org
-
--- a/testing/docker/desktop1604-test/dot-files/config/pip/pip.conf
+++ b/testing/docker/desktop1604-test/dot-files/config/pip/pip.conf
@@ -1,4 +1,2 @@
 [global]
 disable-pip-version-check = true
-trusted-host = pypi.pub.build.mozilla.org
-
--- a/testing/docker/tester/dot-config/pip/pip.conf
+++ b/testing/docker/tester/dot-config/pip/pip.conf
@@ -1,4 +1,2 @@
 [global]
 disable-pip-version-check = true
-trusted-host = pypi.pub.build.mozilla.org
-
--- a/testing/mozharness/configs/developer_config.py
+++ b/testing/mozharness/configs/developer_config.py
@@ -20,19 +20,16 @@ config = {
     "replace_urls": [
         ("http://pvtbuilds.pvt.build", "https://pvtbuilds"),
     ],
 
     # General local variable overwrite
     "exes": {
         "gittool.py": os.path.join(LOCAL_WORKDIR, "gittool.py"),
     },
-    "env": {
-        "PIP_TRUSTED_HOST": "pypi.pub.build.mozilla.org",
-    },
 
     # 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
@@ -1,19 +1,15 @@
 # Default configuration as used by Mozmill CI (Jenkins)
 
 
 config = {
     # Tests run in mozmill-ci do not use RelEng infra
     'developer_mode': True,
 
-    'env': {
-        'PIP_TRUSTED_HOST': 'pypi.pub.build.mozilla.org',
-    },
-
     # PIP
     'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
     'pip_index': False,
 
     # mozcrash support
     'download_minidump_stackwalk': True,
     'download_symbols': 'ondemand',
     'download_tooltool': True,
--- a/testing/mozharness/configs/firefox_ui_tests/releng_release.py
+++ b/testing/mozharness/configs/firefox_ui_tests/releng_release.py
@@ -8,20 +8,16 @@ import mozharness
 
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
     'external_tools',
 )
 
 
 config = {
-    'env': {
-        'PIP_TRUSTED_HOST': 'pypi.pub.build.mozilla.org',
-    },
-
     # General local variable overwrite
     'exes': {
         'gittool.py': [
             # Bug 1227079 - Python executable eeded to get it executed on Windows
             sys.executable,
             os.path.join(external_tools_path, 'gittool.py')
         ],
     },
--- a/testing/mozharness/configs/mediatests/jenkins_config.py
+++ b/testing/mozharness/configs/mediatests/jenkins_config.py
@@ -8,20 +8,16 @@ import mozharness
 
 
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
     'external_tools',
 )
 
 config = {
-    'env': {
-        'PIP_TRUSTED_HOST': 'pypi.pub.build.mozilla.org',
-    },
-
     # PIP
     'find_links': ['http://pypi.pub.build.mozilla.org/pub'],
     'pip_index': False,
 
     # mozcrash support
     'download_minidump_stackwalk': True,
     'download_symbols': 'ondemand',
     'download_tooltool': True,