From 6bc85155f9aa829ca93696db189460543d75953f Mon Sep 17 00:00:00 2001
From: Paul Grey <greyp9@yahoo.com>
Date: Wed, 2 Mar 2022 16:21:41 -0500
Subject: [PATCH] NIFI-9749 - Capture additional logging for system-test
 workflow runs

This closes #5827

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 .github/workflows/system-tests.yml                 | 14 ++++++++++----
 .../nifi-stateless-system-test-suite/pom.xml       |  6 ++++++
 nifi-system-tests/nifi-system-test-suite/pom.xml   |  6 ++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 0654236fa6..4c453658d7 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -82,11 +82,14 @@ jobs:
           ${{ env.MAVEN_RUN_ARGUMENTS }}
           ${{ env.MAVEN_PROJECTS }}
       - name: Upload Troubleshooting Logs
-        if: ${{ failure() }}
+        if: failure() || cancelled()
         uses: actions/upload-artifact@v2
         with:
           name: ubuntu-latest-troubleshooting-logs
-          path: "**/target/troubleshooting/"
+          path: |
+            nifi-system-tests/nifi-system-test-suite/target/failsafe-reports/**/*.txt
+            nifi-system-tests/nifi-system-test-suite/target/surefire-reports/**/*.txt
+            nifi-system-tests/nifi-system-test-suite/target/troubleshooting/**/*
           retention-days: 7
 
   macos:
@@ -126,9 +129,12 @@ jobs:
           ${{ env.MAVEN_RUN_ARGUMENTS }}
           ${{ env.MAVEN_PROJECTS }}
       - name: Upload Troubleshooting Logs
-        if: ${{ failure() }}
+        if: failure() || cancelled()
         uses: actions/upload-artifact@v2
         with:
           name: macos-latest-troubleshooting-logs
-          path: "**/target/troubleshooting/"
+          path: |
+            nifi-system-tests/nifi-system-test-suite/target/failsafe-reports/**/*.txt
+            nifi-system-tests/nifi-system-test-suite/target/surefire-reports/**/*.txt
+            nifi-system-tests/nifi-system-test-suite/target/troubleshooting/**/*
           retention-days: 7
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
index e0d23e72b3..370f3c006e 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
@@ -153,6 +153,12 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
diff --git a/nifi-system-tests/nifi-system-test-suite/pom.xml b/nifi-system-tests/nifi-system-test-suite/pom.xml
index 433103d272..b65d6dca46 100644
--- a/nifi-system-tests/nifi-system-test-suite/pom.xml
+++ b/nifi-system-tests/nifi-system-test-suite/pom.xml
@@ -26,6 +26,12 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>