-
Notifications
You must be signed in to change notification settings - Fork 498
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:构建资源类型为第三方构建集群时支持指定Job并发数 #9810 #10310
Merged
bkci-bot
merged 48 commits into
TencentBlueKing:master
from
tangruotian:issue_10258_9810
Jun 3, 2024
Merged
feat:构建资源类型为第三方构建集群时支持指定Job并发数 #9810 #10310
bkci-bot
merged 48 commits into
TencentBlueKing:master
from
tangruotian:issue_10258_9810
Jun 3, 2024
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
…o issue_9810 # Conflicts: # src/backend/ci/core/dispatch-docker/biz-dispatch-docker/src/main/kotlin/com/tencent/devops/dispatch/docker/listener/DockerVMListener.kt # src/backend/ci/core/dispatch/biz-dispatch-docker/src/main/kotlin/com/tencent/devops/dispatch/docker/listener/DockerVMListener.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyAgentService.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt # src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/thirdPartyAgent/ServiceThirdPartyAgentResource.kt # src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/thirdPartyAgent/ServiceThirdPartyAgentResourceImpl.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/mq/PipelineAgentStartupEvent.kt # src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/atom/vm/DispatchVMStartupTaskAtom.kt # support-files/i18n/dispatch/message_en_US.properties # support-files/i18n/dispatch/message_zh_CN.properties # support-files/sql/2003_v2.x/2020_ci_dispatch-update_v2.0_mysql.sql
…o issue_9810 # Conflicts: # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyAgentService.kt # src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/thirdPartyAgent/ServiceThirdPartyAgentResource.kt # src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/thirdPartyAgent/ServiceThirdPartyAgentResourceImpl.kt # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
…o issue_9810 # Conflicts: # src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/option/JobControlOption.kt # src/backend/ci/core/dispatch/api-dispatch/src/main/kotlin/com/tencent/devops/dispatch/constants/Constants.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/dao/ThirdPartyAgentBuildDao.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/exception/ErrorCodeEnum.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyAgentService.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt # src/backend/ci/core/environment/api-environment/src/main/kotlin/com/tencent/devops/environment/api/thirdpartyagent/ServiceThirdPartyAgentResource.kt # src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/resources/thirdPartyAgent/ServiceThirdPartyAgentResourceImpl.kt # src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/thirdpartyagent/ThirdPartyAgentMgrService.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/mq/PipelineAgentStartupEvent.kt # src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/atom/vm/DispatchVMStartupTaskAtom.kt # support-files/i18n/dispatch/message_en_US.properties # support-files/i18n/dispatch/message_zh_CN.properties # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties # support-files/sql/1001_ci_dispatch_ddl_mysql.sql # support-files/sql/2003_v2.x/2020_ci_dispatch-update_v2.0_mysql.sql
…to issue_9810 # Conflicts: # src/backend/ci/core/dispatch/api-dispatch/src/main/kotlin/com/tencent/devops/dispatch/constants/Constants.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/exception/ErrorCodeEnum.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt # support-files/i18n/dispatch/message_en_US.properties # support-files/i18n/dispatch/message_zh_CN.properties # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
…o issue_9810 # Conflicts: # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/listener/ThirdPartyBuildListener.kt # src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/constant/ProcessMessageCode.kt # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
…o issue_10258 # Conflicts: # src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/thirdpartyagent/ThirdPartyAgentMgrService.kt
…o issue_10258_9810 # Conflicts: # src/backend/ci/core/dispatch/api-dispatch/src/main/kotlin/com/tencent/devops/dispatch/constants/Constants.kt # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt # support-files/i18n/dispatch/message_en_US.properties
tangruotian
requested review from
irwinsun,
mingshewhe,
stubenhuang,
carlyin0801,
royalhuang and
randychen2046
as code owners
May 9, 2024 08:26
irwinsun
reviewed
May 13, 2024
...atch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/dao/ThirdPartyAgentBuildDao.kt
Show resolved
Hide resolved
irwinsun
reviewed
May 13, 2024
...src/main/kotlin/com/tencent/devops/environment/pojo/thirdpartyagent/ThirdPartyAgentDetail.kt
Outdated
Show resolved
Hide resolved
irwinsun
approved these changes
May 13, 2024
…o issue_10258_9810 # Conflicts: # src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt
…o issue_10258_9810 # Conflicts: # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
…o issue_10258_9810 # Conflicts: # support-files/i18n/process/message_en_US.properties # support-files/i18n/process/message_zh_CN.properties
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.
feat:构建环境中的节点,支持停用/启用 #10258