opendev/system-config
Code Issues Proposed changes

Merge "Make 'jenkins-job-builder' repo configurable"

Browse Source
This commit is contained in:
Jenkins 2014-07-31 18:44:53 +00:00 committed by Gerrit Code Review
commit 6197962c8b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/jenkins/manifests/job_builder.pp
View File

@ -4,6 +4,8 @@ class jenkins::job_builder (
$url = '', $url = '',
$username = '', $username = '',
$password = '', $password = '',
$git_revision = 'master',
$git_url = 'https://git.openstack.org/openstack-infra/jenkins-job-builder'
) { ) {
# A lot of things need yaml, be conservative requiring this package to avoid # A lot of things need yaml, be conservative requiring this package to avoid
@ -23,8 +25,8 @@ class jenkins::job_builder (
vcsrepo { '/opt/jenkins_job_builder': vcsrepo { '/opt/jenkins_job_builder':
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => $git_revision,
source => 'https://git.openstack.org/openstack-infra/jenkins-job-builder', source => $git_url,
} }
exec { 'install_jenkins_job_builder': exec { 'install_jenkins_job_builder':

4
modules/openstack_project/manifests/jenkins.pp
View File

@ -4,6 +4,8 @@ class openstack_project::jenkins (
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$jenkins_jobs_password = '', $jenkins_jobs_password = '',
$jenkins_jobs_username = 'gerrig', # This is not a typo, well it isn't anymore. $jenkins_jobs_username = 'gerrig', # This is not a typo, well it isn't anymore.
$jenkins_git_url = 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
$jenkins_git_revision = 'master',
$manage_jenkins_jobs = true, $manage_jenkins_jobs = true,
$ssl_cert_file = '', $ssl_cert_file = '',
$ssl_key_file = '', $ssl_key_file = '',
@ -118,6 +120,8 @@ class openstack_project::jenkins (
url => "https://${vhost_name}/", url => "https://${vhost_name}/",
username => $jenkins_jobs_username, username => $jenkins_jobs_username,
password => $jenkins_jobs_password, password => $jenkins_jobs_password,
git_revision => $jenkins_git_revision,
git_url => $jenkins_git_url,
} }
file { '/etc/jenkins_jobs/config': file { '/etc/jenkins_jobs/config':