Break dependency on jenkins::slave

Because we no longer use jenkins, we can break the dependency on
jenkins::slave. This will be another step of removing jenkins from our
zuul workers.

Change-Id: I89e9ca48d88d3277d0cbefce2865bcaed993a5dd
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-04-07 15:37:23 -04:00
parent 2a63928351
commit 5e62f09a21
2 changed files with 32 additions and 5 deletions

View File

@ -42,12 +42,39 @@ class openstack_project::single_use_slave (
],
iptables_public_tcp_ports => [19885],
}
class { 'jenkins::slave':
ssh_key => $ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
include ::haveged
include ::pip
class { '::jenkins::jenkinsuser':
ssh_key => $ssh_key,
gitfullname => $jenkins_gitfullname,
gitemail => $jenkins_gitemail,
}
# NOTE(pabelanger): We need to create this directory here, since slave.pp also
# creates it. Moving forward, this will be moved into DIB.
file { '/usr/local/jenkins':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
}
package { 'tox':
ensure => 'latest',
provider => openstack_pip,
require => Class[pip],
}
# TODO(fungi): switch jobs to use /usr/git-review-env/bin/git-review
package { 'git-review':
ensure => '1.25.0',
provider => openstack_pip,
require => Class[pip],
}
class { 'openstack_project::slave_common':
sudo => $sudo,
project_config_repo => $project_config_repo,

View File

@ -49,7 +49,7 @@ class openstack_project::slave_common(
group => 'jenkins',
mode => '0644',
source => 'puppet:///modules/openstack_project/pydistutils.cfg',
require => Class['jenkins::slave'],
require => Class['jenkins::jenkinsuser'],
}
if ($sudo == true) {