pref:研发商店组件内置打包流水线都归属到统一的平台项目下 #10475 #11046
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…fix' into issue_10475_innerPipeline_fix_yj
# Conflicts: # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt
yjieliang
requested review from
irwinsun,
mingshewhe,
stubenhuang,
royalhuang and
randychen2046
as code owners
yjieliang
changed the title
yjieliang
changed the title
# Conflicts: # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/dao/StoreProjectRelDao.kt # src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/common/service/impl/StoreProjectServiceImpl.kt
carlyin0801
reviewed
Dec 9, 2024
| userId: String, | ||
| storeCode: String, | ||
| storeType: Byte | ||
| ): Boolean { |
| pipelineId = it | ||
| ) | ||
| } | ||
| logger.info("handleStoreBuildResult pipelineId:${storeBuildInfoRecord?.pipelineId},storeType:$storeType") |
There was a problem hiding this comment.
这行日志已经包含方法前面一行日志信息，而且这种日志信息打印作用不大，可以考虑去掉
| ) | ||
| } | ||
| logger.info("handleStoreBuildResult pipelineId:${storeBuildInfoRecord?.pipelineId},storeType:$storeType") | ||
| if (storeType == null) { |
There was a problem hiding this comment.
这逻辑没看懂，T_STORE_PIPELINE_REL表会存在storeType为空的情况吗
| @@ -301,9 +301,10 @@ abstract class StoreCommonServiceImpl : StoreCommonService { | |||
| val storeBuildInfoRecord = storePipelineBuildRelDao.getStorePipelineBuildRel(dslContext, storeId) | |||
| if (null != storeBuildInfoRecord) { | |||
| val pipelineId = storeBuildInfoRecord.pipelineId | |||
| val storePipelineRelRecord = storePipelineRelDao.getStorePipelineRelByPipelineId( | |||
| val storePipelineRelRecord = storePipelineRelDao.getStorePipelineRelByStoreCode( | |||
There was a problem hiding this comment.
为什么要把getStorePipelineRelByPipelineId方法切换至getStorePipelineRelByStoreCode，原来用流水线ID不是可以正常查出记录吗
There was a problem hiding this comment.
因为内置流水线归属公共项目管理后storeRel存在多个组件管理同一流水线的情况
| @@ -404,6 +407,9 @@ abstract class StoreMemberServiceImpl : StoreMemberService { | |||
| * 判断是否为成员 | |||
| */ | |||
| override fun isStoreMember(userId: String, storeCode: String, storeType: Byte): Boolean { | |||
| if (userId == storeInnerPipelineConfig.innerPipelineUser) { | |||
There was a problem hiding this comment.
这个逻辑加在这里不合适，innerPipelineUser不一定是组件成员，这个逻辑放在外面去判断，比如userId == storeInnerPipelineConfig.innerPipelineUser || isStoreMember（xxx）
| // 触发执行流水线 | ||
| val buildIdObj = client.get(ServiceBuildResource::class).manualStartupNew( | ||
| userId = innerPipelineUser, | ||
| projectId = storePipelineRelRecord?.projectCode ?: innerPipelineProject, |
There was a problem hiding this comment.
用这个逻辑，要求流水线都是挂在innerPipelineProject和innerPipelineUser下面
| lock.lock() | ||
| pipelineId = redisOperation.get(pipelineName) | ||
| if (pipelineId.isNullOrBlank()) { | ||
| val pipelineList = client.get(ServicePipelineResource::class).searchByName( |
There was a problem hiding this comment.
把各个组件公共流水线的流水线ID存在配置表和redis不就行了，为什么要搞这么复杂
| params = arrayOf(storeCode ?: "$storeType-PIPELINE-BUILD:PUBLIC") | ||
| ) | ||
| logger.info("handleStorePublicPipelineModel pipelineId:$pipelineId|publicPipelineId:$publicPipelineId") | ||
| if (storeCode != null && pipelineId == publicPipelineId) { |
There was a problem hiding this comment.
对已托管给公共项目的组件刷新内置流水线model时则给组件在公共项目下创建单独的流水线
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pref:研发商店组件内置打包流水线都归属到统一的平台项目下 #10475