feat: 当 mr 触发时， webhookinfo 中增加 mr 的源分支和 id TencentBlueKing#6153

mingshewhe · Feb 21, 2022 · fac9552 · fac9552
1 parent 5002465
commit fac9552
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...e/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/code/WebhookInfo.kt b/...e/process/api-process/src/main/kotlin/com/tencent/devops/process/pojo/code/WebhookInfo.kt
@@ -35,5 +35,7 @@ data class WebhookInfo(
     val webhookMessage: String?,
     val webhookCommitId: String?,
     // 合并后commitId
-    val webhookMergeCommitSha: String?
+    val webhookMergeCommitSha: String?,
+    // 源分支
+    val webhookSourceBranch: String?
 )
diff --git a/...-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt b/...-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt
@@ -69,6 +69,7 @@ import com.tencent.devops.common.redis.RedisOperation
 import com.tencent.devops.common.service.trace.TraceTag
 import com.tencent.devops.common.webhook.pojo.code.BK_REPO_GIT_WEBHOOK_EVENT_TYPE
 import com.tencent.devops.common.webhook.pojo.code.BK_REPO_GIT_WEBHOOK_MR_MERGE_COMMIT_SHA
+import com.tencent.devops.common.webhook.pojo.code.BK_REPO_GIT_WEBHOOK_MR_SOURCE_BRANCH
 import com.tencent.devops.common.webhook.pojo.code.BK_REPO_WEBHOOK_REPO_URL
 import com.tencent.devops.common.webhook.pojo.code.PIPELINE_WEBHOOK_BRANCH
 import com.tencent.devops.common.webhook.pojo.code.PIPELINE_WEBHOOK_COMMIT_MESSAGE
@@ -1144,7 +1145,8 @@ class PipelineRuntimeService @Autowired constructor(
                     params[PIPELINE_WEBHOOK_EVENT_TYPE] as String?
                 },
                 webhookCommitId = params[PIPELINE_WEBHOOK_REVISION] as String?,
-                webhookMergeCommitSha = params[BK_REPO_GIT_WEBHOOK_MR_MERGE_COMMIT_SHA] as String?
+                webhookMergeCommitSha = params[BK_REPO_GIT_WEBHOOK_MR_MERGE_COMMIT_SHA] as String?,
+                webhookSourceBranch = params[BK_REPO_GIT_WEBHOOK_MR_SOURCE_BRANCH] as String?
             ),
             formatted = false
         )