Merge pull request #654 from Vlatombe/fix-declarative-with-missing-ns

Setup namespace if needed and possible in declarative test
jenkinsci · Dec 3, 2019 · 3c9d11d · 3c9d11d
2 parents 9b470e6 + bde968d
commit 3c9d11d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/AbstractKubernetesPipelineTest.java b/...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/AbstractKubernetesPipelineTest.java
@@ -32,6 +32,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
 import org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar;
 import org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate;
 import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud;
@@ -182,4 +184,11 @@ private static void setEnvVariables(PodTemplate podTemplate) {
         podTemplate.getContainers().get(0)
                 .setEnvVars(asList(containerEnvVariable, containerEnvVariableLegacy, containerSecretEnvVariable));
     }
+
+    protected void createNamespaceIfNotExist(KubernetesClient client, String namespace) {
+        if (client.namespaces().withName(namespace).get() == null) {
+            client.namespaces().createOrReplace(
+                    new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build());
+        }
+    }
 }
diff --git a/...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java b/...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java
@@ -81,6 +81,7 @@ public void declarativeFromYaml() throws Exception {
     @Issue("JENKINS-51610")
     @Test
     public void declarativeWithNamespaceFromYaml() throws Exception {
+        createNamespaceIfNotExist(cloud.connect(), "kubernetes-plugin-test-overridden-namespace");
         assertNotNull(createJobThenScheduleRun());
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains("Apache Maven 3.3.9", b);

diff --git a/...sanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineOverridenNamespaceTest.java b/...sanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineOverridenNamespaceTest.java
@@ -16,12 +16,8 @@ public class KubernetesPipelineOverridenNamespaceTest extends AbstractKubernetes
     public void runWithCloudOverriddenNamespace() throws Exception {
         String overriddenNamespace = testingNamespace + "-overridden-namespace";
         cloud.setNamespace(overriddenNamespace);
-        KubernetesClient client = cloud.connect();
         // Run in our own testing namespace
-        if (client.namespaces().withName(overriddenNamespace).get() == null) {
-            client.namespaces().createOrReplace(
-                    new NamespaceBuilder().withNewMetadata().withName(overriddenNamespace).endMetadata().build());
-        }
+        createNamespaceIfNotExist(cloud.connect(), overriddenNamespace);
 
         assertNotNull(createJobThenScheduleRun());
 
@@ -37,12 +33,8 @@ public void runWithStepOverriddenNamespace() throws Exception {
         String overriddenNamespace = testingNamespace + "-overridden-namespace";
         String stepNamespace = testingNamespace + "-overridden-namespace2";
         cloud.setNamespace(overriddenNamespace);
-        KubernetesClient client = cloud.connect();
         // Run in our own testing namespace
-        if (client.namespaces().withName(stepNamespace).get() == null) {
-            client.namespaces().createOrReplace(
-                    new NamespaceBuilder().withNewMetadata().withName(stepNamespace).endMetadata().build());
-        }
+        createNamespaceIfNotExist(cloud.connect(), stepNamespace);
 
         Map<String, String> env = new HashMap<>();
         env.put("OVERRIDDEN_NAMESPACE", stepNamespace);