Merge branch 'master' into improve-doc-check

apache · Aug 21, 2024 · 5d51f30 · 5d51f30
2 parents 1442215 + 1fac6ab
commit 5d51f30
Show file tree

Hide file tree

Showing 7 changed files with 732 additions and 11 deletions.
diff --git a/.github/workflows/backend-build-test.yml b/.github/workflows/backend-build-test.yml
@@ -72,9 +72,11 @@ jobs:
         sudo docker-compose up --exit-code-from testing --remove-orphans
 
     # upload application logs
-    - name: Upload logs
+    - name: Upload logs & API test reports
       uses: actions/upload-artifact@v3
       if: always()
       with:
         name: hz-logs-${{ github.run_id }}
-        path: e2e/logs/
+        path: |
+          e2e/logs/
+          e2e/report/
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -25,7 +25,8 @@ services:
     volumes:
       - ./data/:/work/data/
       - ./testsuite.yaml:/work/testsuite.yaml
-    command: atest run -p /work/testsuite.yaml --report md
+      - ./report/report.md:/report.md
+    command: atest run -p /work/testsuite.yaml --level warn --thread 3 --report md --report-file /report.md
     depends_on:
       hertzbeat:
         condition: service_healthy

diff --git a/e2e/report/report.md b/e2e/report/report.md
@@ -0,0 +1 @@
+keep, not delete!
diff --git a/e2e/testsuite.yaml b/e2e/testsuite.yaml
@@ -58,11 +58,6 @@ items:
       }
   expect:
     statusCode: 409
-- name: missing-auth-header
-  request:
-    api: /api/monitors
-  expect:
-    statusCode: 401
 - name: monitorList
   request:
     api: /api/monitors?pageIndex=0&pageSize=8
@@ -71,7 +66,11 @@ items:
   expect:
     bodyFieldsExpect:
       code: "0"
-
+- name: missing-auth-header
+  request:
+    api: /api/monitors
+  expect:
+    statusCode: 401
 - name: createSitemapMonitor
   request:
     api: /api/monitor