Changed docker cloud test and configuration file

This commit is contained in:
odavid 2017-12-23 13:12:28 +02:00 committed by Nicolas De loof
parent b7dec5e348
commit 236ad75d9a
2 changed files with 6 additions and 2 deletions

View File

@ -26,6 +26,9 @@ public class DockerCloudTest {
final DockerCloud docker = DockerCloud.getCloudByName("docker"); final DockerCloud docker = DockerCloud.getCloudByName("docker");
assertNotNull(docker); assertNotNull(docker);
assertNotNull(docker.getDockerApi());
assertNotNull(docker.getDockerApi().getDockerHost());
assertEquals("unix:///var/run/docker.sock", docker.getDockerApi().getDockerHost().getUri());
final DockerTemplate template = docker.getTemplate("jenkins/slave"); final DockerTemplate template = docker.getTemplate("jenkins/slave");
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10"); checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10");
} }

View File

@ -2,8 +2,9 @@ jenkins:
clouds: clouds:
- docker: - docker:
name: "docker" name: "docker"
dockerHost: dockerApi:
uri: "unix:///var/run/docker.sock" dockerHost:
uri: "unix:///var/run/docker.sock"
templates: templates:
- labelString: "docker-agent" - labelString: "docker-agent"
dockerTemplateBase: dockerTemplateBase: