opendev/system-config
Code Issues Proposed changes

Add slave-common to long lived slaves

Browse Source 
We need the jenkins slave scripts on these too.

Change-Id: I25ef6bf730cba1e0aee0b027d1517dd4636c8b47
This commit is contained in:
Monty Taylor 2015-06-29 10:20:39 -04:00 committed by Jeremy Stanley
parent edf68921fa
commit ba2b36bad4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/proposal_slave.pp
View File

@ -11,6 +11,7 @@ class openstack_project::proposal_slave (
$transifex_username = 'openstackci', $transifex_username = 'openstackci',
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) { ) {
include zanata::client include zanata::client
@ -18,6 +19,7 @@ class openstack_project::proposal_slave (
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,
jenkins_gitfullname => $jenkins_gitfullname, jenkins_gitfullname => $jenkins_gitfullname,
jenkins_gitemail => $jenkins_gitemail, jenkins_gitemail => $jenkins_gitemail,
project_config_repo => $project_config_repo,
} }
package { ['transifex-client', 'Babel']: package { ['transifex-client', 'Babel']:

2
modules/openstack_project/manifests/pypi_slave.pp
View File

@ -27,11 +27,13 @@ class openstack_project::pypi_slave (
$puppet_forge_password, $puppet_forge_password,
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
ssh_key => $jenkins_ssh_public_key, ssh_key => $jenkins_ssh_public_key,
jenkins_gitfullname => $jenkins_gitfullname, jenkins_gitfullname => $jenkins_gitfullname,
jenkins_gitemail => $jenkins_gitemail, jenkins_gitemail => $jenkins_gitemail,
project_config_repo => $project_config_repo,
} }
include pip include pip

5
modules/openstack_project/manifests/slave.pp
View File

@ -7,6 +7,7 @@ class openstack_project::slave (
$sysadmins = [], $sysadmins = [],
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$project_config_repo = 'https://git.openstack.org/openstack-infra/project-config',
) { ) {
include openstack_project include openstack_project
@ -34,7 +35,9 @@ class openstack_project::slave (
limit_value => '256' limit_value => '256'
} }
include openstack_project::slave_common class { 'openstack_project::slave_common':
project_config_repo => $project_config_repo,
}
if (! $thin) { if (! $thin) {
include openstack_project::thick_slave include openstack_project::thick_slave