Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Allow running up to 4 concurrent jobs on each jenkins slave

Browse source
This commit is contained in:
Mikolaj Izdebski 2015-08-26 08:42:51 +00:00
parent f3ac63a42f
commit 6a3254ccdc
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/jenkins-master
View file

@ -7,11 +7,14 @@ slaves:
host: jenkins-slave-el6.fedorainfracloud.org host: jenkins-slave-el6.fedorainfracloud.org
description: CentOS 6.6 description: CentOS 6.6
labels: el EL el6 EL6 centos CentOS centos6 CentOS6 labels: el EL el6 EL6 centos CentOS centos6 CentOS6
capacity: 4
- name: EL7 - name: EL7
host: jenkins-slave-el7.fedorainfracloud.org host: jenkins-slave-el7.fedorainfracloud.org
description: Red Hat Enterprise Linux Server 7.1 description: Red Hat Enterprise Linux Server 7.1
labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7 labels: el EL el7 EL7 rhel RHEL rhel7 RHEL7
capacity: 4
- name: F22 - name: F22
host: jenkins-slave-f22.fedorainfracloud.org host: jenkins-slave-f22.fedorainfracloud.org
description: Fedora 22 description: Fedora 22
labels: fedora Fedora fedora22 Fedora22 labels: fedora Fedora fedora22 Fedora22
capacity: 4

2
roles/jenkins/master/templates/slave-config.xml.j2
View file

@ -3,7 +3,7 @@
<name>{{ item.name }}</name> <name>{{ item.name }}</name>
<description>{{ item.description }}</description> <description>{{ item.description }}</description>
<remoteFS>/srv/jenkins</remoteFS> <remoteFS>/srv/jenkins</remoteFS>
<numExecutors>1</numExecutors> <numExecutors>{{ item.capacity }}</numExecutors>
<mode>NORMAL</mode> <mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/> <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.plugins.sshslaves.SSHLauncher" plugin="ssh-slaves@1.9"> <launcher class="hudson.plugins.sshslaves.SSHLauncher" plugin="ssh-slaves@1.9">