Capture more logs in ci

wildfly · Apr 26, 2024 · 645e162 · 645e162
1 parent 195b782
commit 645e162
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -115,14 +115,14 @@ jobs:
           . ~/cekit/bin/activate
           pushd wildfly-builder-image
           rm -rf tests/features/no-jdk11-*
-          cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave
+          cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave > test-logs-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1
           popd
       - name: Behave Tests JDK
         if: matrix.jdk != 'jdk11'
         run: |
           . ~/cekit/bin/activate
           pushd wildfly-builder-image
-          cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave > test-logs-${{ matrix.os }}-${{ matrix.java }}.txt 2>&1
+          cekit test --image=${{ env.WILDFLY_S2I_BUILDER_IMAGE }}:${{ env.WILDFLY_IMAGE_VERSION }} behave > test-logs-${{ matrix.os }}-${{ matrix.jdk }}.txt 2>&1
           popd
       - name: Additional Tests
         run: |
@@ -136,7 +136,9 @@ jobs:
         if: failure()
         with:
           name: test-logs-${{ matrix.os }}-${{ matrix.java }}
-          path: 'wildfly-builder-image/test-logs-${{ matrix.os }}-${{ matrix.java }}.txt'
+          path: |
+           wildfly-builder-image/test-logs-${{ matrix.os }}-${{ matrix.jdk }}.txt
+           /tmp/*.wfs2i.log
       - name: Display resources information
         if: failure()
         run: |

diff --git a/test/run b/test/run
@@ -1,8 +1,8 @@
 #!/bin/bash -e
 SCRIPT_DIR=$(dirname $0)
 test_dir="$(readlink -zf $(dirname "${BASH_SOURCE[0]}"))"
-log_file=$(mktemp -u --suffix=.log)
-s2i_log_file=$(mktemp -u --suffix=.log)
+log_file=$(mktemp -u --suffix=.wfs2i.log)
+s2i_log_file=$(mktemp -u --suffix=.wfs2i.log)
 cid_file=$(mktemp -u --suffix=.cid)
 
 # Since we built the image locally, we don't want S2I attempt to pull