opendev/system-config
Code Issues Proposed changes

Change jenkins_slave module deps

Browse Source 
Don't depend on gpg key and other things to build the rest of the slave, just
depend on the directory used to build the thing

Change-Id: Ifb26ce2ca0bd3e284a173af9a1509ded1aab6941
This commit is contained in:
Andrew Hutchings 2012-03-28 20:42:04 +01:00
parent 7e0de586e7
commit a916a7116d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,12 +7,12 @@ class jenkins_slave($ssh_key) {
slavecirepo { "openstack-ci": slavecirepo { "openstack-ci":
ensure => present, ensure => present,
require => [ Package[git], Jenkinsuser[jenkins] ], require => [ Package[git], File[jenkinshome] ],
} }
devstackrepo { "devstack": devstackrepo { "devstack":
ensure => present, ensure => present,
require => [ Package[git], Jenkinsuser[jenkins] ], require => [ Package[git], File[jenkinshome] ],
} }
apt::ppa { "ppa:openstack-ci/build-depends": apt::ppa { "ppa:openstack-ci/build-depends":
@ -91,7 +91,7 @@ class jenkins_slave($ssh_key) {
user => jenkins, user => jenkins,
minute => "*/15", minute => "*/15",
command => "cd /home/jenkins/openstack-ci && /usr/bin/git pull -q origin master", command => "cd /home/jenkins/openstack-ci && /usr/bin/git pull -q origin master",
require => [ Jenkinsuser[jenkins] ], require => [ File[jenkinshome] ],
} }
file { 'profilerubygems': file { 'profilerubygems':
@ -110,7 +110,7 @@ class jenkins_slave($ssh_key) {
minute => '0', minute => '0',
hour => '1', hour => '1',
command => "/usr/sbin/tmpreaper --runtime 1200 --delay 600 1d /tmp 2>&1 | grep -v 'failed: Permission denied'", command => "/usr/sbin/tmpreaper --runtime 1200 --delay 600 1d /tmp 2>&1 | grep -v 'failed: Permission denied'",
require => [ Package[tmpreaper], Jenkinsuser[jenkins] ], require => [ Package[tmpreaper], File[jenkinshome] ],
} }
file { 'tmpreaper-cron.daily': file { 'tmpreaper-cron.daily':

2
modules/jenkins_slave/manifests/jenkinsuser.pp
View File

@ -11,6 +11,7 @@ define jenkinsuser($ensure = present, $ssh_key) {
gid => 'jenkins', gid => 'jenkins',
shell => '/bin/bash', shell => '/bin/bash',
membership => 'minimum', membership => 'minimum',
require => Group['jenkins']
} }
file { 'jenkinshome': file { 'jenkinshome':
@ -19,6 +20,7 @@ define jenkinsuser($ensure = present, $ssh_key) {
group => 'jenkins', group => 'jenkins',
mode => 644, mode => 644,
ensure => 'directory', ensure => 'directory',
require => User['jenkins']
} }