feat: 红线支持指定到具体的步骤插件 TencentBlueKing#5405. 区分一条流水线中多个bash插件

JamiKX1 · Nov 18, 2021 · d718623 · d718623
1 parent 9543e7c
commit d718623
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/...in/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt b/...in/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateInElement.kt
@@ -43,6 +43,8 @@ data class QualityGateInElement(
     var interceptTask: String? = null,
     @ApiModelProperty("拦截原子名称", required = false)
     var interceptTaskName: String? = null,
+    @ApiModelProperty("拦截原子id", required = false)
+    var interceptTaskId: String? = null,
     @ApiModelProperty("审核人", required = false)
     var reviewUsers: Set<String>? = null
 ) : Element(name, id, status) {

diff --git a/...n/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt b/...n/kotlin/com/tencent/devops/common/pipeline/pojo/element/quality/QualityGateOutElement.kt
@@ -43,6 +43,8 @@ data class QualityGateOutElement(
     var interceptTask: String? = null,
     @ApiModelProperty("拦截原子名称", required = false)
     var interceptTaskName: String? = null,
+    @ApiModelProperty("拦截原子id", required = false)
+    var interceptTaskId: String? = null,
     @ApiModelProperty("审核人", required = false)
     var reviewUsers: Set<String>? = null
 ) : Element(name, id, status) {

diff --git a/.../src/main/kotlin/com/tencent/devops/process/engine/service/PipelineBuildQualityService.kt b/.../src/main/kotlin/com/tencent/devops/process/engine/service/PipelineBuildQualityService.kt
@@ -390,6 +390,7 @@ class PipelineBuildQualityService(
         task: PipelineBuildTask,
         interceptTaskName: String?,
         interceptTask: String?,
+        interceptTaskId: String?,
         runVariables: Map<String, String>,
         buildLogPrinter: BuildLogPrinter,
         position: String,
@@ -418,7 +419,7 @@ class PipelineBuildQualityService(
             interceptTaskName = interceptTaskName ?: "",
             startTime = LocalDateTime.now().timestamp(),
             taskId = interceptTask,
-            elementId = elementId,
+            elementId = interceptTaskId,
             position = position,
             templateId = templateId,
             runtimeVariable = runVariables

diff --git a/.../process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/QualityUtils.kt b/.../process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/utils/QualityUtils.kt
@@ -57,9 +57,9 @@ object QualityUtils {
         return if (gatewayIds.isEmpty() || gatewayIds.any { element.name.toLowerCase().contains(it.toLowerCase()) }) {
             val id = "T-${UUIDUtil.generate()}"
             if (isBefore) {
-                QualityGateInElement("质量红线(准入)", id, null, element.getAtomCode(), element.name)
+                QualityGateInElement("质量红线(准入)", id, null, element.getAtomCode(), element.name, element.id)
             } else {
-                QualityGateOutElement("质量红线(准出)", id, null, element.getAtomCode(), element.name)
+                QualityGateOutElement("质量红线(准出)", id, null, element.getAtomCode(), element.name, element.id)
             }
         } else {
             null

diff --git a/...e/src/main/kotlin/com/tencent/devops/process/engine/atom/quality/QualityGateInTaskAtom.kt b/...e/src/main/kotlin/com/tencent/devops/process/engine/atom/quality/QualityGateInTaskAtom.kt
@@ -68,6 +68,7 @@ class QualityGateInTaskAtom @Autowired constructor(
             task = task,
             interceptTaskName = param.interceptTaskName,
             interceptTask = param.interceptTask,
+            interceptTaskId = param.interceptTaskId,
             runVariables = runVariables,
             buildLogPrinter = buildLogPrinter,
             position = ControlPointPosition.BEFORE_POSITION,

diff --git a/.../src/main/kotlin/com/tencent/devops/process/engine/atom/quality/QualityGateOutTaskAtom.kt b/.../src/main/kotlin/com/tencent/devops/process/engine/atom/quality/QualityGateOutTaskAtom.kt
@@ -69,6 +69,7 @@ class QualityGateOutTaskAtom @Autowired constructor(
             task = task,
             interceptTaskName = param.interceptTaskName,
             interceptTask = param.interceptTask,
+            interceptTaskId = param.interceptTaskId,
             runVariables = runVariables,
             buildLogPrinter = buildLogPrinter,
             position = ControlPointPosition.AFTER_POSITION,

diff --git a/...-quality/src/main/kotlin/com/tencent/devops/quality/service/v2/QualityRuleCheckService.kt b/...-quality/src/main/kotlin/com/tencent/devops/quality/service/v2/QualityRuleCheckService.kt
@@ -439,7 +439,7 @@ class QualityRuleCheckService @Autowired constructor(
 
         logger.info("QUALITY|metadataList is|$metadataList")
 
-        metadataList.forEach { metadata ->
+        metadataList.forEach foreach@{ metadata ->
             if (!ruleTaskSteps.isNullOrEmpty()) {
                 ruleTaskSteps.forEach { ruleTask ->
                     if ((ruleTask.indicatorEnName == metadata.enName) &&
@@ -448,6 +448,9 @@ class QualityRuleCheckService @Autowired constructor(
                     }
                 }
             } else {
+                if (!elementId.isNullOrBlank() && metadata.taskId == elementId) {
+                    return@foreach
+                }
                 checkMetaList.add(metadata)
             }
         }