Skip to content

Commit 6530cea

Browse files
JashBookJashBook
committed
chore: test refine e2e workflow
1 parent c2cd241 commit 6530cea

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎.github/workflows/cloud-e2e-api.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,19 +304,19 @@ jobs:
304304
for test_type_tmp in $(echo "${TEST_TYPES}" | sed 's/|/ /g' ); do
305305
case "$test_type_tmp" in
306306
openapi-test)
307-
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.openapi-test-result }}"
307+
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.openapi-test-result }}"
308308
if [[ -n "${{ needs.e2e-api-test.outputs.openapi-summary }}" ]]; then
309309
API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##openapi|${{ needs.e2e-api-test.outputs.openapi-summary }}"
310310
fi
311311
;;
312312
adminapi-test)
313-
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.adminapi-test-result }}"
313+
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.adminapi-test-result }}"
314314
if [[ -n "${{ needs.e2e-api-test.outputs.adminapi-summary }}" ]]; then
315315
API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##adminapi|${{ needs.e2e-api-test.outputs.adminapi-summary }}"
316316
fi
317317
;;
318318
*)
319-
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.test-result }}"
319+
TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.test-result }}"
320320
if [[ -n "${{ needs.e2e-api-test.outputs.api-summary }}" ]]; then
321321
API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##api|${{ needs.e2e-api-test.outputs.api-summary }}"
322322
fi
@@ -334,15 +334,15 @@ jobs:
334334
335335
export TZ='Asia/Shanghai'
336336
date_ret=$(date +%Y-%m-%d-%T)
337-
TEST_TITLE="[${CLOUD_BRANCH}] Cloud E2E API Test [${date_ret}]"
337+
TEST_TITLE="[${CLOUD_BRANCH}] Cloud E2E API Test [${CLOUD_ENV_NAME}][${date_ret}]"
338338
339339
python3 .github/utils/send_mesage.py \
340340
--send-type ginkgo \
341341
--url "${{ vars.TEST_BOT_WEBHOOK }}" \
342342
--title "$TEST_TITLE" \
343343
--result "$TEST_RESULT"
344344
345-
TEST_TITLE_SUMMARY="[${CLOUD_BRANCH}] Cloud E2E API Coverage Summary [${date_ret}]"
345+
TEST_TITLE_SUMMARY="[${CLOUD_BRANCH}] Cloud E2E API Test Coverage Summary [${CLOUD_ENV_NAME}][${date_ret}]"
346346
if [[ -n "${API_COVERAGE_SUMMARY}" && "${{ needs.get-test-type.outputs.cloud-branch }}" == "main" ]]; then
347347
echo "API_COVERAGE_SUMMARY:${API_COVERAGE_SUMMARY}"
348348
API_COVERAGE_SUMMARY_TMP="$(bash .github/utils/utils.sh \

‎.github/workflows/cloud-e2e-engine.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -365,61 +365,61 @@ jobs:
365365
01)
366366
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-1 }}"
367367
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-1 }}"
368-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
368+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
369369
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
370370
;;
371371
02)
372372
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-2 }}"
373373
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-2 }}"
374-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
374+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
375375
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
376376
;;
377377
03)
378378
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-3 }}"
379379
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-3 }}"
380-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
380+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
381381
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
382382
;;
383383
04)
384384
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-4 }}"
385385
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-4 }}"
386-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
386+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
387387
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
388388
;;
389389
05)
390390
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-5 }}"
391391
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-5 }}"
392-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
392+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
393393
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
394394
;;
395395
06)
396396
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-6 }}"
397397
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-6 }}"
398-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
398+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
399399
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
400400
;;
401401
07)
402402
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-7 }}"
403403
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-7 }}"
404-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
404+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
405405
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
406406
;;
407407
08)
408408
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-8 }}"
409409
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-8 }}"
410-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
410+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
411411
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
412412
;;
413413
09)
414414
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-9 }}"
415415
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-9 }}"
416-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
416+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
417417
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
418418
;;
419419
10)
420420
TEST_RESULT="${{ needs.e2e-engine-test.outputs.test-result-10 }}"
421421
ENGINE_SUMMARY="${{ needs.e2e-engine-test.outputs.test-summary-10 }}"
422-
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}-${CLOUD_ENV_NAME}|${TEST_RESULT}"
422+
TEST_RESULT_ALL="${TEST_RESULT_ALL}##${test_engines}|${TEST_RESULT}"
423423
ENGINE_SUMMARY_ALL="${ENGINE_SUMMARY_ALL}##${ENGINE_SUMMARY}"
424424
;;
425425
esac
@@ -435,15 +435,15 @@ jobs:
435435
436436
export TZ='Asia/Shanghai'
437437
date_ret=$(date +%Y-%m-%d-%T)
438-
TEST_TITLE="[${CLOUD_BRANCH}] Cloud E2E Engine Test [${date_ret}]"
438+
TEST_TITLE="[${CLOUD_BRANCH}] Cloud E2E Engine Test [${CLOUD_ENV_NAME}][${date_ret}]"
439439
440440
python3 .github/utils/send_mesage.py \
441441
--send-type ginkgo \
442442
--url "${{ vars.TEST_BOT_WEBHOOK }}" \
443443
--title "$TEST_TITLE" \
444444
--result "${TEST_RESULT_ALL}"
445445
446-
TEST_TITLE_ENGINE_SUMMARY="[${CLOUD_BRANCH}] Cloud E2E Engine API Summary [${date_ret}]"
446+
TEST_TITLE_ENGINE_SUMMARY="[${CLOUD_BRANCH}] Cloud E2E Engine Test API Summary [${CLOUD_ENV_NAME}][${date_ret}]"
447447
ENGINE_REPORT_FILE_NAME="${{ env.ENGINE_REPORT_FILE_NAME }}"
448448
if [[ -n "${ENGINE_SUMMARY_ALL}" ]]; then
449449
APECLOUD_CURRENT_VERSION="${{ needs.get-test-engine.outputs.current-version }}"

0 commit comments

Comments
 (0)