fix

Signed-off-by: andyziye <yeziyu@starrocks.com>

.github/workflows/ci-pipeline.yml

@@ -1148,7 +1148,7 @@ jobs:
         run: |
           rm -rf ${{ github.workspace }} && mkdir -p ${{ github.workspace }}
 
-      - name: Restart FE (${{needs.deploy.outputs.be_list}})
+      - name: Restart FE (${{needs.deploy.outputs.fe}})
         run: |
           rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
           ./bin/restart-fe.sh \

.github/workflows/inspection-pipeline.yml

@@ -111,12 +111,17 @@ jobs:
             echo "ALL_LINUX=${{ inputs.ALL_LINUX }}" >> $GITHUB_OUTPUT
             echo "WITH_FEATURE_COV=${{ inputs.WITH_FEATURE_COV }}" >> $GITHUB_OUTPUT
             echo "IS_ARM=${{ inputs.IS_ARM }}" >> $GITHUB_OUTPUT
-            echo "INCLUDE_ADMIT=false" >> $GITHUB_OUTPUT
+            
           
             # check cov params
-            if [[ "${{ inputs.WITH_FEATURE_COV }}" == "true" && "${{ inputs.COV_BASE_COMMIT }}" == "" ]]; then
-              echo "::error::[Coverage] Base commit is missing!"
-              exit 1
+            if [[ "${{ inputs.WITH_FEATURE_COV }}" == "true" ]]; then
+              echo "INCLUDE_ADMIT=true" >> $GITHUB_OUTPUT
+              if [[ "${{ inputs.COV_BASE_COMMIT }}" == "" ]]; then
+                echo "::error::[Coverage] Base commit is missing!"
+                exit 1
+              fi
+            else
+              echo "INCLUDE_ADMIT=false" >> $GITHUB_OUTPUT
             fi
           fi
           
@@ -191,6 +196,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BRANCH: ${{ needs.info.outputs.BRANCH }}
       PR_NUMBER: ${{ needs.info.outputs.PR_NUMBER }}
+      WITH_FEATURE_COV: ${{ needs.info.outputs.WITH_FEATURE_COV }}
     steps:
       - name: clean
         run: |
@@ -480,6 +486,7 @@ jobs:
     env:
       commit_id: ${{ inputs.COMMIT_ID }}
       base_commit_id: ${{ inputs.COV_BASE_COMMIT }}
+      branch: ${{ needs.info.outputs.BRANCH }}
     outputs:
       DIFF_FILE: ${{ steps.diff.outputs.DIFF_FILE }}
     needs:
@@ -500,6 +507,10 @@ jobs:
       - name: diff
         id: diff
         run: |
+          git config --global user.name "wanpengfei-git"
+          git config --global user.email "wanpengfei91@163.com"
+          git checkout ${branch}
+          git reset ${commit_id} --hard
           diff_file=${SHARE_PATH}/${base_commit_id}_${commit_id}.diff
           git diff ${base_commit_id} ${commit_id} > ${diff_file}
           echo "DIFF_FILE=${diff_file}" >> $GITHUB_OUTPUT

.github/workflows/inspection-reusable-pipeline.yml

@@ -230,7 +230,12 @@ jobs:
         run: |
           rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
           [[ "${WITH_FEATURE_COV}" != "true" ]] && skip_gcov="--skip-gcov"
-          ./bin/system-cov-be.sh --pr ${PR_NUMBER} --branch ${BRANCH} --repository ${{ github.repository }} ${skip_gcov}
+          ./bin/system-cov-be.sh \
+            --pr ${PR_NUMBER} \
+            --branch ${BRANCH} \
+            --build Release \
+            --repository ${{ github.repository }} \
+            --gcov_next_suffix admit ${skip_gcov}
 
       - name: Clean ENV
         if: always()
@@ -293,6 +298,68 @@ jobs:
       - name: Clean ENV
         if: always()
         run: rm -rf ${{ github.workspace }}/*
+  
+  restart-fe-after-admit:
+    runs-on: [self-hosted, normal]
+    name: Restart FE(Admit)
+    needs: [deploy, admit]
+    if: always() && needs.admit.result == 'success'
+    timeout-minutes: 20
+    env:
+      FE_NODE: ${{ needs.deploy.outputs.fe }}
+      BE_NODE: ${{ needs.deploy.outputs.be }}
+      BE_LIST: ${{ needs.deploy.outputs.be_list }}
+    steps:
+      - name: CLEAN
+        run: |
+          rm -rf ${{ github.workspace }} && mkdir -p ${{ github.workspace }}
+
+      - name: Restart FE (${{needs.deploy.outputs.be_list}})
+        run: |
+          rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
+          ./bin/restart-fe.sh \
+            --pr ${PR_NUMBER} \
+            --branch ${BRANCH} \
+            --build Release \
+            --exec-module admit \
+            --repository ${{ github.repository }} \
+            --exec-module admit
+
+      - name: Clean ENV
+        if: always()
+        run: |
+          rm -rf ${{ github.workspace }}/*
+
+  restart-be-after-admit:
+    runs-on: [self-hosted, normal]
+    name: Restart BE(Admit)
+    needs: [deploy, admit]
+    if: always() && needs.admit.result == 'success'
+    timeout-minutes: 20
+    env:
+      FE_NODE: ${{ needs.deploy.outputs.fe }}
+      BE_NODE: ${{ needs.deploy.outputs.be }}
+      BE_LIST: ${{ needs.deploy.outputs.be_list }}
+    steps:
+      - name: CLEAN
+        run: |
+          rm -rf ${{ github.workspace }} && mkdir -p ${{ github.workspace }}
+
+      - name: Restart BE (${{needs.deploy.outputs.fe}})
+        run: |
+          rm -rf ./ci-tool && cp -rf /var/lib/ci-tool ./ci-tool && cd ci-tool && git pull && source lib/init.sh
+          [[ "${WITH_FEATURE_COV}" != "true" ]] && skip_gcov="--skip-gcov"
+          ./bin/system-cov-be.sh \
+            --pr ${PR_NUMBER} \
+            --branch ${BRANCH} \
+            --build Release \
+            --repository ${{ github.repository }} \
+            --gcov_pre_suffix admit --restart-without-gcov ${skip_gcov}
+
+      - name: Clean ENV
+        if: always()
+        run: |
+          rm -rf ${{ github.workspace }}/*
 
   clean:
     runs-on: [self-hosted, normal]
@@ -301,6 +368,8 @@ jobs:
       - deploy
       - admit
       - SQL-Tester
+      - restart-fe-after-admit
+      - restart-be-after-admit
     if: always()
     env:
       conf_file: ${{ needs.deploy.outputs.deploy_conf_file }}