From 397d5ed7c5a03c02e2db84294832a67a79d8b277 Mon Sep 17 00:00:00 2001
From: "are@hypergames.no" <are@hypergames.no>
Date: Fri, 7 Aug 2015 12:21:41 +0200
Subject: [PATCH] Fixed so user can choose how many connection retries to make

---
 .../RemoteBuildConfiguration.java                         | 8 +++++---
 .../RemoteBuildConfiguration/config.jelly                 | 4 ++++
 .../RemoteBuildConfigurationTest.java                     | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java b/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
index fa62789e..0f08ecad 100644
--- a/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
+++ b/src/main/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration.java
@@ -58,7 +58,7 @@ public class RemoteBuildConfiguration extends Builder {
 
     private final boolean         shouldNotFailBuild;
     private final int             pollInterval;
-    private final int             connectionRetryLimit = 5;
+    private final int             connectionRetryLimit;
     private final boolean         preventRemoteBuildQueue;
     private final boolean         blockBuildUntilComplete;
     private final boolean         enhancedLogging;
@@ -85,7 +85,7 @@ public class RemoteBuildConfiguration extends Builder {
     @DataBoundConstructor
     public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailBuild, String job, String token,
             String parameters, boolean enhancedLogging, JSONObject overrideAuth, JSONObject loadParamsFromFile, boolean preventRemoteBuildQueue,
-            boolean blockBuildUntilComplete, int pollInterval) throws MalformedURLException {
+            boolean blockBuildUntilComplete, int pollInterval, int connectionRetryLimit) throws MalformedURLException {
 
         this.token = token.trim();
         this.remoteJenkinsName = remoteJenkinsName;
@@ -94,6 +94,7 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB
         this.preventRemoteBuildQueue = preventRemoteBuildQueue;
         this.blockBuildUntilComplete = blockBuildUntilComplete;
         this.pollInterval = pollInterval;
+        this.connectionRetryLimit = connectionRetryLimit;
         this.enhancedLogging = enhancedLogging;
 
         if (overrideAuth != null && overrideAuth.has("auth")) {
@@ -127,7 +128,7 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB
     }
 
     public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailBuild,
-            boolean preventRemoteBuildQueue, boolean blockBuildUntilComplete, int pollInterval, String job,
+            boolean preventRemoteBuildQueue, boolean blockBuildUntilComplete, int pollInterval, int connectionRetryLimit, String job,
             String token, String parameters, boolean enhancedLogging) throws MalformedURLException {
 
         this.token = token.trim();
@@ -139,6 +140,7 @@ public RemoteBuildConfiguration(String remoteJenkinsName, boolean shouldNotFailB
         this.preventRemoteBuildQueue = preventRemoteBuildQueue;
         this.blockBuildUntilComplete = blockBuildUntilComplete;
         this.pollInterval = pollInterval;
+        this.connectionRetryLimit = connectionRetryLimit;
         this.overrideAuth = false;
         this.auth.replaceBy(new Auth(null));
 
diff --git a/src/main/resources/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration/config.jelly b/src/main/resources/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration/config.jelly
index bd792469..2bdeeff0 100644
--- a/src/main/resources/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration/config.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfiguration/config.jelly
@@ -24,6 +24,10 @@
   <f:entry title="Poll Interval (seconds)" field="pollInterval">
      <f:number clazz="positive-number" min="1" step="1" default="10" />
   </f:entry>
+  
+  <f:entry title="Maximum number of retries" field="connectionRetryLimit">
+     <f:number clazz="positive-number" min="0" step="1" default="5" />
+  </f:entry>  
 
   <f:entry title="Block until the remote triggered projects finish their builds." field="blockBuildUntilComplete">
     <f:checkbox />
diff --git a/src/test/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java b/src/test/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java
index c7e14599..05f6d923 100644
--- a/src/test/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java
+++ b/src/test/java/org/jenkinsci/plugins/ParameterizedRemoteTrigger/RemoteBuildConfigurationTest.java
@@ -31,7 +31,7 @@ public void testRemoteBuild() throws Exception {
         FreeStyleProject project = jenkinsRule.createFreeStyleProject();
         RemoteBuildConfiguration remoteBuildConfiguration = new RemoteBuildConfiguration(
                 remoteJenkinsServer.getDisplayName(), false, remoteProject.getFullName(), "",
-                "", true, null, null, false, true, 1);
+                "", true, null, null, false, true, 1, 5);
         project.getBuildersList().add(remoteBuildConfiguration);
 
         jenkinsRule.buildAndAssertSuccess(project);