From 80656b56ed0e27fc43dc5a092dcb911e07c78963 Mon Sep 17 00:00:00 2001 From: hejieehe <904696180@qq.com> Date: Mon, 8 Jul 2024 16:58:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E7=88=B6=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=B8=AD=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C=E7=9A=84=E5=AD=90=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E7=9A=84=E7=8A=B6=E6=80=81=20#10260?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/process/api/builds/BuildSubPipelineResource.kt | 8 ++++---- .../process/api/builds/BuildSubPipelineResourceImpl.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt index aaf76081e16..4ec5e35dc4a 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt @@ -86,9 +86,6 @@ interface BuildSubPipelineResource { @Parameter(description = "构建ID", required = true) @HeaderParam(AUTH_HEADER_DEVOPS_BUILD_ID) buildId: String, - @Parameter(description = "当前流水线执行次数", required = false) - @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT) - executeCount: Int?, @Parameter(description = "要启动的流水线ID", required = true) @PathParam("callPipelineId") callPipelineId: String, @@ -104,7 +101,10 @@ interface BuildSubPipelineResource { @QueryParam("channelCode") channelCode: ChannelCode?, @Parameter(description = "启动参数", required = true) - values: Map + values: Map, + @Parameter(description = "当前流水线执行次数", required = false) + @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT) + executeCount: Int? = 1 ): Result @Operation(summary = "从构建机启动指定项目的子流水线") diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt index 589b5be7e25..fd6556b9b74 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt @@ -76,13 +76,13 @@ class BuildSubPipelineResourceImpl @Autowired constructor( projectId: String, parentPipelineId: String, buildId: String, - executeCount: Int?, callPipelineId: String, atomCode: String, taskId: String, runMode: String, channelCode: ChannelCode?, - values: Map + values: Map, + executeCount: Int? ): Result { return subPipeService.callPipelineStartup( projectId = projectId, From 7411c230b503ccbd4f144a4de918f8b97c1295e4 Mon Sep 17 00:00:00 2001 From: hejieehe <904696180@qq.com> Date: Mon, 8 Jul 2024 17:14:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E7=88=B6=E6=B5=81=E6=B0=B4=E7=BA=BF=E4=B8=AD=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E6=89=A7=E8=A1=8C=E7=9A=84=E5=AD=90=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E7=9A=84=E7=8A=B6=E6=80=81=20#10260?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/process/api/builds/BuildSubPipelineResource.kt | 8 ++++---- .../process/api/builds/BuildSubPipelineResourceImpl.kt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt index 4ec5e35dc4a..dc354308da1 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt @@ -121,9 +121,6 @@ interface BuildSubPipelineResource { @Parameter(description = "构建ID", required = true) @HeaderParam(AUTH_HEADER_DEVOPS_BUILD_ID) buildId: String, - @Parameter(description = "当前流水线执行次数", required = false) - @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT) - executeCount: Int?, @Parameter(description = "要启动的流水线ID", required = true) @PathParam("callProjectId") callProjectId: String, @@ -140,7 +137,10 @@ interface BuildSubPipelineResource { @QueryParam("runMode") runMode: String, @Parameter(description = "启动参数", required = true) - values: Map + values: Map, + @Parameter(description = "当前流水线执行次数", required = false) + @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT) + executeCount: Int? = 1 ): Result @Operation(summary = "获取子流水线启动参数") diff --git a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt index fd6556b9b74..29bebc7e8ab 100644 --- a/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt +++ b/src/backend/ci/core/process/biz-process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt @@ -50,13 +50,13 @@ class BuildSubPipelineResourceImpl @Autowired constructor( projectId: String, parentPipelineId: String, buildId: String, - executeCount: Int?, callProjectId: String, callPipelineId: String, atomCode: String, taskId: String, runMode: String, - values: Map + values: Map, + executeCount: Int? ): Result { return subPipeService.callPipelineStartup( projectId = projectId,