Merge pull request TencentBlueKing#10628 from hejieehe/feat_10260

feat：支持在父流水线中查看异步执行的子流水线的状态 TencentBlueKing#10260
fcfang123 · Jul 8, 2024 · 5525f4d · 5525f4d
2 parents 2a6eb71 + 7411c23
commit 5525f4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...process/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResource.kt b/...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<String, String>
+        values: Map<String, String>,
+        @Parameter(description = "当前流水线执行次数", required = false)
+        @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT)
+        executeCount: Int? = 1
     ): Result<ProjectBuildId>
 
     @Operation(summary = "从构建机启动指定项目的子流水线")
@@ -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<String, String>
+        values: Map<String, String>,
+        @Parameter(description = "当前流水线执行次数", required = false)
+        @HeaderParam(AUTH_HEADER_DEVOPS_EXECUTE_COUNT)
+        executeCount: Int? = 1
     ): Result<ProjectBuildId>
 
     @Operation(summary = "获取子流水线启动参数")

diff --git a/...ess/src/main/kotlin/com/tencent/devops/process/api/builds/BuildSubPipelineResourceImpl.kt b/...ess/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<String, String>
+        values: Map<String, String>,
+        executeCount: Int?
     ): Result<ProjectBuildId> {
         return subPipeService.callPipelineStartup(
             projectId = projectId,
@@ -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<String, String>
+        values: Map<String, String>,
+        executeCount: Int?
     ): Result<ProjectBuildId> {
         return subPipeService.callPipelineStartup(
             projectId = projectId,