opendev/puppet-openstackci
Code Issues Proposed changes

Merge "Move jenkins job builder into jenkins_master"

Browse Source
This commit is contained in:
Jenkins 2015-07-15 22:59:30 +00:00 committed by Gerrit Code Review
commit ed0243fe25
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/jenkins_master.pp
View File

@ -2,6 +2,8 @@
# #
class openstackci::jenkins_master ( class openstackci::jenkins_master (
$serveradmin, $serveradmin,
$jenkins_username = 'jenkins',
$jenkins_password = 'secret',
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$logo = '', # Logo must be present in puppet-jenkins/files $logo = '', # Logo must be present in puppet-jenkins/files
$ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem', $ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem',
@ -12,6 +14,13 @@ class openstackci::jenkins_master (
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$jenkins_ssh_public_key = '', $jenkins_ssh_public_key = '',
$manage_jenkins_jobs = false,
$jenkins_url = 'http://localhost:8080',
$jjb_update_timeout = 1200,
$jjb_git_url = 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
$jjb_git_revision = 'master',
$project_config_repo = '',
$project_config_base = '',
) { ) {
class { '::jenkins::master': class { '::jenkins::master':
@ -86,4 +95,24 @@ class openstackci::jenkins_master (
jenkins::plugin { 'token-macro': jenkins::plugin { 'token-macro':
version => '1.5.1', version => '1.5.1',
} }
if $manage_jenkins_jobs == true {
if ! defined(Class['project_config']) {
class { 'project_config':
url => $project_config_repo,
base => $project_config_base,
}
}
class { '::jenkins::job_builder':
url => $jenkins_url,
username => $jenkins_username,
password => $jenkins_password,
jenkins_jobs_update_timeout => $jjb_update_timeout,
git_revision => $jjb_git_revision,
git_url => $jjb_git_url,
config_dir =>
$::project_config::jenkins_job_builder_config_dir,
require => $::project_config::config_dir,
}
}
} }

2
manifests/zuul_scheduler.pp
View File

@ -46,10 +46,12 @@ class openstackci::zuul_scheduler(
$git_name = 'Zuul', $git_name = 'Zuul',
) { ) {
if ! defined(Class['project_config']) {
class { 'project_config': class { 'project_config':
url => $project_config_repo, url => $project_config_repo,
base => $project_config_base, base => $project_config_base,
} }
}
class { '::zuul': class { '::zuul':
vhost_name => $vhost_name, vhost_name => $vhost_name,