Merge pull request #1290 from Vlatombe/JENKINS-70392-tests-followup

Author: Vlatombe

pom.xml

@@ -49,6 +49,7 @@
     <no-test-jar>false</no-test-jar>
     <useBeta>true</useBeta>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+    <jenkins-test-harness.version>1922.v91779ee45b_5e</jenkins-test-harness.version>
   </properties>
 
   <dependencies>

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/AbstractKubernetesPipelineRJRTest.java

@@ -2,6 +2,7 @@
 
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.assumeKubernetes;
 
+import org.apache.commons.lang.StringUtils;
 import org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil;
 import org.csanchez.jenkins.plugins.kubernetes.pipeline.steps.CreateWorkflowJobThenScheduleRun;
 import org.csanchez.jenkins.plugins.kubernetes.pipeline.steps.RunId;
@@ -18,7 +19,21 @@ public abstract class AbstractKubernetesPipelineRJRTest {
     public TestName name = new TestName();
 
     @Rule
-    public RealJenkinsRule rjr = new RealJenkinsRule();
+    public RealJenkinsRule rjr;
+    {
+        rjr = new RealJenkinsRule();
+        String connectorHost = System.getProperty("connectorHost");
+        if (StringUtils.isNotBlank(connectorHost)) {
+            System.err.println("Listening on host address: " + connectorHost);
+            rjr.withHttpListenAddress(connectorHost);
+        }
+        String port = System.getProperty("port");
+        if (StringUtils.isNotBlank(port)) {
+            System.err.println("Overriding port using system property: " + port);
+            rjr = rjr.withPort(Integer.parseInt(port));
+        }
+    }
+
 
     protected RunId runId;
 

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineRJRTest.java

@@ -12,7 +12,6 @@ public KubernetesPipelineRJRTest() throws UnknownHostException {
     }
 
     @Test
-    @Ignore // Need RealJenkinsRule to accept a custom port
     public void basicPipeline() throws Throwable {
         rjr.runRemotely(new AssertBuildStatusSuccess(runId));
     }

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineWebsocketRJRTest.java

@@ -22,7 +22,6 @@ public KubernetesPipelineWebsocketRJRTest() throws UnknownHostException {
         super(new SetupCloud(true));
     }
     @Test
-    @Ignore // Need RealJenkinsRule to accept a custom port
     public void basicPipeline() throws Throwable {
         rjr.runRemotely(new AssertBuildStatusSuccess(runId));
     }

src/test/java/org/jvnet/hudson/test/JenkinsRuleNonLocalhost.java

@@ -34,6 +34,7 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jetty.http.HttpCompliance;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -95,9 +96,10 @@ public Thread newThread(Runnable r) {
         System.err.println("Listening on host address: " + HOST);
         connector.setHost(HOST);
 
-        if (System.getProperty("port")!=null) {
-            LOGGER.info("Overriding port using system property: " + System.getProperty("port"));
-            connector.setPort(Integer.parseInt(System.getProperty("port")));
+        String customPort = System.getProperty("port");
+        if (StringUtils.isNotBlank(customPort)) {
+            LOGGER.info("Overriding port using system property: " + customPort);
+            connector.setPort(Integer.parseInt(customPort));
         } else {
             if (port != null) {
                 connector.setPort(port);

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/basicPipeline.groovy

@@ -1,4 +1,4 @@
-podTemplate {
+podTemplate(yaml: '') {
     node(POD_LABEL) {
         sh 'true'
     }