NIFI-9749 - Capture additional logging for system-test workflow runs

This closes apache#5827 Signed-off-by: David Handermann <[email protected]>
davyam · Mar 3, 2022 · 6bc8515 · 6bc8515
1 parent 272f412
commit 6bc8515
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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>