jenkinsci
/
configuration-as-code-plugin
mirror of https://github.com/jenkinsci/configuration-as-code-plugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add volume and environment for dockerTemplateBase 

Signed-off-by: Stephan Müller <mail@stephanmueller.eu>
This commit is contained in:
Stephan Müller 2018-06-06 13:49:31 +02:00 committed by Nicolas De loof
parent 3653eaec14
commit 7d226fced1
7 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/docker/README.md
View File

@ -14,6 +14,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach:

6
demos/jenkins/jenkins.yaml
View File

@ -14,6 +14,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach:

17
src/test/java/org/jenkinsci/plugins/casc/DockerCloudTest.java
View File

@ -9,6 +9,7 @@ import org.jenkinsci.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -29,7 +30,8 @@ public class DockerCloudTest {
assertNotNull(docker.getDockerApi().getDockerHost());
assertEquals("unix:///var/run/docker.sock", docker.getDockerApi().getDockerHost().getUri());
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",
new String[] { "hello:/hello", "world:/world"}, "hello=world\nfoo=bar");
}
@Test
@ -42,7 +44,8 @@ public class DockerCloudTest {
assertEquals("unix:///var/run/docker.sock", docker.getDockerApi().getDockerHost().getUri());
DockerTemplate template = docker.getTemplate(Label.get("docker-agent"));
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10");
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10",
new String[] { "hello:/hello", "world:/world"}, "hello=world\nfoo=bar");
ConfigurationAsCode.get().configure(getClass().getResource("DockerCloudTest/update_docker_cloud/DockerCloudTest2.yml").toExternalForm());
@ -53,19 +56,23 @@ public class DockerCloudTest {
assertEquals("unix:///var/run/docker.sock", docker.getDockerApi().getDockerHost().getUri());
template = docker.getTemplate(Label.get("docker-agent"));
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10");
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10",
new String[] { "hello:/hello", "world:/world"}, "hello=world\nfoo=bar");
template = docker.getTemplate(Label.get("generic"));
checkTemplate(template, "generic", "jenkins", "/home/jenkins/agent2", "5");
checkTemplate(template, "generic", "jenkins", "/home/jenkins/agent2", "5",
new String[] { "hello:/hello", "world:/world"}, "hello=world\nfoo=bar");
}
private void checkTemplate(DockerTemplate template, String labelString, String user, String remoteFs,
String instanceCapStr) {
String instanceCapStr, String[] volumes, String environmentsString) {
assertNotNull(template);
assertEquals(labelString, template.getLabelString());
assertEquals(user, ((DockerComputerAttachConnector) template.getConnector()).getUser());
assertEquals(remoteFs, template.getRemoteFs());
assertEquals(instanceCapStr, template.getInstanceCapStr());
assertArrayEquals(volumes, template.getVolumes());
assertEquals(environmentsString, template.getEnvironmentsString());
}
}

6
src/test/resources/org/jenkinsci/plugins/casc/DockerCloudTest.yml
View File

@ -9,6 +9,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach:

6
src/test/resources/org/jenkinsci/plugins/casc/DockerCloudTest/update_docker_cloud/DockerCloudTest1.yml
View File

@ -9,6 +9,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach:

12
src/test/resources/org/jenkinsci/plugins/casc/DockerCloudTest/update_docker_cloud/DockerCloudTest2.yml
View File

@ -9,6 +9,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach:
@ -18,6 +24,12 @@ jenkins:
- labelString: "generic"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent2"
connector:
attach:

6
src/test/resources/org/jenkinsci/plugins/casc/GetConfiguratorsTest.yml
View File

@ -14,6 +14,12 @@ jenkins:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
volumes:
- hello:/hello
- world:/world
environmentsString: |
hello=world
foo=bar
remoteFs: "/home/jenkins/agent"
connector:
attach: