diff --git a/README.md b/README.md index c29180f..67e8bc0 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ commands below: aws iam create-role \ --role-name jenkins-default \ --assume-role-policy-document \ - '{"Version":"2012-10-17 ","Statement":[{"Effect": "Allow","Principal":{"Service":"codebuild.amazonaws.com"},"Action":"sts:AssumeRole"}]}' + '{"Version":"2012-10-17","Statement":[{"Effect": "Allow","Principal":{"Service":"codebuild.amazonaws.com"},"Action":"sts:AssumeRole"}]}' # Create the project named "jenkins-cluster" using our service role aws codebuild create-project \ diff --git a/pom.xml b/pom.xml index e9ee19a..6710a48 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 3.25 + 3.43 @@ -46,24 +46,24 @@ repo.jenkins-ci.org - http://repo.jenkins-ci.org/public/ + https://repo.jenkins-ci.org/public/ repo.jenkins-ci.org - http://repo.jenkins-ci.org/public/ + https://repo.jenkins-ci.org/public/ repo.jenkins-ci.org - http://repo.jenkins-ci.org/releases/ + https://repo.jenkins-ci.org/releases/ repo.jenkins-ci.org - http://repo.jenkins-ci.org/snapshots + https://repo.jenkins-ci.org/snapshots diff --git a/src/main/java/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud.java b/src/main/java/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud.java index ad5cf3c..ef7d7df 100644 --- a/src/main/java/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud.java +++ b/src/main/java/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud.java @@ -57,6 +57,7 @@ public class CodeBuilderCloud extends Cloud { private static final Logger LOGGER = LoggerFactory.getLogger(CodeBuilderCloud.class); private static final String DEFAULT_JNLP_IMAGE = "lsegal/jnlp-docker-agent:alpine"; + private static final String DEFAULT_JNLP_COMMAND = "jenkins-agent"; private static final int DEFAULT_AGENT_TIMEOUT = 120; private static final String DEFAULT_COMPUTE_TYPE = "BUILD_GENERAL1_SMALL"; private static final boolean DEFAULT_TERMINATE_AGENT = true; @@ -78,6 +79,7 @@ public class CodeBuilderCloud extends Cloud { private String computeType; private String jenkinsUrl; private String jnlpImage; + private String jnlpCommand; private int agentTimeout; private boolean terminateAgent; @@ -219,6 +221,27 @@ public void setJenkinsUrl(String jenkinsUrl) { this.jenkinsUrl = jenkinsUrl; } + /** + * Getter for the field jnlpCommand. + * + * @return a {@link String} object. + */ + @Nonnull + public String getJnlpCommand() { + return StringUtils.isBlank(jnlpCommand) ? DEFAULT_JNLP_COMMAND : jnlpCommand; + } + + /** + * Setter for the field jnlpCommand. + * + * @param jnlpCommand a {@link String} object. + */ + @DataBoundSetter + public void setJnlpCommand(String jnlpCommand) { + this.jnlpCommand = jnlpCommand; + } + + /** * Getter for the field jnlpImage. * @@ -419,6 +442,10 @@ public String getDefaultJnlpImage() { return DEFAULT_JNLP_IMAGE; } + public String getDefaultJnlpCommand() { + return DEFAULT_JNLP_COMMAND; + } + public int getDefaultAgentTimeout() { return DEFAULT_AGENT_TIMEOUT; } diff --git a/src/main/resources/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud/config.jelly b/src/main/resources/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud/config.jelly index 2864b84..423e3bc 100644 --- a/src/main/resources/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud/config.jelly +++ b/src/main/resources/dev/lsegal/jenkins/codebuilder/CodeBuilderCloud/config.jelly @@ -34,6 +34,10 @@ + + + +