chore: fix test cloud e2e engine workflow error (#565)

* chore: fix test cloud e2e engine

* chore: fix Invalid format

* chore: add set_engine_summary_result_url_2

* chore: change test title

Author: JashBook

.github/utils/utils.sh

@@ -1052,6 +1052,31 @@ set_engine_summary_result_url() {
     echo "$ENGINE_SUMMARY_RESULT_TEMP"
 }
 
+set_engine_summary_result_url_2() {
+     TEST_RESULT="$(echo "${TEST_RESULT}" | sed 's/ /#/g')"
+     ENGINE_SUMMARY_RESULT_TEMP=""
+     for coverage_result in $(echo "$COVERAGE_RESULT" | sed 's/##/ /g'); do
+         engine_name=${coverage_result%%|*}
+         job_url="null"
+         for test_result in `echo "$TEST_RESULT" | sed 's/##/ /g'`; do
+             test_types=${test_result%%|*}
+             for test_type in `echo "$test_types" | sed 's/,/ /g'`; do
+                if [[ "$test_type" == "$engine_name" ]]; then
+                    job_url=${test_result##*|}
+                    break
+                fi
+             done
+             if [[ "${job_url}" != "null" ]] then
+                break
+             fi
+         done
+
+         coverage_result=${coverage_result/\#/ }
+         ENGINE_SUMMARY_RESULT_TEMP="${ENGINE_SUMMARY_RESULT_TEMP}##${coverage_result}|${REPORT_URL}|${job_url}"
+     done
+     echo "$ENGINE_SUMMARY_RESULT_TEMP"
+ }
+
 get_gh_job_url() {
     gh_job_url="https://github.com/$GITHUB_REPO/actions/runs/$RUN_ID"
     for i in {1..2}; do
@@ -1417,6 +1442,9 @@ main() {
         44)
             get_gh_job_url
         ;;
+        45)
+            set_engine_summary_result_url_2
+        ;;
     esac
 }
 

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

@@ -7,7 +7,7 @@ on:
         description: "The specify version of GO (e.g. openapi-test|adminapi-test)"
         type: string
         required: false
-        default: 'openapi-test'
+        default: 'openapi-test|adminapi-test'
       CLOUD_ENV_NAME:
         description: "The cloud env name of test (e.g. dev) "
         type: string
@@ -34,7 +34,7 @@ on:
         description: "The specify version of GO (e.g. openapi-test|adminapi-test)"
         type: string
         required: false
-        default: 'openapi-test'
+        default: 'openapi-test|adminapi-test'
       CLOUD_ENV_NAME:
         description: "The cloud env name of test (e.g. dev) "
         type: string
@@ -107,7 +107,7 @@ jobs:
 
   e2e-api-test:
     needs: [ get-test-type ]
-    name: ${{ matrix.test-type }}-${{ needs.get-test-type.outputs.cloud-env-name }}
+    name: ${{ matrix.test-type }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.get-test-type.outputs.test-type) }}
@@ -347,7 +347,6 @@ jobs:
           fi
 
       - name: Get ${{ matrix.test-type }} API Coverage List
-        if: ${{ always() && matrix.test-type != 'engine-test' }}
         run: |
           coverage_file_log="test_api_coverage_result.log"
           coverage_file_log_path="${{ github.workspace }}/${coverage_file_log}"
@@ -396,19 +395,19 @@ jobs:
           for test_type_tmp in $(echo "${TEST_TYPES}" | sed 's/|/ /g' ); do
               case "$test_type_tmp" in
                   openapi-test)
-                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.openapi-test-result }}"
+                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.openapi-test-result }}"
                       if [[ -n "${{ needs.e2e-api-test.outputs.openapi-summary }}" ]]; then
                           API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##openapi|${{ needs.e2e-api-test.outputs.openapi-summary }}"
                       fi
                   ;;
                   adminapi-test)
-                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.adminapi-test-result }}"
+                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.adminapi-test-result }}"
                       if [[ -n "${{ needs.e2e-api-test.outputs.adminapi-summary }}" ]]; then
                           API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##adminapi|${{ needs.e2e-api-test.outputs.adminapi-summary }}"
                       fi
                   ;;
                   *)
-                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}-${CLOUD_ENV_NAME}|${{ needs.e2e-api-test.outputs.test-result }}"
+                      TEST_RESULT="${TEST_RESULT}##${test_type_tmp}|${{ needs.e2e-api-test.outputs.test-result }}"
                       if [[ -n "${{ needs.e2e-api-test.outputs.api-summary }}" ]]; then
                           API_COVERAGE_SUMMARY="${API_COVERAGE_SUMMARY}##api|${{ needs.e2e-api-test.outputs.api-summary }}"
                       fi
@@ -426,15 +425,15 @@ jobs:
           
           export TZ='Asia/Shanghai'
           date_ret=$(date +%Y-%m-%d-%T)
-          TEST_TITLE="[${CLOUD_BRANCH}] Cloud E2E API Test [${date_ret}]"
+          TEST_TITLE="[${CLOUD_BRANCH}][${CLOUD_ENV_NAME}] Cloud E2E API Test [${date_ret}]"
           
           python3 .github/utils/send_mesage.py \
               --send-type ginkgo \
               --url "${{ vars.CLOUD_E2E_BOT_WEBHOOK }}" \
               --title "$TEST_TITLE" \
               --result "$TEST_RESULT"
           
-          TEST_TITLE_SUMMARY="[${CLOUD_BRANCH}] Cloud E2E API Coverage Summary [${date_ret}]"
+          TEST_TITLE_SUMMARY="[${CLOUD_BRANCH}][${CLOUD_ENV_NAME}] Cloud E2E API Coverage Summary [${date_ret}]"
           if [[ -n "${API_COVERAGE_SUMMARY}" && "${{ needs.get-test-type.outputs.cloud-branch }}" == "main" ]]; then
               echo "API_COVERAGE_SUMMARY:${API_COVERAGE_SUMMARY}"
               API_COVERAGE_SUMMARY_TMP="$(bash .github/utils/utils.sh \