diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt index 19ac626dbcf..cd3dba6ed97 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt +++ b/src/backend/ci/core/process/biz-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/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventAspect.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventAspect.kt index 958fa785ba0..25949d23c9f 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/trigger/PipelineTriggerEventAspect.kt +++ b/src/backend/ci/core/process/biz-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 ) {