opendev/system-config
Code Issues Proposed changes

Install newer requests package for twine

Browse Source 
The twine upload client for PyPI needs a newer version of the Python
requests library than is provided on Ubuntu 12.04, so get it via pip
instead of from distribution packages.

Change-Id: Ibc9a7e1e496a3aa573902c4d1aad11d20187d260
This commit is contained in:
Jeremy Stanley 2014-06-04 22:21:23 +00:00
parent b5c62380f8
commit 2f038884b6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/openstack_project/manifests/thick_slave.pp
View File

@ -41,7 +41,6 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::python_libvirt_package, $::openstack_project::jenkins_params::python_libvirt_package,
$::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals $::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals
$::openstack_project::jenkins_params::python_magic_package, # for pushing files to swift $::openstack_project::jenkins_params::python_magic_package, # for pushing files to swift
$::openstack_project::jenkins_params::python_requests_package, # for pushing files to swift
$::openstack_project::jenkins_params::python_zmq_package, # zeromq unittests (not pip installable) $::openstack_project::jenkins_params::python_zmq_package, # zeromq unittests (not pip installable)
$::openstack_project::jenkins_params::rubygems_package, $::openstack_project::jenkins_params::rubygems_package,
$::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing $::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing
@ -57,6 +56,18 @@ class openstack_project::thick_slave(
ensure => present, ensure => present,
} }
include pip
# for pushing files to swift and uploading to pypi with twine
package { 'requests':
ensure => latest,
provider => pip,
}
# transitional for upgrading to the pip version
package { $::openstack_project::jenkins_params::python_requests_package:
ensure => absent,
before => Package['requests'],
}
if ($::lsbdistcodename == 'trusty') { if ($::lsbdistcodename == 'trusty') {
file { '/etc/profile.d/rubygems.sh': file { '/etc/profile.d/rubygems.sh':
ensure => absent, ensure => absent,