Skip to content
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 #9872

Closed
wants to merge 25 commits into from

Conversation

tangruotian
Copy link
Collaborator

No description provided.

…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
@tangruotian tangruotian reopened this Dec 27, 2023
…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
@tangruotian tangruotian closed this May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant