Skip to content

Commit 17112b3

Browse files
committed
Update test with failing override inside container
1 parent 6a7ea48 commit 17112b3

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,6 @@
203203
<artifactId>junit</artifactId>
204204
<scope>test</scope>
205205
</dependency>
206-
<dependency>
207-
<groupId>org.jenkins-ci.plugins</groupId>
208-
<artifactId>pipeline-maven</artifactId>
209-
<version>1362.vee39a_d4b_02b_1</version>
210-
<scope>test</scope>
211-
</dependency>
212206
<dependency>
213207
<groupId>org.jenkins-ci.plugins</groupId>
214208
<artifactId>scm-api</artifactId>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,14 @@ public void containerEnvironmentIsHonored() throws Exception {
122122
r.waitForCompletion(b);
123123
r.assertLogContains(
124124
"from Groovy: /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
125+
r.assertLogContains(
126+
"outside container: /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
127+
b);
128+
r.assertLogContains(
129+
"outside container with override: /bar:/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
130+
b);
125131
r.assertLogContains("inside container: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
126132
r.assertLogContains(
127-
"inside withMaven in container: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
133+
"inside container with override: /bar:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
128134
}
129135
}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ spec:
1515
node(POD_LABEL) {
1616
echo "from Groovy: ${env.PATH}"
1717
sh 'echo "outside container: $PATH"'
18+
withEnv(['PATH+foo=/bar']) {
19+
sh 'echo "outside container with override: $PATH"'
20+
}
1821
container('alpine') {
1922
sh 'echo "inside container: $PATH"'
20-
withMaven(publisherStrategy: 'EXPLICIT', traceability: false) {
21-
sh 'echo "inside withMaven in container: $PATH"'
23+
withEnv(['PATH+foo=/bar']) {
24+
sh 'echo "inside container with override: $PATH"'
2225
}
2326
}
2427
}

0 commit comments

Comments
 (0)