feat: stage支持质量红线的准入准出 TencentBlueKing#4732 整体失败

royalhuang · Aug 20, 2021 · 3677c25 · 3677c25
1 parent 5a7b12b
commit 3677c25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.../com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt b/.../com/tencent/devops/process/engine/control/command/stage/impl/CheckPauseReviewStageCmd.kt
@@ -132,7 +132,7 @@ class CheckPauseReviewStageCmd(
         variables: Map<String, String>
     ): Boolean {
         if (stage.checkIn?.ruleIds.isNullOrEmpty()) return false
-        try {
+        return try {
             val request = BuildCheckParamsV3(
                 projectId = event.projectId,
                 pipelineId = event.pipelineId,
@@ -149,10 +149,10 @@ class CheckPauseReviewStageCmd(
             LOG.info("ENGINE|${event.buildId}|${event.source}|STAGE_QUALITY_CHECK_RESPONSE|${event.stageId}|" +
                 "response=$result|ruleIds=${stage.checkIn?.ruleIds}")
             stage.checkIn!!.checkTimes = result.checkTimes
-            return !result.success
+            !result.success
         } catch (ignore: Throwable) {
             LOG.error("ENGINE|${event.buildId}|${event.source}|STAGE_QUALITY_CHECK_ERROR|${event.stageId}", ignore)
-            return true
+            true
         }
     }
 

diff --git a/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt b/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt
@@ -92,6 +92,8 @@ class UpdateStateForStageCmdFinally(
                 pipelineStageService.skipStage(userId = event.userId, buildStage = stage)
             } else if (commandContext.buildStatus == BuildStatus.QUALITY_CHECK_FAIL) {
                 pipelineStageService.checkQualityFailStage(userId = event.userId, buildStage = stage)
+                // #4732 如果存在红线准入准出失败则构建整体直接失败
+                commandContext.buildStatus = BuildStatus.FAILED
             }
             nextOrFinish(event, stage, commandContext)
             sendStageEndCallBack(stage, event)