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

Support for update cloud configuration + tests

This commit is contained in:
odavid 2017-12-23 13:57:58 +02:00 committed by Nicolas De loof
parent 50c610f993
commit b7dec5e348
4 changed files with 85 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/jenkinsci/plugins/casc/JenkinsConfigurator.java
View File

@ -73,10 +73,11 @@ public class JenkinsConfigurator extends BaseConfigurator<Jenkins> implements Ro
public void setValue(Jenkins jenkins, Object value) throws Exception {
List<Cloud> clouds = (List<Cloud>) value;
for (Cloud cloud : clouds) {
if (jenkins.getCloud(cloud.name) == null) {
Cloud currentCloud = jenkins.getCloud(cloud.name);
if (currentCloud == null) {
jenkins.clouds.add(cloud);
} else {
// FIXME re-configure ? remove/replace ?
jenkins.clouds.replace(currentCloud, cloud);
}
}
}

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

@ -2,18 +2,14 @@ package org.jenkinsci.plugins.casc;
import com.nirima.jenkins.plugins.docker.DockerCloud;
import com.nirima.jenkins.plugins.docker.DockerTemplate;
import com.nirima.jenkins.plugins.docker.launcher.AttachedDockerComputerLauncher;
import hudson.plugins.active_directory.ActiveDirectoryDomain;
import hudson.plugins.active_directory.ActiveDirectorySecurityRealm;
import hudson.model.Label;
import io.jenkins.docker.connector.DockerComputerAttachConnector;
import jenkins.model.Jenkins;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
@ -31,8 +27,46 @@ public class DockerCloudTest {
final DockerCloud docker = DockerCloud.getCloudByName("docker");
assertNotNull(docker);
final DockerTemplate template = docker.getTemplate("jenkins/slave");
checkTemplate(template, "docker-agent", "jenkins", "/home/jenkins/agent", "10");
}
@Test
public void update_docker_cloud() throws Exception {
ConfigurationAsCode.configure(getClass().getResourceAsStream(
"DockerCloudTest/update_docker_cloud/DockerCloudTest1.yml"));
DockerCloud docker = DockerCloud.getCloudByName("docker");
assertNotNull(docker);
assertNotNull(docker.getDockerApi());
assertNotNull(docker.getDockerApi().getDockerHost());
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");
ConfigurationAsCode.configure(getClass().getResourceAsStream(
"DockerCloudTest/update_docker_cloud/DockerCloudTest2.yml"));
docker = DockerCloud.getCloudByName("docker");
assertNotNull(docker);
assertNotNull(docker.getDockerApi());
assertNotNull(docker.getDockerApi().getDockerHost());
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");
template = docker.getTemplate(Label.get("generic"));
checkTemplate(template, "generic", "jenkins", "/home/jenkins/agent2", "5");
}
private void checkTemplate(DockerTemplate template, String labelString, String user, String remoteFs,
String instanceCapStr){
assertNotNull(template);
assertEquals("docker-agent", template.getLabelString());
assertEquals("jenkins", ((DockerComputerAttachConnector) template.getConnector()).getUser());
assertEquals(labelString, template.getLabelString());
assertEquals(user, ((DockerComputerAttachConnector) template.getConnector()).getUser());
assertEquals(remoteFs, template.getRemoteFs());
assertEquals(instanceCapStr, template.getInstanceCapStr());
}
}

16
src/test/resources/org/jenkinsci/plugins/casc/DockerCloudTest/update_docker_cloud/DockerCloudTest1.yml Normal file
View File

@ -0,0 +1,16 @@
jenkins:
clouds:
- docker:
name: "docker"
dockerApi:
dockerHost:
uri: "unix:///var/run/docker.sock"
templates:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
remoteFs: "/home/jenkins/agent"
connector:
attach:
user: "jenkins"
instanceCapStr: "10"

25
src/test/resources/org/jenkinsci/plugins/casc/DockerCloudTest/update_docker_cloud/DockerCloudTest2.yml Normal file
View File

@ -0,0 +1,25 @@
jenkins:
clouds:
- docker:
name: "docker"
dockerApi:
dockerHost:
uri: "unix:///var/run/docker.sock"
templates:
- labelString: "docker-agent"
dockerTemplateBase:
image: "jenkins/slave"
remoteFs: "/home/jenkins/agent"
connector:
attach:
user: "jenkins"
instanceCapStr: "10"
- labelString: "generic"
dockerTemplateBase:
image: "jenkins/slave"
remoteFs: "/home/jenkins/agent2"
connector:
attach:
user: "jenkins"
instanceCapStr: "5"