Merge remote-tracking branch 'original/master' into resync

cvent · Jan 13, 2021 · 6f87a52 · 6f87a52
2 parents 8998a25 + 74fcaf2
commit 6f87a52
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git 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
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.25</version>
+        <version>3.43</version>
         <relativePath />
     </parent>
 
@@ -46,24 +46,24 @@
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/public/</url>
+            <url>https://repo.jenkins-ci.org/public/</url>
         </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
             <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/public/</url>
+            <url>https://repo.jenkins-ci.org/public/</url>
         </pluginRepository>
     </pluginRepositories>
 
     <distributionManagement>
         <repository>
             <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/releases/</url>
+            <url>https://repo.jenkins-ci.org/releases/</url>
         </repository>
         <snapshotRepository>
             <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/snapshots</url>
+            <url>https://repo.jenkins-ci.org/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 

diff --git 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 <code>jnlpCommand</code>.
+   *
+   * @return a {@link String} object.
+   */
+  @Nonnull
+  public String getJnlpCommand() {
+    return StringUtils.isBlank(jnlpCommand) ? DEFAULT_JNLP_COMMAND : jnlpCommand;
+  }
+
+  /**
+   * Setter for the field <code>jnlpCommand</code>.
+   *
+   * @param jnlpCommand a {@link String} object.
+   */
+  @DataBoundSetter
+  public void setJnlpCommand(String jnlpCommand) {
+    this.jnlpCommand = jnlpCommand;
+  }
+
+
   /**
    * Getter for the field <code>jnlpImage</code>.
    *
@@ -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
@@ -34,6 +34,10 @@
       <f:textbox default="${descriptor.defaultJnlpImage}" />
     </f:entry>
 
+    <f:entry field="jnlpCommand" title="${%JNLP Docker Image Command}">
+      <f:textbox default="${descriptor.defaultJnlpCommand}" />
+    </f:entry>
+
     <f:entry field="agentTimeout" title="${%Agent Connection Timeout}">
       <f:number default="${descriptor.defaultAgentTimeout}" />
     </f:entry>