opendev/system-config
Code Issues Proposed changes

Install nosexcover from packages instead of PIP.

Browse Source 
Change-Id: I1c7b9d7c525f7f96cc11e4d7062de0593c49e0cf
This commit is contained in:
Monty Taylor 2011-09-09 11:13:28 -07:00
parent 7e8f3161c3
commit 7698f7d2fe
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/site.pp
View File

@ -45,6 +45,10 @@ class openstack_jenkins_slave {
include openstack_base include openstack_base
include openstack_ci_admins_users include openstack_ci_admins_users
include jenkins_slave include jenkins_slave
apt::ppa { "ppa:nova-core/trunk":
ensure => present
}
} }
# #
@ -328,9 +332,6 @@ node /^keystone(-\d+)?\.slave\.openstack\.org$/ {
apt::ppa { "ppa:keystone-core/trunk": apt::ppa { "ppa:keystone-core/trunk":
ensure => present ensure => present
} }
apt::ppa { "ppa:nova-core/trunk":
ensure => present
}
apt::ppa { "ppa:swift-core/trunk": apt::ppa { "ppa:swift-core/trunk":
ensure => present ensure => present
} }
@ -359,10 +360,6 @@ node /^keystone(-\d+)?\.slave\.openstack\.org$/ {
node /^quantum(-\d+)?\.slave\.openstack\.org$/ { node /^quantum(-\d+)?\.slave\.openstack\.org$/ {
include openstack_jenkins_slave include openstack_jenkins_slave
apt::ppa { "ppa:nova-core/trunk":
ensure => present
}
$slave_packages = ["python-eventlet", $slave_packages = ["python-eventlet",
"python-paste", "python-paste",
"python-routes", "python-routes",
@ -389,10 +386,6 @@ node /^manuals(-\d+)?\.slave\.openstack\.org$/ {
node /^nova(-\d+)?\.slave\.openstack\.org$/ { node /^nova(-\d+)?\.slave\.openstack\.org$/ {
include openstack_jenkins_slave include openstack_jenkins_slave
apt::ppa { "ppa:nova-core/trunk":
ensure => present
}
apt::builddep { "nova": apt::builddep { "nova":
ensure => present, ensure => present,
require => Apt::Ppa["ppa:nova-core/trunk"] require => Apt::Ppa["ppa:nova-core/trunk"]

27
modules/jenkins_slave/manifests/init.pp
View File

@ -85,18 +85,37 @@ class jenkins_slave {
package { "python-coverage": package { "python-coverage":
ensure => latest, ensure => latest,
require => Package[python-nose] require => [Apt::Ppa["ppa:nova-core/trunk"],
Package[python-nose]]
} }
package { "python-nose": package { "python-nose":
ensure => latest, ensure => latest,
require => Package[python-pip] require => Apt::Ppa["ppa:nova-core/trunk"],
}
package { "python-nosexcover":
ensure => latest,
require => [Apt::Ppa["ppa:nova-core/trunk"],
Package[python-coverage]]
}
package { "coverage":
ensure => absent,
provider => pip,
require => Package[python-pip],
}
package { "nose":
ensure => absent,
provider => pip,
require => Package[python-pip],
} }
package { "nosexcover": package { "nosexcover":
ensure => latest, ensure => absent,
provider => pip, provider => pip,
require => Package[python-coverage] require => Package[python-pip],
} }
} }