Merge pull request #94 from bam-hbt/develop

fix RCA and RTS Log Overview
jenkinsci · Feb 9, 2022 · 034a2b0 · 034a2b0
2 parents df3a92f + 72ec338
commit 034a2b0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/de/dagere/peass/ci/logs/rca/RCAActionCreator.java b/src/main/java/de/dagere/peass/ci/logs/rca/RCAActionCreator.java
@@ -36,7 +36,7 @@ public void createRCAActions() throws IOException {
       Map<TestCase, List<RCALevel>> testLevelMap = createRCALogActions(reader);
 
       RCALogOverviewAction rcaOverviewAction = new RCALogOverviewAction(testLevelMap, measurementConfig.getExecutionConfig().getVersion().substring(0, 6),
-            measurementConfig.getExecutionConfig().getVersionOld().substring(0, 6));
+            measurementConfig.getExecutionConfig().getVersionOld().substring(0, 6), measurementConfig.getExecutionConfig().isRedirectSubprocessOutputToFile());
       run.addAction(rcaOverviewAction);
    }
 

diff --git a/src/main/java/de/dagere/peass/ci/logs/rca/RCALogOverviewAction.java b/src/main/java/de/dagere/peass/ci/logs/rca/RCALogOverviewAction.java
@@ -11,11 +11,13 @@ public class RCALogOverviewAction extends VisibleAction {
    private final Map<TestCase, List<RCALevel>> testLevelMap;
    private String version;
    private String versionOld;
+   private boolean redirectSubprocessOutputToFile;
 
-   public RCALogOverviewAction(final Map<TestCase, List<RCALevel>> testLevelMap, final String version, final String versionOld) {
+   public RCALogOverviewAction(final Map<TestCase, List<RCALevel>> testLevelMap, final String version, final String versionOld, final boolean redirectSubprocessOutputToFile) {
       this.testLevelMap = testLevelMap;
       this.version = version;
       this.versionOld = versionOld;
+      this.redirectSubprocessOutputToFile = redirectSubprocessOutputToFile;
    }
 
    public Map<TestCase, List<RCALevel>> getTestLevelMap() {
@@ -30,6 +32,10 @@ public String getVersionOld() {
       return versionOld;
    }
 
+   public boolean isRedirectSubprocessOutputToFile(){
+      return redirectSubprocessOutputToFile;
+   }
+
    @Override
    public String getIconFileName() {
       return "notepad.png";

diff --git a/src/main/java/de/dagere/peass/ci/logs/rts/RTSActionCreator.java b/src/main/java/de/dagere/peass/ci/logs/rts/RTSActionCreator.java
@@ -61,7 +61,7 @@ public void createRTSActions(final RTSInfos staticChanges) throws IOException {
    private void createOverviewAction(final Map<String, File> processSuccessRuns, final Map<TestCase, RTSLogData> rtsVmRuns, final Map<TestCase, RTSLogData> rtsVmRunsPredecessor,
          final RTSInfos rtsInfos) {
       RTSLogOverviewAction overviewAction = new RTSLogOverviewAction(processSuccessRuns, rtsVmRuns, rtsVmRunsPredecessor,
-            processSuccessRunSucceeded, measurementConfig.getExecutionConfig().getVersion(), measurementConfig.getExecutionConfig().getVersionOld());
+            processSuccessRunSucceeded, measurementConfig.getExecutionConfig().getVersion(), measurementConfig.getExecutionConfig().getVersionOld(),measurementConfig.getExecutionConfig().isRedirectSubprocessOutputToFile());
       overviewAction.setStaticChanges(rtsInfos.isStaticChanges());
       overviewAction.setStaticallySelectedTests(rtsInfos.isStaticallySelectedTests());
       run.addAction(overviewAction);

diff --git a/src/main/java/de/dagere/peass/ci/logs/rts/RTSLogOverviewAction.java b/src/main/java/de/dagere/peass/ci/logs/rts/RTSLogOverviewAction.java
@@ -17,15 +17,17 @@ public class RTSLogOverviewAction extends VisibleAction {
    private Map<TestCase, RTSLogData> vmRuns;
    private Map<TestCase, RTSLogData> predecessorVmRuns;
    private final String version, versionOld;
+   private boolean redirectSubprocessOutputToFile;
 
    public RTSLogOverviewAction(final Map<String, File> processSuccessRuns, final Map<TestCase, RTSLogData> vmRuns, final Map<TestCase, RTSLogData> predecessorVmRuns,
-         final Map<String, Boolean> processSuccessRunSucceeded, final String version, final String versionOld) {
+         final Map<String, Boolean> processSuccessRunSucceeded, final String version, final String versionOld, final boolean redirectSubprocessOutputToFile) {
       this.processSuccessRuns = processSuccessRuns;
       this.vmRuns = vmRuns;
       this.predecessorVmRuns = predecessorVmRuns;
       this.processSuccessRunSucceeded = processSuccessRunSucceeded;
       this.version = version;
       this.versionOld = versionOld;
+      this.redirectSubprocessOutputToFile = redirectSubprocessOutputToFile;
    }
 
    public Map<String, File> getProcessSuccessRuns() {
@@ -75,6 +77,10 @@ public void setStaticallySelectedTests(final boolean staticallySelectedTests) {
       this.staticallySelectedTests = staticallySelectedTests;
    }
 
+   public boolean isRedirectSubprocessOutputToFile(){
+      return redirectSubprocessOutputToFile;
+   }
+
    @Override
    public String getIconFileName() {
       return "notepad.png";