【PAC】feat：支持从代码库维度查看对应的代码库事件 #8122

TencentBlueKing · Nov 16, 2023 · c6569ca · c6569ca
1 parent d4af4c7
commit c6569ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...z-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt b/...z-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt
@@ -232,7 +232,7 @@ class SubPipelineStartUpService @Autowired constructor(
                 BuildParameters(key = PIPELINE_START_PARENT_PROJECT_ID, value = parentProjectId)
             params[PIPELINE_START_PARENT_PIPELINE_ID] =
                 BuildParameters(key = PIPELINE_START_PARENT_PIPELINE_ID, value = parentPipelineId)
-            params[PIPELINE_START_PARENT_PIPELINE_ID] =
+            params[PIPELINE_START_PARENT_PIPELINE_NAME] =
                 BuildParameters(key = PIPELINE_START_PARENT_PIPELINE_NAME, value = parentPipelineInfo.pipelineName)
             params[PIPELINE_START_PARENT_BUILD_ID] =
                 BuildParameters(key = PIPELINE_START_PARENT_BUILD_ID, value = parentBuildId)

diff --git a/...-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventAspect.kt b/...-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventAspect.kt
@@ -174,6 +174,7 @@ class PipelineTriggerEventAspect(
         return pipelineParamMap != null && pipelineParamMap[PIPELINE_RETRY_BUILD_ID] != null
     }
 
+    @Suppress("ComplexCondition")
     private fun buildTriggerEvent(
         userId: String,
         projectId: String,
@@ -234,7 +235,6 @@ class PipelineTriggerEventAspect(
                 val parentPipelineId = pipelineParamMap?.get(PIPELINE_START_PARENT_PIPELINE_ID)?.value?.toString()
                 val parentPipelineName = pipelineParamMap?.get(PIPELINE_START_PARENT_PIPELINE_NAME)?.value?.toString()
                 val parentBuildId = pipelineParamMap?.get(PIPELINE_START_PARENT_BUILD_ID)?.value?.toString()
-                logger.info("subPipeline event: $parentProjectId:$parentPipelineId:$parentPipelineName:$parentBuildId")
                 if (parentProjectId == null || parentPipelineId == null ||
                     parentBuildId == null || parentPipelineName == null
                 ) {