Merge from default production
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 25 May 2018 15:30:40 -0400
branchproduction
changeset 6917 fa6d2bfd18b45a3bee15a5294670c6476d0774e5
parent 6914 9cbc3044fc1560178f547fe374d960e1e46b35a9 (current diff)
parent 6916 e64c2beb84de02bff005367106b24922e5223b3c (diff)
child 6918 a70bf013742b05a230dbc2f7cd2ac8d0badb1549
push id2778
push userasasaki@mozilla.com
push dateTue, 29 May 2018 19:35:39 +0000
Merge from default
--- a/modules/beetmover_scriptworker/files/requirements.txt
+++ b/modules/beetmover_scriptworker/files/requirements.txt
@@ -1,16 +1,16 @@
 Jinja2==2.10
 MarkupSafe==1.0
 PyYAML==3.12
 aiohttp==3.2.1
 arrow==0.12.1
 async_timeout==3.0.0
 attrs==18.1.0
-beetmoverscript==7.2.2
+beetmoverscript==7.2.3
 boto3==1.7.22
 botocore==1.10.22
 certifi==2018.4.16
 chardet==3.0.4
 click==6.7
 defusedxml==0.5.0
 dictdiffer==0.7.1
 docutils==0.14
--- a/modules/python/manifests/virtualenv/package.pp
+++ b/modules/python/manifests/virtualenv/package.pp
@@ -14,21 +14,29 @@ define python::virtualenv::package($user
     $virtualenv   = regsubst($title, '\|\|.*$', '')
     $pkg          = regsubst($title, '^.*\|\|', '')
 
     $pip_check_py = $python::pip_check_py::file
     # give a --find-links option for each data server, so pip will search them all.
     $data_server  = $config::data_server
     $data_servers = $config::data_servers
 
-    $pip_options  = inline_template("--no-deps --no-index <%
+    $pip_options = $::operatingsystem ? {
+        # No trusted host on windows, because those are ancient buildbot machines whose pip doesn't support it.
+        windows => inline_template("--no-deps --no-index <%
+servers = [ @data_server ] + Array(@data_servers)
+servers.uniq.each do |mirror_server| -%> --find-links=http://<%= mirror_server %>/python/packages <%
+end
+-%>"),
+        default => inline_template("--no-deps --no-index <%
 servers = [ @data_server ] + Array(@data_servers)
 servers.uniq.each do |mirror_server| -%> --trusted-host <%= mirror_server %> --find-links=http://<%= mirror_server %>/python/packages <%
 end
 -%>")
+    }
     if ($user == 'root') {
         $home_dir = $::users::root::home
     } else {
         $home_dir = $::operatingsystem ? {
             Darwin  => "/Users/${user}",
             default => "/home/${user}"
         }
     }