merge default -> production production
authorAki Sasaki <asasaki@mozilla.com>
Wed, 23 May 2018 10:21:20 -0700
branchproduction
changeset 6908 9b341df995cf43e0426dd20973c7a15f70b52065
parent 6907 f7ecdce21210fe795071bf04bd5900c349f8e4be (current diff)
parent 6870 15e53d56fab7996b3bb64dd807b8778581b595c6 (diff)
child 6910 cb7e2f8aa95b94da3702c04271b96c2d1242ecbe
push id2778
push userasasaki@mozilla.com
push dateTue, 29 May 2018 19:35:39 +0000
merge default -> production
--- a/modules/balrog_scriptworker/files/requirements-27.txt
+++ b/modules/balrog_scriptworker/files/requirements-27.txt
@@ -1,23 +1,29 @@
 # install six before cryptography
-six==1.10.0
-appdirs==1.4.3
-arrow==0.10.0
-asn1crypto==0.22.0
-balrogclient==0.0.4
+six==1.11.0
+arrow==0.12.1
+asn1crypto==0.24.0
+backports.functools-lru-cache==1.5
+backports.lzma==0.0.10
 balrogscript==3.1.0
-cffi==1.10.0
+certifi==2018.1.18
+cffi==1.11.4
+chardet==3.0.4
 click==6.7
-construct==2.8.11
-cryptography==1.8.1
+construct==2.9.27
+cryptography==2.1.4
 enum34==1.1.6
 functools32==3.2.3-2
-idna==2.5
-ipaddress==1.0.18
+idna==2.6
+incremental==17.5.0
+ipaddress==1.0.19
+jinja2==2.10
 jsonschema==2.6.0
-mar==2.0
-packaging==16.8
-pyasn1==0.2.3
-pycparser==2.17
-pyparsing==2.2.0
-python-dateutil==2.6.0
-requests==2.13.0
+mar==2.2.3
+markupsafe==1.0
+pyasn1==0.4.2
+pycparser==2.18
+python-dateutil==2.6.1
+requests==2.18.4
+toml==0.9.4
+towncrier==18.5.0
+urllib3==1.22
--- a/modules/balrog_scriptworker/files/requirements-3.txt
+++ b/modules/balrog_scriptworker/files/requirements-3.txt
@@ -1,26 +1,34 @@
 PyYAML==3.12
-aiohttp==2.3.9
+aiohttp==3.2.1
 arrow==0.12.1
-async_timeout==1.4.0
-certifi==2018.1.18
+async_timeout==3.0.0
+attrs==18.1.0
+certifi==2018.4.16
 chardet==3.0.4
+click==6.7
 defusedxml==0.5.0
-dictdiffer==0.7.0
+dephash==1.0.0
+dictdiffer==0.7.1
 frozendict==1.2
+hashin==0.13.0
 idna==2.6
+idna_ssl==1.0.1
 json-e==2.5.0
 jsonschema==2.6.0
 mohawk==0.3.4
-multidict==4.0.0
-pexpect==4.3.1
+multidict==4.3.1
+packaging==17.1
+pexpect==4.5.0
+pip-api==0.0.1
 ptyprocess==0.5.2
-python-dateutil==2.6.1
-python-gnupg==0.4.1
+pyparsing==2.2.0
+python-dateutil==2.7.3
+python-gnupg==0.4.2
 requests==2.18.4
-scriptworker==10.6.2
-six==1.10.0
+scriptworker==11.0.0
+six==1.11.0
 slugid==1.0.7
-taskcluster==2.1.3
+taskcluster==3.0.1
 urllib3==1.22
-virtualenv==15.1.0
-yarl==1.0.0
+virtualenv==15.2.0
+yarl==1.2.4
--- a/modules/balrog_scriptworker/manifests/init.pp
+++ b/modules/balrog_scriptworker/manifests/init.pp
@@ -8,16 +8,17 @@ class balrog_scriptworker {
     include packages::mozilla::python3
     include packages::mozilla::python27
     include packages::mozilla::py27_mercurial
     include users::builder
     include tweaks::swap_on_instance_storage
     include packages::gcc
     include packages::make
     include packages::libffi
+    include packages::xz_devel
     include tweaks::scriptworkerlogrotate
 
     $env_config = $balrog_scriptworker::settings::env_config[$balrogworker_env]
 
     # If the Python installation changes, we need to rebuild the virtualenv
     # from scratch. Before doing that, we need to stop the running instance.
     exec {
         "stop-for-rebuild-${module_name}":
new file mode 100644
--- /dev/null
+++ b/modules/packages/manifests/xz_devel.pp
@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+class packages::xz_devel {
+    case $::operatingsystem {
+        CentOS: {
+            package {
+                ['xz-devel', 'xz-libs']:
+                    ensure => latest;
+            }
+        }
+
+        default: {
+            fail("Cannot install on ${::operatingsystem}")
+        }
+    }
+}