feat: stage支持质量红线的准入准出 TencentBlueKing#4732 增加准入质量红线控制逻辑

royalhuang · Aug 8, 2021 · e1d1de9 · e1d1de9
1 parent c3734e4
commit e1d1de9
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 5 deletions.
diff --git a/...s/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt b/...s/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineBuildStageDao.kt
@@ -260,6 +260,23 @@ class PipelineBuildStageDao {
         }
     }
 
+    fun updateOptions(
+        dslContext: DSLContext,
+        buildId: String,
+        stageId: String,
+        controlOption: PipelineBuildStageControlOption,
+        checkIn: StagePauseCheck? = null,
+        checkOut: StagePauseCheck? = null
+    ): Int {
+        return with(T_PIPELINE_BUILD_STAGE) {
+            val update = dslContext.update(this)
+                .set(CONDITIONS, JsonUtil.toJson(controlOption))
+            if (checkIn != null) update.set(CHECK_IN, JsonUtil.toJson(checkIn))
+            if (checkOut != null) update.set(CHECK_OUT, JsonUtil.toJson(checkOut))
+            update.where(BUILD_ID.eq(buildId)).and(STAGE_ID.eq(stageId)).execute()
+        }
+    }
+
     fun update(
         dslContext: DSLContext,
         buildId: String,

diff --git a/...iz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt b/...iz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt
@@ -36,7 +36,6 @@ import com.tencent.devops.common.pipeline.pojo.StageReviewRequest
 import com.tencent.devops.common.websocket.enum.RefreshType
 import com.tencent.devops.process.engine.common.BS_MANUAL_START_STAGE
 import com.tencent.devops.process.engine.common.BS_STAGE_CANCELED_END_SOURCE
-import com.tencent.devops.process.engine.common.BS_STAGE_QUALITY_CHECK_FAIL_END_SOURCE
 import com.tencent.devops.process.engine.dao.PipelineBuildDao
 import com.tencent.devops.process.engine.dao.PipelineBuildStageDao
 import com.tencent.devops.process.engine.dao.PipelineBuildSummaryDao
@@ -137,6 +136,29 @@ class PipelineStageService @Autowired constructor(
         }
     }
 
+    fun checkQualityFailStage(userId: String, buildStage: PipelineBuildStage) {
+        with(buildStage) {
+            val allStageStatus = stageBuildDetailService.stageCheckQualityFail(buildId = buildId, stageId = stageId)
+            dslContext.transaction { configuration ->
+                val context = DSL.using(configuration)
+                pipelineBuildStageDao.updateOptions(
+                    dslContext = context, buildId = buildId,
+                    stageId = stageId, controlOption = controlOption!!,
+                    checkIn = checkIn, checkOut = checkOut
+                )
+                pipelineBuildDao.updateBuildStageStatus(
+                    dslContext = context, buildId = buildId, stageStatus = allStageStatus
+                )
+            }
+            pipelineEventDispatcher.dispatch(
+                PipelineBuildWebSocketPushEvent(
+                    source = "checkQualityFailStage", projectId = projectId, pipelineId = pipelineId,
+                    userId = userId, buildId = buildId, refreshTypes = RefreshType.HISTORY.binary
+                )
+            )
+        }
+    }
+
     fun pauseStage(userId: String, buildStage: PipelineBuildStage) {
         with(buildStage) {
             // TODO 暂时只处理准入逻辑，后续和checkOut保持逻辑一致

diff --git a/...c/main/kotlin/com/tencent/devops/process/engine/service/detail/StageBuildDetailService.kt b/...c/main/kotlin/com/tencent/devops/process/engine/service/detail/StageBuildDetailService.kt
@@ -190,8 +190,9 @@ class StageBuildDetailService(
         controlOption: PipelineBuildStageControlOption,
         checkIn: StagePauseCheck?,
         checkOut: StagePauseCheck?
-    ) {
+    ): List<BuildStageStatus> {
         logger.info("[$buildId]|stage_cancel|stageId=$stageId")
+        var allStageStatus: List<BuildStageStatus>? = null
         update(buildId, object : ModelInterface {
             var update = false
 
@@ -203,6 +204,7 @@ class StageBuildDetailService(
                     stage.stageControlOption = controlOption.stageControlOption
                     stage.checkIn = checkIn
                     stage.checkOut = checkOut
+                    allStageStatus = fetchHistoryStageStatus(model)
                     return Traverse.BREAK
                 }
                 return Traverse.CONTINUE
@@ -212,6 +214,7 @@ class StageBuildDetailService(
                 return update
             }
         }, BuildStatus.FAILED)
+        return allStageStatus ?: emptyList()
     }
 
     fun stageReview(

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
@@ -86,7 +86,7 @@ class CheckPauseReviewStageCmd(
                 commandContext.stage.checkIn?.status = BuildStatus.QUALITY_CHECK_FAIL.name
                 commandContext.buildStatus = BuildStatus.QUALITY_CHECK_FAIL
                 commandContext.latestSummary = "s(${stage.stageId}) failed with QUALITY_CHECK_IN"
-                commandContext.cmdFlowState = CmdFlowState.CONTINUE
+                commandContext.cmdFlowState = CmdFlowState.FINALLY
                 return
             }
 

diff --git a/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt b/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt
@@ -89,6 +89,8 @@ class UpdateStateForStageCmdFinally(
         } else if (commandContext.buildStatus.isFinish()) { // 当前Stage结束
             if (commandContext.buildStatus == BuildStatus.SKIP) { // 跳过
                 pipelineStageService.skipStage(userId = event.userId, buildStage = stage)
+            } else if (commandContext.buildStatus == BuildStatus.QUALITY_CHECK_FAIL) {
+                pipelineStageService.checkQualityFailStage(userId = event.userId, buildStage = stage)
             }
             nextOrFinish(event, stage, commandContext)
             sendStageEndCallBack(stage, event)
@@ -112,8 +114,7 @@ class UpdateStateForStageCmdFinally(
         val gotoFinal = commandContext.buildStatus.isFailure() ||
             commandContext.buildStatus.isCancel() ||
             commandContext.fastKill ||
-            event.source == BS_STAGE_CANCELED_END_SOURCE ||
-            event.source == BS_STAGE_QUALITY_CHECK_FAIL_END_SOURCE
+            event.source == BS_STAGE_CANCELED_END_SOURCE
 
         if (gotoFinal) {
             nextStage = pipelineStageService.getLastStage(buildId = event.buildId)