bug: 修复重试和任务认领失败的逻辑问题 TencentBlueKing#6646 支持yaml修改并发组取消构建

royalhuang · May 9, 2022 · 405b9d4 · 405b9d4
1 parent 1f88e0f
commit 405b9d4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/modelCreate/ModelCreate.kt b/...-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/modelCreate/ModelCreate.kt
@@ -150,8 +150,10 @@ class ModelCreate @Autowired constructor(
                     val varMap = pipelineParams.associate { param -> param.id to param.defaultValue.toString() }
                     EnvUtils.parseEnv(it, PipelineVarUtil.fillContextVarMap(varMap))
                 },
-                // Cancel-In-Progress入口先不放开给用户配置
-                concurrencyCancelInProgress = true,
+                // Cancel-In-Progress 配置group后默认为true
+                concurrencyCancelInProgress = yaml.concurrency?.cancelInProgress
+                    ?: yaml.concurrency?.group?.let { true }
+                    ?: false,
                 runLockType = when {
                     yaml.concurrency?.group != null -> PipelineRunLockType.SINGLE
                     else -> PipelineRunLockType.MULTIPLE