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.

Sign up for GitHub

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

Jump to bottom

feat：构建资源类型为第三方构建集群时支持指定Job并发数 #9810 #10310

Merged
merged 48 commits into from
Jun 3, 2024
Merged

feat：构建资源类型为第三方构建集群时支持指定Job并发数 #9810 #10310

merged 48 commits into from
Jun 3, 2024

Commits on Dec 20, 2023

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    7fd1b04 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    e787bc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2023

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …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 committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    232e6ed View commit details
    Browse the repository at this point in the history

  2. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    cc72406 View commit details
    Browse the repository at this point in the history

  3. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    f8158d3 View commit details
    Browse the repository at this point in the history

  4. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    d9d7d94 View commit details
    Browse the repository at this point in the history

  5. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    995f1af View commit details
    Browse the repository at this point in the history

  6. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    cfc91b7 View commit details
    Browse the repository at this point in the history

  7. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 26, 2023
    Configuration menu
    Copy the full SHA
    6495541 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    40881fa View commit details
    Browse the repository at this point in the history

  2. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    a573583 View commit details
    Browse the repository at this point in the history

  3. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    7caa324 View commit details
    Browse the repository at this point in the history

  4. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    b160d4d View commit details
    Browse the repository at this point in the history

  5. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    3d8377b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_9810
    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    72e6fa1 View commit details
    Browse the repository at this point in the history

  7. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    cc15f74 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …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
    @tangruotian
    tangruotian committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    10c5a60 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …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
    @tangruotian
    tangruotian committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    d23f6a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'issue_10082' of https://github.com/tangruotian/bk-ci in… 

    …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
    @tangruotian
    tangruotian committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    9210270 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bf7c00e View commit details
    Browse the repository at this point in the history

  2. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    7de444f View commit details
    Browse the repository at this point in the history

  3. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3539a1b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_9810
    @tangruotian
    tangruotian committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    1283b3f View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    702e54d View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    565d82e View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …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 committed Apr 28, 2024
    Configuration menu
    Copy the full SHA
    f301456 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    27a3b51 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_10258

# Conflicts:
#	src/backend/ci/core/environment/biz-environment/src/main/kotlin/com/tencent/devops/environment/service/thirdpartyagent/ThirdPartyAgentMgrService.kt
    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    32738e3 View commit details
    Browse the repository at this point in the history

  3. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a91811e View commit details
    Browse the repository at this point in the history

  4. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    f0c6416 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'issue_9810' of https://github.com/tangruotian/bk-ci int… 

    …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
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    24d1938 View commit details
    Browse the repository at this point in the history

  6. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    1bdb0e0 View commit details
    Browse the repository at this point in the history

  7. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    8fb7ca7 View commit details
    Browse the repository at this point in the history

  8. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    4229a47 View commit details
    Browse the repository at this point in the history

  9. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    8084f56 View commit details
    Browse the repository at this point in the history

  10. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 9, 2024
    Configuration menu
    Copy the full SHA
    bcc966c View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 14, 2024
    Configuration menu
    Copy the full SHA
    07c186a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_10258_9810

# Conflicts:
#	src/backend/ci/core/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt
    @tangruotian
    tangruotian committed May 14, 2024
    Configuration menu
    Copy the full SHA
    b749da6 View commit details
    Browse the repository at this point in the history

  3. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 14, 2024
    Configuration menu
    Copy the full SHA
    e686f20 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f1625ef View commit details
    Browse the repository at this point in the history

  2. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 17, 2024
    Configuration menu
    Copy the full SHA
    fef199d View commit details
    Browse the repository at this point in the history

  3. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 17, 2024
    Configuration menu
    Copy the full SHA
    cf9c46b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_10258_9810

# Conflicts:
#	support-files/i18n/process/message_en_US.properties
#	support-files/i18n/process/message_zh_CN.properties
    @tangruotian
    tangruotian committed May 17, 2024
    Configuration menu
    Copy the full SHA
    599243c View commit details
    Browse the repository at this point in the history

  5. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 17, 2024
    Configuration menu
    Copy the full SHA
    400957f View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. feat：构建环境中的节点，支持停用/启用 TencentBlueKing#10258

    @tangruotian
    tangruotian committed May 20, 2024
    Configuration menu
    Copy the full SHA
    3baba92 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f0a3bbe View commit details
    Browse the repository at this point in the history

  2. feat：构建资源类型为第三方构建集群时支持指定Job并发数 TencentBlueKing#9810

    @tangruotian
    tangruotian committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f112da1 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Merge branch 'master' of https://github.com/TencentBlueKing/bk-ci int… 

    …o issue_10258_9810

# Conflicts:
#	support-files/i18n/process/message_en_US.properties
#	support-files/i18n/process/message_zh_CN.properties
    @tangruotian
    tangruotian committed May 29, 2024
    Configuration menu
    Copy the full SHA
    0499b5e View commit details
    Browse the repository at this point in the history