Add mvn- and sbt-agents back to the Jenkins config
In change 207914 the mvn- and sbt-slaves were removed from the Jenkins
config.xml file along with obsolete slaves. Thus, with the current
config it would not be possible to build projectss requiring one of the
slaves to build.
This change adds the missing slaves back to the configuration.
Change-Id: I9f6d66a59be52f2699be89185ae659dc69594467
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 434d6a8..709af24 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -78,6 +78,90 @@
<removeVolumes>false</removeVolumes>
<pullStrategy>PULL_NEVER</pullStrategy>
</com.nirima.jenkins.plugins.docker.DockerTemplate>
+ <com.nirima.jenkins.plugins.docker.DockerTemplate>
+ <configVersion>2</configVersion>
+ <labelString>mvn</labelString>
+ <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
+ <sshConnector plugin="ssh-slaves@1.11">
+ <port>22</port>
+ <jvmOptions></jvmOptions>
+ <javaPath></javaPath>
+ <maxNumRetries>0</maxNumRetries>
+ <retryWaitTime>0</retryWaitTime>
+ </sshConnector>
+ </launcher>
+ <remoteFsMapping></remoteFsMapping>
+ <remoteFs>/home/jenkins</remoteFs>
+ <instanceCap>5</instanceCap>
+ <mode>EXCLUSIVE</mode>
+ <retentionStrategy class="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">
+ <idleMinutes>10</idleMinutes>
+ <idleMinutes defined-in="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">10</idleMinutes>
+ </retentionStrategy>
+ <numExecutors>1</numExecutors>
+ <dockerTemplateBase>
+ <image>gerritforge/gerrit-ci-slave-mvn</image>
+ <dockerCommand></dockerCommand>
+ <lxcConfString>mvn</lxcConfString>
+ <hostname></hostname>
+ <dnsHosts/>
+ <volumes/>
+ <volumesFrom2/>
+ <environment/>
+ <bindPorts></bindPorts>
+ <bindAllPorts>false</bindAllPorts>
+ <privileged>true</privileged>
+ <tty>false</tty>
+ <extraHosts class="java.util.Collections$UnmodifiableRandomAccessList" resolves-to="java.util.Collections$UnmodifiableList">
+ <c class="list"/>
+ <list reference="../c"/>
+ </extraHosts>
+ </dockerTemplateBase>
+ <removeVolumes>false</removeVolumes>
+ <pullStrategy>PULL_LATEST</pullStrategy>
+ </com.nirima.jenkins.plugins.docker.DockerTemplate>
+ <com.nirima.jenkins.plugins.docker.DockerTemplate>
+ <configVersion>2</configVersion>
+ <labelString>sbt</labelString>
+ <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
+ <sshConnector plugin="ssh-slaves@1.11">
+ <port>22</port>
+ <jvmOptions></jvmOptions>
+ <javaPath></javaPath>
+ <maxNumRetries>0</maxNumRetries>
+ <retryWaitTime>0</retryWaitTime>
+ </sshConnector>
+ </launcher>
+ <remoteFsMapping></remoteFsMapping>
+ <remoteFs>/home/jenkins</remoteFs>
+ <instanceCap>5</instanceCap>
+ <mode>EXCLUSIVE</mode>
+ <retentionStrategy class="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">
+ <idleMinutes>10</idleMinutes>
+ <idleMinutes defined-in="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">10</idleMinutes>
+ </retentionStrategy>
+ <numExecutors>1</numExecutors>
+ <dockerTemplateBase>
+ <image>gerritforge/gerrit-ci-slave-bazel-sbt</image>
+ <dockerCommand></dockerCommand>
+ <lxcConfString>sbt</lxcConfString>
+ <hostname></hostname>
+ <dnsHosts/>
+ <volumes/>
+ <volumesFrom2/>
+ <environment/>
+ <bindPorts></bindPorts>
+ <bindAllPorts>false</bindAllPorts>
+ <privileged>true</privileged>
+ <tty>false</tty>
+ <extraHosts class="java.util.Collections$UnmodifiableRandomAccessList" resolves-to="java.util.Collections$UnmodifiableList">
+ <c class="list"/>
+ <list reference="../c"/>
+ </extraHosts>
+ </dockerTemplateBase>
+ <removeVolumes>false</removeVolumes>
+ <pullStrategy>PULL_LATEST</pullStrategy>
+ </com.nirima.jenkins.plugins.docker.DockerTemplate>
</templates>
<serverUrl>unix:///var/run/docker.sock</serverUrl>
<connectTimeout>30</connectTimeout>
