Merge pull request #1486 from Vlatombe/container-withMaven-env

Author: Vlatombe

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

@@ -115,4 +115,38 @@ public void envVarDollarSignEscaping() throws Exception {
         r.assertLogContains("outside container: $string$with$dollars", b);
         r.assertLogContains("inside container: $string$with$dollars", b);
     }
+
+    @Test
+    public void containerEnvironmentIsHonored() throws Exception {
+        assertNotNull(createJobThenScheduleRun());
+        r.waitForCompletion(b);
+        r.assertLogContains(
+                "from Groovy outside container: /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                b);
+        r.assertLogContains(
+                "from shell outside container: /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                b);
+        r.assertLogContains(
+                "from Groovy outside container with override: /bar:/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                b);
+        r.assertLogContains(
+                "from shell outside container with override: /bar:/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                b);
+        // When using groovy, the environment relies on the computer's environment.
+        r.assertLogContains(
+                "from Groovy inside container: /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+                b);
+        r.assertLogContains(
+                "from shell inside container: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
+        // TODO Using groovy within container, the agent environment is used instead of the container environment.
+        //        r.assertLogContains(
+        //                "from Groovy inside container with override:
+        // /bar:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+        //                b);
+        // TODO Currently fails because env override is applied to the computer's environment instead of the container's
+        // environment.
+        //        r.assertLogContains(
+        //                "from shell inside container with override:
+        // /bar:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", b);
+    }
 }

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

@@ -0,0 +1,31 @@
+podTemplate(yaml: '''
+spec:
+  containers:
+  - name: jnlp
+    image: jenkins/inbound-agent:3192.v713e3b_039fb_e-1
+    # PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+  - name: alpine
+    image: alpine:3.19.0
+    # PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    command:
+    - sleep
+    args:
+    - infinity
+''') {
+  node(POD_LABEL) {
+    echo "from Groovy outside container: ${env.PATH}"
+    sh 'echo "from shell outside container: $PATH"'
+    withEnv(['PATH+foo=/bar']) {
+      echo "from Groovy outside container with override: ${env.PATH}"
+      sh 'echo "from shell outside container with override: $PATH"'
+    }
+    container('alpine') {
+      echo "from Groovy inside container: ${env.PATH}"
+      sh 'echo "from shell inside container: $PATH"'
+      withEnv(['PATH+foo=/bar']) {
+        echo "from Groovy inside container with override: ${env.PATH}"
+        sh 'echo "from shell inside container with override: $PATH"'
+      }
+    }
+  }
+}