Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setup namespace if needed and possible in declarative test #654

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Setup namespace if needed and possible in declarative test #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/AbstractKubernetesPipelineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
}
}
1 change: 1 addition & 0 deletions ...java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesDeclarativeAgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 2 additions & 10 deletions ...sanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineOverridenNamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand All @@ -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);
Expand Down