Skip to content

Commit 6ee81eb

Browse files
mifitousmifitous
committed
fixed test
1 parent edff60e commit 6ee81eb

File tree

2 files changed

+76
-18
lines changed
  • src/test
    • java/org/csanchez/jenkins/plugins/kubernetes
    • resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesTest/mixedPrivivilegedPodTemplates

2 files changed

+76
-18
lines changed

‎src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ public void upgradeFrom_1_15_9_invalid() {
123123
assertEquals("blah", template.getYaml());
124124
assertEquals(Collections.singletonList("blah"), template.getYamls());
125125
assertNull(template._getYamls());
126-
log.getMessages().stream().anyMatch(msg -> msg.contains("Found several persisted YAML fragments in pod template java"));
126+
log.getMessages().stream()
127+
.anyMatch(msg -> msg.contains("Found several persisted YAML fragments in pod template java"));
127128
}
128129

129130
@Test
@@ -207,19 +208,19 @@ public void upgradeFrom_0_8() throws Exception {
207208
@Issue("JENKINS-70287")
208209
public void mixedPrivivilegedPodTemplates() throws Exception {
209210
List<PodTemplate> templates = cloud.getTemplates();
210-
assertPodTemplates(templates, 2);
211+
assertPodTemplates(templates, 2, 2);
211212
PodTemplate template = templates.get(0);
212-
assertEquals(false, template.getContainers().get(0).isPrivileged());
213-
assertEquals(true, template.getContainers().get(1).isPrivileged());
213+
assertEquals(true, template.getContainers().get(0).isPrivileged());
214+
assertEquals(false, template.getContainers().get(1).isPrivileged());
214215
assertEquals(Collections.emptyList(), template.getYamls());
215216
assertNull(template.getYaml());
216217
}
217218

218-
private void assertPodTemplates(List<PodTemplate> templates, Integer... containersNumber) {
219-
assertEquals(1, templates.size());
219+
private void assertPodTemplates(List<PodTemplate> templates, Integer... numbers) {
220+
assertEquals(numbers.length > 0 ? numbers[0] : 1, templates.size());
220221
PodTemplate podTemplate = templates.get(0);
221222
assertEquals(Integer.MAX_VALUE, podTemplate.getInstanceCap());
222-
assertEquals(containersNumber.length > 0 ? containersNumber[0] : 1, podTemplate.getContainers().size());
223+
assertEquals(numbers.length > 1 ? numbers[1] : 1, podTemplate.getContainers().size());
223224
ContainerTemplate containerTemplate = podTemplate.getContainers().get(0);
224225
assertEquals("jenkins/inbound-agent", containerTemplate.getImage());
225226
assertEquals("jnlp", containerTemplate.getName());

‎src/test/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesTest/mixedPrivivilegedPodTemplates/config.xml‎

Lines changed: 68 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818
<clouds>
1919
<org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="[email protected]">
2020
<name>kubernetes</name>
21-
<defaultsProviderTemplate></defaultsProviderTemplate>
21+
<defaultsProviderTemplate>jnlp</defaultsProviderTemplate>
2222
<templates>
2323
<org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
24-
<inheritFrom></inheritFrom>
24+
<inheritFrom>jnlp</inheritFrom>
2525
<name>java</name>
26-
<namespace></namespace>
2726
<privileged>false</privileged>
2827
<capOnlyOnAlivePods>false</capOnlyOnAlivePods>
29-
<alwaysPullImage>false</alwaysPullImage>
28+
<alwaysPullImage>true</alwaysPullImage>
3029
<instanceCap>2147483647</instanceCap>
3130
<slaveConnectTimeout>100</slaveConnectTimeout>
3231
<idleMinutes>0</idleMinutes>
@@ -50,14 +49,14 @@
5049
</volumes>
5150
<containers>
5251
<org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
53-
<name>jnlp</name>
52+
<name>jnlp-dind</name>
5453
<image>jenkins/inbound-agent</image>
55-
<privileged>false</privileged>
56-
<alwaysPullImage>false</alwaysPullImage>
54+
<privileged>true</privileged>
55+
<alwaysPullImage>true</alwaysPullImage>
5756
<workingDir>/home/jenkins</workingDir>
5857
<command></command>
5958
<args>${computer.jnlpmac} ${computer.name}</args>
60-
<ttyEnabled>false</ttyEnabled>
59+
<ttyEnabled>true</ttyEnabled>
6160
<resourceRequestCpu>500m</resourceRequestCpu>
6261
<resourceRequestMemory>250Mi</resourceRequestMemory>
6362
<resourceLimitCpu>500m</resourceLimitCpu>
@@ -85,12 +84,12 @@
8584
<org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
8685
<name>busybox</name>
8786
<image>busybox</image>
88-
<privileged>true</privileged>
89-
<alwaysPullImage>false</alwaysPullImage>
87+
<privileged>false</privileged>
88+
<alwaysPullImage>true</alwaysPullImage>
9089
<workingDir>/home/jenkins</workingDir>
9190
<command>cat</command>
9291
<args></args>
93-
<ttyEnabled>false</ttyEnabled>
92+
<ttyEnabled>true</ttyEnabled>
9493
<resourceRequestCpu>500m</resourceRequestCpu>
9594
<resourceRequestMemory>250Mi</resourceRequestMemory>
9695
<resourceLimitCpu>500m</resourceLimitCpu>
@@ -132,6 +131,64 @@
132131
<string></string>
133132
</yamls>
134133
<podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default"/>
134+
<yamlMergeStrategy class="org.csanchez.jenkins.plugins.kubernetes.pod.yaml.Overrides"/>
135+
<showRawYaml>true</showRawYaml>
136+
</org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
137+
<org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
138+
<name>jnlp</name>
139+
<privileged>false</privileged>
140+
<capOnlyOnAlivePods>false</capOnlyOnAlivePods>
141+
<alwaysPullImage>false</alwaysPullImage>
142+
<instanceCap>2147483647</instanceCap>
143+
<slaveConnectTimeout>100</slaveConnectTimeout>
144+
<idleMinutes>0</idleMinutes>
145+
<activeDeadlineSeconds>0</activeDeadlineSeconds>
146+
<label>jnlp-label</label>
147+
<hostNetwork>false</hostNetwork>
148+
<volumes>
149+
<org.csanchez.jenkins.plugins.kubernetes.volumes.EmptyDirVolume>
150+
<mountPath>/mnt</mountPath>
151+
<memory>false</memory>
152+
</org.csanchez.jenkins.plugins.kubernetes.volumes.EmptyDirVolume>
153+
<org.csanchez.jenkins.plugins.kubernetes.volumes.HostPathVolume>
154+
<mountPath>/host</mountPath>
155+
<hostPath>/mnt/host</hostPath>
156+
</org.csanchez.jenkins.plugins.kubernetes.volumes.HostPathVolume>
157+
</volumes>
158+
<containers>
159+
<org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
160+
<name>jnlp</name>
161+
<image>busybox</image>
162+
<privileged>true</privileged>
163+
<alwaysPullImage>true</alwaysPullImage>
164+
<workingDir>/home/jenkins</workingDir>
165+
<command>cat</command>
166+
<args></args>
167+
<ttyEnabled>true</ttyEnabled>
168+
<resourceRequestCpu>500m</resourceRequestCpu>
169+
<resourceRequestMemory>250Mi</resourceRequestMemory>
170+
<resourceLimitCpu>500m</resourceLimitCpu>
171+
<resourceLimitMemory>250Mi</resourceLimitMemory>
172+
<envVars/>
173+
<ports/>
174+
<livenessProbe>
175+
<execArgs></execArgs>
176+
<timeoutSeconds>0</timeoutSeconds>
177+
<initialDelaySeconds>0</initialDelaySeconds>
178+
<failureThreshold>0</failureThreshold>
179+
<periodSeconds>0</periodSeconds>
180+
<successThreshold>0</successThreshold>
181+
</livenessProbe>
182+
</org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
183+
</containers>
184+
<imagePullSecrets>
185+
<org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
186+
<name></name>
187+
</org.csanchez.jenkins.plugins.kubernetes.PodImagePullSecret>
188+
</imagePullSecrets>
189+
<podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default"/>
190+
<yamlMergeStrategy class="org.csanchez.jenkins.plugins.kubernetes.pod.yaml.Merge"/>
191+
<showRawYaml>true</showRawYaml>
135192
</org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
136193
</templates>
137194
<serverUrl>https://192.168.64.1</serverUrl>

0 commit comments

Comments
 (0)