Don't install ccache for RPM distros
ccache requires EPEL on centos, which we're trying to remove because upstream RDO doesn't use these packages and thus it can lead to incorrect testing. Change-Id: I2c5bdef4d0fcde1e49c227df3cd694536e3e7443
This commit is contained in:
parent
a44a41c4a0
commit
23777fe248
@ -12,7 +12,6 @@ class jenkins::params {
|
||||
} else {
|
||||
$jdk_package = 'java-1.7.0-openjdk-devel'
|
||||
}
|
||||
$ccache_package = 'ccache'
|
||||
$python_netaddr_package = 'python-netaddr'
|
||||
# FIXME: No Maven packages on RHEL
|
||||
#$maven_package = 'maven'
|
||||
@ -32,6 +31,9 @@ class jenkins::params {
|
||||
$cgconfig_require = Package['cgroups']
|
||||
$cgred_require = Package['cgroups']
|
||||
}
|
||||
# Don't use ccache; not available on centos without EPEL and we
|
||||
# have wheel caches on fedora.
|
||||
$ccache_package = undef
|
||||
}
|
||||
'Debian': {
|
||||
# common packages
|
||||
|
@ -27,7 +27,6 @@ class jenkins::slave(
|
||||
# Packages that all jenkins slaves need
|
||||
$packages = [
|
||||
$::jenkins::params::jdk_package, # jdk for building java jobs
|
||||
$::jenkins::params::ccache_package,
|
||||
$::jenkins::params::python_netaddr_package, # Needed for devstack address_in_net()
|
||||
]
|
||||
|
||||
@ -106,6 +105,12 @@ class jenkins::slave(
|
||||
require => Class[pip],
|
||||
}
|
||||
|
||||
if ($::jenkins::params::ccache_package) {
|
||||
|
||||
package { $::jenkins::params::ccache_package:
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
file { '/usr/local/bin/gcc':
|
||||
ensure => link,
|
||||
target => '/usr/bin/ccache',
|
||||
@ -154,6 +159,8 @@ class jenkins::slave(
|
||||
require => Package['ccache'],
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
file { '/usr/local/jenkins':
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
|
Loading…
Reference in New Issue
Block a user