Update plugins and use files from project_config repo
* Update plugins to match production jenkins * Update to use files from project_config repo Change-Id: I3756594fb38cd789c2818afa038c033d6413a027
This commit is contained in:
parent
0e71561089
commit
4647cf9f33
@ -201,6 +201,7 @@ node 'jenkins-dev.openstack.org' {
|
||||
puppetmaster_server => 'puppetmaster.openstack.org',
|
||||
}
|
||||
class { 'openstack_project::jenkins_dev':
|
||||
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
|
||||
jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'),
|
||||
mysql_password => hiera('nodepool_dev_mysql_password'),
|
||||
mysql_root_password => hiera('nodepool_dev_mysql_root_password'),
|
||||
|
@ -1,6 +1,7 @@
|
||||
# == Class: openstack_project::jenkins_dev
|
||||
#
|
||||
class openstack_project::jenkins_dev (
|
||||
$project_config_repo = '',
|
||||
$jenkins_ssh_private_key = '',
|
||||
$mysql_root_password,
|
||||
$mysql_password,
|
||||
@ -64,6 +65,9 @@ class openstack_project::jenkins_dev (
|
||||
# jenkins::plugin { 'scp':
|
||||
# version => '1.9',
|
||||
# }
|
||||
jenkins::plugin { 'jobConfigHistory':
|
||||
version => '1.13',
|
||||
}
|
||||
jenkins::plugin { 'monitoring':
|
||||
version => '1.40.0',
|
||||
}
|
||||
@ -76,6 +80,9 @@ class openstack_project::jenkins_dev (
|
||||
jenkins::plugin { 'openid':
|
||||
version => '1.5',
|
||||
}
|
||||
jenkins::plugin { 'postbuildscript':
|
||||
version => '0.16',
|
||||
}
|
||||
jenkins::plugin { 'publish-over-ftp':
|
||||
version => '1.7',
|
||||
}
|
||||
@ -118,8 +125,17 @@ class openstack_project::jenkins_dev (
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
require => File['/etc/nodepool'],
|
||||
source => 'puppet:///modules/openstack_project/nodepool/scripts',
|
||||
require => [
|
||||
File['/etc/nodepool'],
|
||||
Class['project_config'],
|
||||
],
|
||||
source => $::project_config::nodepool_scripts_dir,
|
||||
}
|
||||
|
||||
if ! defined(Class['project_config']) {
|
||||
class { 'project_config':
|
||||
url => $project_config_repo,
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user