opendev/system-config
Code Issues Proposed changes

Add Python 3.4 and PyPy to Ubuntu Trusty slaves

Browse Source 
When building Ubuntu 14.04 LTS workers, install the python3-all-dev,
python3.4 and pypy packages so that they can be used by future jobs.
This is in preparation to deprecate the special "precise-py3k"
nodepool node types we maintain for py33 and pypy tox jobs.

Change-Id: If6543e75eda5822d645164636720f6c597e07729
This commit is contained in:
Jeremy Stanley 2014-09-03 17:18:52 +00:00
parent c95130fd03
commit 03325b920c
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -41,6 +41,10 @@ class openstack_project::jenkins_params {
$mongodb_package = 'mongodb-server' $mongodb_package = 'mongodb-server'
$pandoc_package = 'pandoc' $pandoc_package = 'pandoc'
$pkgconfig_package = 'pkgconfig' $pkgconfig_package = 'pkgconfig'
# FIXME: no PyPy headers on RHEL
# FIXME: no PyPy on RHEL
# FIXME: no Python 3 headers on RHEL
# FIXME: no Python 3 on RHEL
$python_libvirt_package = 'libvirt-python' $python_libvirt_package = 'libvirt-python'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_magic_package = 'python-magic' $python_magic_package = 'python-magic'
@ -121,6 +125,10 @@ class openstack_project::jenkins_params {
$mongodb_package = 'mongodb' $mongodb_package = 'mongodb'
$pandoc_package = 'pandoc' $pandoc_package = 'pandoc'
$pkgconfig_package = 'pkg-config' $pkgconfig_package = 'pkg-config'
$pypy_dev_package = 'pypy-dev'
$pypy_package = 'pypy'
$python3_dev_package = 'python3-all-dev'
$python3_package = 'python3.4'
$python_libvirt_package = 'python-libvirt' $python_libvirt_package = 'python-libvirt'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_magic_package = 'python-magic' $python_magic_package = 'python-magic'

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

@ -77,10 +77,28 @@ class openstack_project::thick_slave(
} }
if ($::lsbdistcodename == 'trusty') { if ($::lsbdistcodename == 'trusty') {
# Only install PyPy and Python 3.4 packages on Ubuntu 14.04 LTS (Trusty)
package { $::openstack_project::jenkins_params::pypy_dev_package:
ensure => present,
}
package { $::openstack_project::jenkins_params::pypy_package:
ensure => present,
}
package { $::openstack_project::jenkins_params::python3_dev_package:
ensure => present,
}
package { $::openstack_project::jenkins_params::python3_package:
ensure => present,
}
# Don't install the Ruby Gems profile script on Trusty
file { '/etc/profile.d/rubygems.sh': file { '/etc/profile.d/rubygems.sh':
ensure => absent, ensure => absent,
} }
} else { } else {
file { '/etc/profile.d/rubygems.sh': file { '/etc/profile.d/rubygems.sh':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
@ -88,6 +106,7 @@ class openstack_project::thick_slave(
mode => '0644', mode => '0644',
source => 'puppet:///modules/openstack_project/rubygems.sh', source => 'puppet:///modules/openstack_project/rubygems.sh',
} }
} }
package { 'rake': package { 'rake':