diff --git a/.github/workflows/deploy-test.yaml b/.github/workflows/deploy-test.yaml
index a062e2cc30..8d5c950b31 100644
--- a/.github/workflows/deploy-test.yaml
+++ b/.github/workflows/deploy-test.yaml
@@ -146,7 +146,7 @@ jobs:
         run: |
           docker-compose ps -a || true
           mkdir -p logs
-          docker-compose logs > ./logs/test-${{ matrix.mode }}-${{ matrix.task }}.log 2>&1 || echo "export logs failed"
+          bash ../../../scripts/export_log_docker.sh ./logs || echo "export logs failed"
       - name: 'Send mail'
         if: ${{ failure() }}
         uses: dawidd6/action-send-mail@v3
diff --git a/tests/scripts/export_log_docker.sh b/tests/scripts/export_log_docker.sh
new file mode 100644
index 0000000000..ff3616eb0d
--- /dev/null
+++ b/tests/scripts/export_log_docker.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Exit immediately for non zero status
+set -e
+
+log_dir=${1:-"logs"}
+array=($(docker-compose ps -a|awk 'NR == 1 {next} {print $1}'))
+echo ${array[@]}
+if [ ! -d $log_dir ];
+then
+    mkdir -p $log_dir
+fi
+echo "export logs start"
+for container in ${array[*]}
+do
+echo "export logs for container $container "
+docker logs $container > ./$log_dir/$container.log 2>&1 || echo "export logs for container $container failed"
+done
+echo "export logs done"