Improve output for all ci/cd tests

Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>

3 files changed, 12 insertions, 9 deletions

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index db0bc26f..4d5e1338 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -107,6 +107,8 @@ jobs:
       - name: Integration Tests
         working-directory: ./tests
         run: |
+          docker logs -f | ( echo -n "CONTAINER::"; cat )
+          docker exec nextcloudpi bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
           cmd=(python activation_tests.py --no-gui localhost 8443 4443)
           [[ "${{ matrix.arch }}" == "x86" ]] || cmd+=(--timeout 300)
           "${cmd[@]}" || {
@@ -124,6 +126,13 @@ jobs:
           echo "Activation test successful"
           python system_tests.py --no-ping --non-interactive || {
             echo "System test failed!"
+            echo "Container logs:"
+            echo "==========================================="
+            docker logs nextcloudpi
+            echo "Last lines of ncp.log:"
+            echo "==========================================="
+            docker exec nextcloudpi tail /var/log/ncp.log;
+            exit 1
             exit 1
           }
           echo "System test successful"
diff --git a/.github/workflows/build-lxd.yml b/.github/workflows/build-lxd.yml
index 89c09dbe..faa50c90 100644
--- a/.github/workflows/build-lxd.yml
+++ b/.github/workflows/build-lxd.yml
@@ -226,6 +226,7 @@ jobs:
       - name: Test LXD Image
         working-directory: ./tests
         run: |
+          lxc exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
           python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
             echo "Activation test failed!"
             echo "Geckodriver logs:"
diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
index b2a2037a..fad3d2c8 100644
--- a/.github/workflows/build-sd-images.yml
+++ b/.github/workflows/build-sd-images.yml
@@ -145,7 +145,8 @@ jobs:
           
           trap 'sudo machinectl terminate ncp' EXIT
           
-          sudo systemd-nspawn --boot -D ./raspbian_root/ -M ncp --hostname=nextcloudpi &> container.log &
+          sudo systemd-nspawn --boot -D ./raspbian_root/ -M ncp --hostname=nextcloudpi |& awk '{ print "CONTAINER::" $0 }' &
+          sudo systemd-run --machine=ncp -P --wait bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
           sleep 30
           
           success=false
@@ -160,8 +161,6 @@ jobs:
           
           [[ "$success" == "true" ]] || {
             echo "Could not reach container. Aborting..."
-            echo "Container logs:"
-            cat container.log
             exit 1
           }
           
@@ -184,8 +183,6 @@ jobs:
           done
           [[ "$success" == "true" ]] || {
             echo "Activation test failed in all attempts!"
-            echo "Container logs:"
-            cat container.log
             exit 1
           }
           
@@ -203,8 +200,6 @@ jobs:
           done
           [[ "$success" == "true" ]] || {
             echo "System test failed in all attempts!"
-            echo "Container logs:"
-            cat container.log
             exit 1
           }
           
@@ -228,7 +223,5 @@ jobs:
           
           [[ "$success" == "true" ]] || {
             echo "Nextcloud test failed in all attempts!"
-            echo "Container logs:"
-            cat container.log
             exit 1
           }