Update build action to use new temp folder for build report

Author: sameagen-MW

src/main/java/com/mathworks/ci/BuildArtifactAction.java

@@ -60,7 +60,7 @@ public String getUrlName() {
 
     public List<BuildArtifactData> getBuildArtifact() throws ParseException, InterruptedException, IOException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
-        FilePath fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" + BUILD_ARTIFACT_FILE));
+        FilePath fl = new FilePath(new File(build.getRootDir().getAbsolutePath(), BUILD_ARTIFACT_FILE));
         try (InputStreamReader reader = new InputStreamReader(new FileInputStream(new File(fl.toURI())), "UTF-8")) {
             Object obj = new JSONParser().parse(reader);
             JSONObject jo = (JSONObject) obj;

src/main/java/com/mathworks/ci/actions/RunMatlabBuildAction.java

@@ -54,6 +54,9 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
         runner.addEnvironmentVariable(
                 "MW_MATLAB_BUILDTOOL_DEFAULT_PLUGINS_FCN_OVERRIDE",
                 "ciplugins.jenkins.getDefaultPlugins");
+        runner.addEnvironmentVariable(
+                "MW_MATLAB_TEMP_FOLDER",
+                runner.getTempFolder().toString());
 
         // Redirect output to the build annotator
         runner.redirectStdOut(annotator);
@@ -75,6 +78,20 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
 
         try {
             runner.runMatlabCommand(command);
+
+            // Handle build result
+            Run<?,?> build = this.params.getBuild();
+            FilePath jsonFile = new FilePath(runner.getTempFolder(), "buildArtifact.json");
+            if (jsonFile.exists()) {
+                FilePath rootLocation = new FilePath(
+                        new File(
+                            build.getRootDir().getAbsolutePath(),
+                            "buildArtifact.json")
+                        );
+                jsonFile.copyTo(rootLocation);
+                jsonFile.delete();
+                build.addAction(new BuildArtifactAction(build));
+            }
         } catch (Exception e) {
             this.params.getTaskListener().getLogger()
                 .println(e.getMessage());
@@ -90,20 +107,5 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
                 System.err.println(e.toString());
             }
         }
-
-        // Handle build result
-        Run<?,?> build = this.params.getBuild();
-        FilePath jsonFile = new FilePath(params.getWorkspace(), ".matlab" + File.separator + "buildArtifact.json");
-        if (jsonFile.exists()) {
-            FilePath rootLocation = new FilePath(
-                    new File(
-                        build.getRootDir()
-                        .getAbsolutePath()
-                        + File.separator
-                        + "buildArtifact.json"));
-            jsonFile.copyTo(rootLocation);
-            jsonFile.delete();
-            build.addAction(new BuildArtifactAction(build));
-        }
     }
 }

src/main/resources/+ciplugins/+jenkins/BuildReportPlugin.m

@@ -6,8 +6,7 @@
 
         function runTaskGraph(plugin, pluginData)
             [email protected](plugin, pluginData);
-            [fID, msg] = fopen(fullfile(getenv("WORKSPACE"),".matlab/buildArtifact.json"), "w");
-
+            [fID, msg] = fopen(fullfile(getenv("MW_MATLAB_TEMP_FOLDER"),"buildArtifact.json"), "w");
             if fID == -1
                 warning("ciplugins:jenkins:BuildReportPlugin:UnableToOpenFile","Could not open a file for Jenkins build result table due to: %s", msg);
             else
@@ -26,4 +25,4 @@ function runTaskGraph(plugin, pluginData)
             end
         end
     end
-end
+end

src/test/java/unit/com/mathworks/ci/actions/RunMatlabBuildActionTest.java

@@ -54,8 +54,6 @@ public void init() {
             when(runner.getTempFolder()).thenReturn(tempFolder);
             when(tempFolder.getRemote()).thenReturn("/path/less/traveled");
 
-            when(params.getWorkspace()).thenReturn(tempFolder);
-
             when(params.getTaskListener()).thenReturn(listener);
             when(listener.getLogger()).thenReturn(out);
 
@@ -137,22 +135,22 @@ public void shouldPrintAndRethrowMessage() throws IOException, InterruptedExcept
     public void shouldNotAddActionIfNoBuildResult() throws IOException, InterruptedException, MatlabExecutionException {
         action.run();
 
-        verify(build,  never()).addAction(any(BuildArtifactAction.class));
+        verify(build, never()).addAction(any(BuildArtifactAction.class));
     }
 
     @Test
-    public void shouldCopyBuildResultsToRootAndAddsAction() throws IOException, InterruptedException, MatlabExecutionException {
+    public void shouldCopyBuildResultsToRootAndAddAction() throws IOException, InterruptedException, MatlabExecutionException {
         File tmp = Files.createTempDirectory("temp").toFile();
         tmp.deleteOnExit();
+        
+        File dest = Files.createTempDirectory("dest").toFile();
+        dest.deleteOnExit();
 
-        File matlab = new File(tmp, ".matlab");
-        File json = new File(matlab, "buildArtifact.json");
-
-        matlab.mkdirs();
+        File json = new File(tmp, "buildArtifact.json");
         json.createNewFile();
-        
-        doReturn(new FilePath(tmp)).when(params).getWorkspace();
-        doReturn(tmp).when(build).getRootDir();
+
+        doReturn(new FilePath(tmp)).when(runner).getTempFolder();
+        doReturn(dest).when(build).getRootDir();
 
         boolean runTimeException = false;
         try {
@@ -166,7 +164,7 @@ public void shouldCopyBuildResultsToRootAndAddsAction() throws IOException, Inte
         // Should have deleted original file
         assertFalse(json.exists());
         // Should have copied file to root dir
-        assertTrue(new File(tmp, "buildArtifact.json").exists());
+        assertTrue(new File(dest, "buildArtifact.json").exists());
     }
 
     @Test