Merge pull request TencentBlueKing#7751 from royalhuang/issue_7750

bug: 插件重试时取消状态的其他Job也被启动 TencentBlueKing#7750
tbs60 · Oct 9, 2022 · 58baee8 · 58baee8
2 parents 2ef3887 + 2364c39
commit 58baee8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...cent/devops/process/enums/VariableType.kt → ...cent/devops/process/enums/VariableType.kt b/...cent/devops/process/enums/VariableType.kt → ...cent/devops/process/enums/VariableType.kt
diff --git a/...s/biz-base/src/main/kotlin/com/tencent/devops/process/engine/context/StartBuildContext.kt b/...s/biz-base/src/main/kotlin/com/tencent/devops/process/engine/context/StartBuildContext.kt
@@ -89,9 +89,10 @@ data class StartBuildContext(
     }
 
     fun needSkipContainerWhenFailRetry(stage: Stage, container: Container): Boolean {
+        val containerStatus = BuildStatus.parse(container.status)
         return if (needRerun(stage)) { // finally stage 不会跳过, 当前stage是要失败重试的不会跳过，不会跳过
             false
-        } else if (!BuildStatus.parse(container.status).isFailure()) { // 非失败不会跳过
+        } else if (!containerStatus.isFailure() && !containerStatus.isCancel()) { // 跳过失败和被取消的其他job
             false
         } else { // 插件失败重试的，会跳过
             !retryStartTaskId.isNullOrBlank()