Fixed: JENKINS-40925 - dir context is not honored by shell step

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java

@@ -45,7 +45,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static io.fabric8.kubernetes.client.Watcher.Action.MODIFIED;
 import static org.csanchez.jenkins.plugins.kubernetes.pipeline.Constants.*;
 
 public class ContainerExecDecorator extends LauncherDecorator implements Serializable, Closeable {
@@ -59,7 +58,6 @@ public class ContainerExecDecorator extends LauncherDecorator implements Seriali
     private final transient KubernetesClient client;
     private final String podName;
     private final String containerName;
-    private final String path;
     private final AtomicBoolean alive;
 
     private transient CountDownLatch started;
@@ -68,16 +66,20 @@ public class ContainerExecDecorator extends LauncherDecorator implements Seriali
     private transient ExecWatch watch;
     private transient ContainerExecProc proc;
 
-    public ContainerExecDecorator(KubernetesClient client, String podName, String containerName, String path, AtomicBoolean alive, CountDownLatch started, CountDownLatch finished) {
+    public ContainerExecDecorator(KubernetesClient client, String podName, String containerName, AtomicBoolean alive, CountDownLatch started, CountDownLatch finished) {
         this.client = client;
         this.podName = podName;
         this.containerName = containerName;
-        this.path = path;
         this.alive = alive;
         this.started = started;
         this.finished = finished;
     }
 
+    @Deprecated
+    public ContainerExecDecorator(KubernetesClient client, String podName, String containerName, String path, AtomicBoolean alive, CountDownLatch started, CountDownLatch finished) {
+        this(client, podName, containerName, alive, started, finished);
+    }
+
     @Override
     public Launcher decorate(final Launcher launcher, final Node node) {
         return new Launcher.DecoratedLauncher(launcher) {
@@ -122,7 +124,7 @@ public void onClose(int i, String s) {
 
                 //We need to get into the project workspace.
                 //The workspace is not known in advance, so we have to execute a cd command.
-                watch.getInput().write(String.format("cd \"%s\"%s", path, NEWLINE).getBytes(StandardCharsets.UTF_8));
+                watch.getInput().write(String.format("cd \"%s\"%s", starter.pwd(), NEWLINE).getBytes(StandardCharsets.UTF_8));
                 doExec(watch, launcher.getListener().getLogger(), getCommands(starter));
                 proc = new ContainerExecProc(watch, alive, finished);
                 return proc;
@@ -152,7 +154,7 @@ private boolean waitUntilContainerIsReady() {
                 Pod pod = client.pods().withName(podName).get();
 
                 if (pod == null) {
-                    throw new IllegalArgumentException("Container with name:[" + containerName+"] not found in pod:[" + podName + "]");
+                    throw new IllegalArgumentException("Container with name:[" + containerName + "] not found in pod:[" + podName + "]");
                 }
                 if (isContainerReady(pod, containerName)) {
                     return true;

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerStepExecution.java

@@ -55,7 +55,7 @@ public boolean start() throws Exception {
         }
         client = cloud.connect();
 
-        decorator = new ContainerExecDecorator(client, podName, containerName, workspace.getRemote(), podAlive, podStarted, podFinished);
+        decorator = new ContainerExecDecorator(client, podName, containerName, podAlive, podStarted, podFinished);
         getContext().newBodyInvoker()
                 .withContext(BodyInvoker
                         .mergeLauncherDecorators(getContext().get(LauncherDecorator.class), decorator))

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

@@ -60,8 +60,6 @@
 
 /**
  * @author Carlos Sanchez
- * @since
- *
  */
 public class KubernetesPipelineTest {
 
@@ -182,6 +180,40 @@ public void runJobWithSpaces() throws Exception {
         r.assertLogContains("pwd is -/home/jenkins/workspace/p with spaces-", b);
     }
 
+    @Test
+    public void runDirContext() throws Exception {
+        configureCloud(r);
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "job with dir");
+        p.setDefinition(new CpsFlowDefinition("" //
+                + "podTemplate(cloud: 'minikube', label: 'mypod', containers: [\n" //
+                + "        containerTemplate(name: 'busybox', image: 'busybox', ttyEnabled: true, command: '/bin/cat'),\n" //
+                + "    ]) {\n" //
+                + "\n" //
+                + "    node ('mypod') {\n" //
+                + "      stage('Run') {\n" //
+                + "        container('busybox') {\n" //
+                + "          sh 'mkdir hz'\n" //
+                + "          sh 'echo \"initpwd is -$(pwd)-\"'\n" //
+                + "          dir('hz') {\n" //
+                + "             sh 'echo \"dirpwd is -$(pwd)-\"'\n" //
+                + "          }\n" //
+                + "          sh 'echo \"postpwd is -$(pwd)-\"'\n" //
+                + "        }\n" //
+                + "      }\n" //
+                + "\n" //
+                + "    }\n" //
+                + "}\n" //
+                , true));
+        WorkflowRun b = p.scheduleBuild2(0).waitForStart();
+        assertNotNull(b);
+        r.assertBuildStatusSuccess(r.waitForCompletion(b));
+        String workspace = "/home/jenkins/workspace/job with dir";
+        r.assertLogContains("initpwd is -" + workspace + "-", b);
+        r.assertLogContains("dirpwd is -" + workspace + "/hz-", b);
+        r.assertLogContains("postpwd is -" + workspace + "-", b);
+
+    }
+
     // @Test
     public void runInPodWithRestart() throws Exception {
         story.addStep(new Statement() {
@@ -191,7 +223,7 @@ public void evaluate() throws Throwable {
 
                 story.j.jenkins.addNode(new DumbSlave("slave", "dummy", tmp.newFolder("remoteFS").getPath(), "1",
                         Node.Mode.NORMAL, "", story.j.createComputerLauncher(null), RetentionStrategy.NOOP,
-                        Collections.<NodeProperty<?>> emptyList())); // TODO JENKINS-26398 clumsy
+                        Collections.<NodeProperty<?>>emptyList())); // TODO JENKINS-26398 clumsy
                 WorkflowJob p = story.j.jenkins.createProject(WorkflowJob.class, "p");
                 p.setDefinition(new CpsFlowDefinition("" //
                         + "node('slave') {\n" //
@@ -223,7 +255,7 @@ public void evaluate() throws Throwable {
                         + "    }" //
                         + "  }" //
                         + "}" //
-                , true));
+                        , true));
                 WorkflowRun b = p.scheduleBuild2(0).waitForStart();
                 SemaphoreStep.waitForStart("withDisplayAfterRestart/1", b);
             }