test: detect error log (#1882)

pingcap · May 17, 2022 · bdac542 · bdac542
1 parent f062b88
commit bdac542
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/.github/workflows/integrate-cluster-cmd.yaml b/.github/workflows/integrate-cluster-cmd.yaml
@@ -84,20 +84,24 @@ jobs:
 
       - name: Collect component log
         working-directory: ${{ env.working-directory }}
-        if: ${{ failure() }}
         # if: always()
         run: |
           docker exec tiup-cluster-control bash /tiup-cluster/tests/tiup-cluster/script/pull_log.sh /tiup-cluster/logs
           ls ${{ env.working-directory }}
-          tar czvf ${{ env.working-directory }}/logs.tar.gz ${{ env.working-directory }}/logs/
+
+      - name: Detect error log
+        working-directory: ${{ env.working-directory }}
+        # if: always()
+        run: |
+          bash ./tests/tiup-cluster/script/detect_error.sh ./logs/
 
       - name: Upload component log
         if: ${{ failure() }}
         # if: always()
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: component_logs
-          path: ${{ env.working-directory }}/logs.tar.gz
+          path: ${{ env.working-directory }}/logs/
 
       - name: Output cluster debug log
         working-directory: ${{ env.working-directory }}

diff --git a/.github/workflows/integrate-cluster-scale.yaml b/.github/workflows/integrate-cluster-scale.yaml
@@ -84,20 +84,24 @@ jobs:
 
       - name: Collect component log
         working-directory: ${{ env.working-directory }}
-        if: ${{ failure() }}
         # if: always()
         run: |
           docker exec tiup-cluster-control bash /tiup-cluster/tests/tiup-cluster/script/pull_log.sh /tiup-cluster/logs
           ls ${{ env.working-directory }}
-          tar czvf ${{ env.working-directory }}/logs.tar.gz ${{ env.working-directory }}/logs/
+
+      - name: Detect error log
+        working-directory: ${{ env.working-directory }}
+        # if: always()
+        run: |
+          bash ./tests/tiup-cluster/script/detect_error.sh ./logs/
 
       - name: Upload component log
         if: ${{ failure() }}
         # if: always()
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: cluster_logs
-          path: ${{ env.working-directory }}/logs.tar.gz
+          path: ${{ env.working-directory }}/logs/
 
       - name: Output cluster debug log
         working-directory: ${{ env.working-directory }}

diff --git a/tests/tiup-cluster/script/detect_error.sh b/tests/tiup-cluster/script/detect_error.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -eu
+
+err_num=$(find $1 -name "*.log" -exec grep "\[ERROR\]" {} \; | wc -l)
+if [ ${err_num} != "0" ]; then
+  echo "detect ${err_num} [ERROR] log"
+  exit 1
+fi
+
+err_num=$(find $1 -name "*stderr.log" -exec cat {} \; | wc -l)
+if [ ${err_num} != "0" ]; then
+  echo "detect ${err_num} stderr log"
+  exit 1
+fi
+
+echo "no error log found"