Adds ccache to jenkins slaves.
Creates symlinks in /usr/local/bin to automatically use ccache and also fix some spacing issues. Symlink files depend on ccache to prevent dangling links. Addresses bug 989724. Change-Id: I889ef377efd9a512dfec78c3c417931a764e514c
This commit is contained in:
parent
b6880d3170
commit
781200ac4d
@ -24,6 +24,7 @@ class jenkins_slave($ssh_key) {
|
|||||||
"autoconf",
|
"autoconf",
|
||||||
"automake",
|
"automake",
|
||||||
"build-essential",
|
"build-essential",
|
||||||
|
"ccache",
|
||||||
"cdbs",
|
"cdbs",
|
||||||
"curl",
|
"curl",
|
||||||
"debootstrap",
|
"debootstrap",
|
||||||
@ -108,17 +109,45 @@ class jenkins_slave($ssh_key) {
|
|||||||
cron { "tmpreaper":
|
cron { "tmpreaper":
|
||||||
user => jenkins,
|
user => jenkins,
|
||||||
ensure => 'absent',
|
ensure => 'absent',
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinslogs':
|
file { 'jenkinslogs':
|
||||||
name => '/var/log/jenkins/tmpreaper.log*',
|
name => '/var/log/jenkins/tmpreaper.log*',
|
||||||
ensure => 'absent',
|
ensure => 'absent',
|
||||||
}
|
}
|
||||||
|
|
||||||
file { 'jenkinslogdir':
|
file { 'jenkinslogdir':
|
||||||
name => '/var/log/jenkins',
|
name => '/var/log/jenkins',
|
||||||
ensure => 'absent',
|
ensure => 'absent',
|
||||||
force => true,
|
force => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
file { 'ccachegcc':
|
||||||
|
name => '/usr/local/bin/gcc',
|
||||||
|
ensure => link,
|
||||||
|
target => '/usr/bin/ccache',
|
||||||
|
require => Package['ccache'],
|
||||||
|
}
|
||||||
|
|
||||||
|
file { 'ccacheg++':
|
||||||
|
name => '/usr/local/bin/g++',
|
||||||
|
ensure => link,
|
||||||
|
target => '/usr/bin/ccache',
|
||||||
|
require => Package['ccache'],
|
||||||
|
}
|
||||||
|
|
||||||
|
file { 'ccachecc':
|
||||||
|
name => '/usr/local/bin/cc',
|
||||||
|
ensure => link,
|
||||||
|
target => '/usr/bin/ccache',
|
||||||
|
require => Package['ccache'],
|
||||||
|
}
|
||||||
|
|
||||||
|
file { 'ccachec++':
|
||||||
|
name => '/usr/local/bin/c++',
|
||||||
|
ensure => link,
|
||||||
|
target => '/usr/bin/ccache',
|
||||||
|
require => Package['ccache'],
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user