-
Notifications
You must be signed in to change notification settings - Fork 501
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat:保存流水线时,校验是否有子流水线循环依赖 #10479 #10794
base: master
Are you sure you want to change the base?
Conversation
…o feat_10479 # Conflicts: # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/extend/ModelCheckPlugin.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/IElementBizPluginService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildAtomElementBizPlugin.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/MarketBuildLessAtomElementBizPlugin.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/atom/plugin/SubPipelineCallElementBizPlugin.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/extend/DefaultModelCheckPlugin.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRepositoryService.kt # src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/plugin/ElementBizPlugin.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/plugin/trigger/element/TimerTriggerElementBizPlugin.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineElementBizPluginService.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt # src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/webhook/WebHookTriggerElementBizPlugin.kt
.../biz-process/src/main/kotlin/com/tencent/devops/process/service/SubPipelineStartUpService.kt
Outdated
Show resolved
Hide resolved
.../main/kotlin/com/tencent/devops/process/engine/listener/pipeline/MQPipelineCreateListener.kt
Show resolved
Hide resolved
…o feat_10479 # Conflicts: # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
@Consumes(MediaType.APPLICATION_JSON) | ||
interface OpSubPipelineRefResource { | ||
|
||
@Operation(summary = "更新Agent流水线引用信息") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个注释错了,应该是更新子流水线
@@ -457,6 +459,13 @@ class PipelineVersionFacadeService @Autowired constructor( | |||
pipelineId = pipelineId, | |||
staticViewIds = request.staticViews | |||
) | |||
// 更新子流水线插件引用信息 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这段代码不应该写在这里,应该写在com.tencent.devops.process.engine.service.PipelineRepositoryService.update和com.tencent.devops.process.engine.service.PipelineRepositoryService.create中,update时只有是正式版本才去更新
`PIPELINE_NAME` VARCHAR(256) DEFAULT NULL COMMENT '流水线名称', | ||
`CHANNEL` VARCHAR(32) DEFAULT NULL COMMENT '流水线渠道', | ||
`CONTAINER_NAME` VARCHAR(256) DEFAULT NULL COMMENT 'JOB名称', | ||
`SUB_PIPELINE_NAME` VARCHAR(256) DEFAULT NULL COMMENT '插件名称', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comment改成子流水线名称
`SUB_PIPELINE_ID` VARCHAR(64) DEFAULT NULL COMMENT '子流水线流水线ID', | ||
`PIPELINE_NAME` VARCHAR(256) DEFAULT NULL COMMENT '流水线名称', | ||
`CHANNEL` VARCHAR(32) DEFAULT NULL COMMENT '流水线渠道', | ||
`CONTAINER_NAME` VARCHAR(256) DEFAULT NULL COMMENT 'JOB名称', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
改成CONTAINER_ID
`TASK_PIPELINE_TYPE` VARCHAR(64) DEFAULT NULL COMMENT '插件参数_引用类型', | ||
`TASK_PIPELINE_ID` VARCHAR(256) DEFAULT NULL COMMENT '插件参数_流水线ID', | ||
`TASK_PIPELINE_NAME` VARCHAR(256) DEFAULT NULL COMMENT '插件参数_流水线名称', | ||
`CONTAINER_SEQ` VARCHAR(100) DEFAULT NULL COMMENT '插件序号', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
改成TASK_SEQ
`PROJECT_ID` VARCHAR(64) NOT NULL COMMENT '蓝盾项目ID', | ||
`PIPELINE_ID` VARCHAR(64) NOT NULL COMMENT '蓝盾流水线ID', | ||
`TASK_ID` VARCHAR(64) NOT NULL COMMENT 'TASK_ID', | ||
`STAGE_NAME` VARCHAR(64) DEFAULT NULL COMMENT 'STAGE名称', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
STAGE_NAME改成STAGE_ID
#10479