Add slave-common to long lived slaves
We need the jenkins slave scripts on these too. Change-Id: I25ef6bf730cba1e0aee0b027d1517dd4636c8b47
This commit is contained in:
parent
edf68921fa
commit
ba2b36bad4
@ -11,6 +11,7 @@ class openstack_project::proposal_slave (
|
||||
$transifex_username = 'openstackci',
|
||||
$jenkins_gitfullname = 'OpenStack Jenkins',
|
||||
$jenkins_gitemail = 'jenkins@openstack.org',
|
||||
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
|
||||
) {
|
||||
include zanata::client
|
||||
|
||||
@ -18,6 +19,7 @@ class openstack_project::proposal_slave (
|
||||
ssh_key => $jenkins_ssh_public_key,
|
||||
jenkins_gitfullname => $jenkins_gitfullname,
|
||||
jenkins_gitemail => $jenkins_gitemail,
|
||||
project_config_repo => $project_config_repo,
|
||||
}
|
||||
|
||||
package { ['transifex-client', 'Babel']:
|
||||
|
@ -27,11 +27,13 @@ class openstack_project::pypi_slave (
|
||||
$puppet_forge_password,
|
||||
$jenkins_gitfullname = 'OpenStack Jenkins',
|
||||
$jenkins_gitemail = 'jenkins@openstack.org',
|
||||
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
|
||||
) {
|
||||
class { 'openstack_project::slave':
|
||||
ssh_key => $jenkins_ssh_public_key,
|
||||
jenkins_gitfullname => $jenkins_gitfullname,
|
||||
jenkins_gitemail => $jenkins_gitemail,
|
||||
project_config_repo => $project_config_repo,
|
||||
}
|
||||
|
||||
include pip
|
||||
|
@ -7,6 +7,7 @@ class openstack_project::slave (
|
||||
$sysadmins = [],
|
||||
$jenkins_gitfullname = 'OpenStack Jenkins',
|
||||
$jenkins_gitemail = 'jenkins@openstack.org',
|
||||
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
|
||||
) {
|
||||
|
||||
include openstack_project
|
||||
@ -34,7 +35,9 @@ class openstack_project::slave (
|
||||
limit_value => '256'
|
||||
}
|
||||
|
||||
include openstack_project::slave_common
|
||||
class { 'openstack_project::slave_common':
|
||||
project_config_repo => $project_config_repo,
|
||||
}
|
||||
|
||||
if (! $thin) {
|
||||
include openstack_project::thick_slave
|
||||
|
Loading…
x
Reference in New Issue
Block a user