bug: 修复重试和任务认领失败的逻辑问题 TencentBlueKing#6646

royalhuang · Apr 28, 2022 · ebf90c0 · ebf90c0
1 parent b9258c0
commit ebf90c0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/.../api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceVarResource.kt b/.../api-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceVarResource.kt
@@ -66,6 +66,9 @@ interface ServiceVarResource {
         @ApiParam(value = "项目ID", required = true)
         @QueryParam("projectId")
         projectId: String,
+        @ApiParam(value = "流水线ID", required = true)
+        @QueryParam("pipelineId")
+        pipelineId: String,
         @ApiParam(value = "构建ID", required = true)
         @QueryParam("buildId")
         buildId: String,

diff --git a/...ess/biz-base/src/main/kotlin/com/tencent/devops/process/service/PipelineContextService.kt b/...ess/biz-base/src/main/kotlin/com/tencent/devops/process/service/PipelineContextService.kt
@@ -39,6 +39,7 @@ import com.tencent.devops.common.pipeline.pojo.element.Element
 import com.tencent.devops.common.pipeline.type.BuildType
 import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_EVENT
 import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_TIME_TRIGGER_KIND
+import com.tencent.devops.process.bean.PipelineUrlBean
 import com.tencent.devops.process.engine.control.ControlUtils
 import com.tencent.devops.process.engine.service.PipelineBuildDetailService
 import com.tencent.devops.process.utils.PIPELINE_START_TYPE
@@ -50,7 +51,8 @@ import org.springframework.stereotype.Service
 @Suppress("ComplexMethod", "TooManyFunctions", "NestedBlockDepth", "LongParameterList")
 @Service
 class PipelineContextService @Autowired constructor(
-    private val pipelineBuildDetailService: PipelineBuildDetailService
+    private val pipelineBuildDetailService: PipelineBuildDetailService,
+    private val pipelineUrlBean: PipelineUrlBean
 ) {
     private val logger = LoggerFactory.getLogger(PipelineContextService::class.java)
 
@@ -119,8 +121,9 @@ class PipelineContextService @Autowired constructor(
         return contextMap
     }
 
-    fun buildContextToNotice(
+    fun buildFinishContext(
         projectId: String,
+        pipelineId: String,
         buildId: String
     ): Map<String, String> {
         val modelDetail = pipelineBuildDetailService.get(projectId, buildId) ?: return emptyMap()
@@ -152,6 +155,13 @@ class PipelineContextService @Autowired constructor(
             }
             contextMap["ci.build_status"] = previousStageStatus.name
             contextMap["ci.build_fail_tasknames"] = failTaskNameList.joinToString(",")
+            contextMap["ci.build_url"] = pipelineUrlBean.genBuildDetailUrl(
+                projectCode = projectId,
+                pipelineId = pipelineId,
+                buildId = buildId,
+                position = null,
+                stageId = null
+            )
         } catch (ignore: Throwable) {
             logger.warn("BKSystemErrorMonitor|buildContextToNoticeFailed|", ignore)
         }

diff --git a/...-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceVarResourceImpl.kt b/...-process/src/main/kotlin/com/tencent/devops/process/api/service/ServiceVarResourceImpl.kt
@@ -47,12 +47,17 @@ class ServiceVarResourceImpl @Autowired constructor(
         }
     }
 
-    override fun getContextVar(projectId: String, buildId: String, contextName: String?): Result<Map<String, String>> {
+    override fun getContextVar(
+        projectId: String,
+        pipelineId: String,
+        buildId: String,
+        contextName: String?
+    ): Result<Map<String, String>> {
         val buildVars = buildVariableService.getAllVariable(projectId, buildId)
         return if (contextName.isNullOrBlank()) {
             val contextVar = pipelineContextService.getAllBuildContext(buildVars).toMutableMap()
             Result(
-                contextVar.plus(pipelineContextService.buildContextToNotice(projectId, buildId))
+                contextVar.plus(pipelineContextService.buildFinishContext(projectId, pipelineId, buildId))
             )
         } else {
             val context = pipelineContextService.getBuildContext(buildVars, contextName)

diff --git a/...tream/src/main/kotlin/com/tencent/devops/stream/trigger/listener/components/SendNotify.kt b/...tream/src/main/kotlin/com/tencent/devops/stream/trigger/listener/components/SendNotify.kt
@@ -89,9 +89,12 @@ class SendNotify @Autowired constructor(
     private fun sendNotifyV2(action: BaseAction, build: BuildHistory) {
         // 获取需要进行替换的variables
         val finishData = action.data.context.finishData!!
-        val projectId = finishData.projectId
-        val variables = client.get(ServiceVarResource::class)
-            .getContextVar(projectId = projectId, buildId = build.id, contextName = null).data
+        val variables = client.get(ServiceVarResource::class).getContextVar(
+            projectId = finishData.projectId,
+            pipelineId = finishData.pipelineId,
+            buildId = build.id,
+            contextName = null
+        ).data
         val notices = YamlUtil.getObjectMapper().readValue(
             finishData.normalizedYaml, ScriptBuildYaml::class.java
         ).notices