Skip to content

Commit 7b3f77f

Browse files
authored
Merge pull request #1475 from Vlatombe/JENKINS-70217
[JENKINS-70217] Default ContainerTemplate command and arg to empty string when using casc.
2 parents ad406fb + 30a6feb commit 7b3f77f

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/main/java/org/csanchez/jenkins/plugins/kubernetes/ContainerTemplate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public class ContainerTemplate extends AbstractDescribableImpl<ContainerTemplate
4646

4747
private String workingDir;
4848

49-
private String command;
49+
private String command = "";
5050

51-
private String args;
51+
private String args = "";
5252

5353
private boolean ttyEnabled;
5454

src/test/java/org/csanchez/jenkins/plugins/kubernetes/casc/CasCTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule r, String confi
6464
assertThat(podTemplate.getYamlMergeStrategy(), isA(Merge.class));
6565
List<ContainerTemplate> containers = podTemplate.getContainers();
6666
assertNotNull(containers);
67-
assertEquals(1, containers.size());
67+
assertEquals(2, containers.size());
6868
ContainerTemplate container = containers.get(0);
6969
assertEquals("cat", container.getArgs());
7070
assertEquals("/bin/sh -c", container.getCommand());
@@ -78,6 +78,9 @@ protected void assertConfiguredAsExpected(RestartableJenkinsRule r, String confi
7878
assertEquals("maven",container.getName());
7979
assertTrue(container.isTtyEnabled());
8080
assertEquals("/src", container.getWorkingDir());
81+
var containerTemplate = containers.get(1);
82+
assertEquals("", containerTemplate.getCommand());
83+
assertEquals("", containerTemplate.getArgs());
8184

8285
}
8386

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/casc/configuration-as-code.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ jenkins:
3636
name: "maven"
3737
ttyEnabled: true
3838
workingDir: "/src"
39+
- name: "maven-with-default-entrypoint"
40+
image: "maven:3.6.3-jdk-8"
3941
hostNetwork: false
4042
label: "test"
4143
name: "test"

0 commit comments

Comments
 (0)