From 42437cd782881f3e476d24b60840eb83a5bd64e7 Mon Sep 17 00:00:00 2001 From: ruotiantang Date: Mon, 1 Nov 2021 18:08:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20stream=20=E4=B8=8A=E4=B8=8B=E6=96=87?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A1=A5=E5=85=85=20#5447?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pipeline/utils/PipelineConstants.kt | 6 ++++++ .../tencent/devops/process/utils/PipelineVarUtil.kt | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/PipelineConstants.kt b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/PipelineConstants.kt index 499046e507e..a65be08834b 100644 --- a/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/PipelineConstants.kt +++ b/src/backend/ci/core/common/common-pipeline/src/main/kotlin/com/tencent/devops/common/pipeline/utils/PipelineConstants.kt @@ -49,5 +49,11 @@ const val PIPELINE_GIT_BASE_REPO_URL = "GIT_CI_BASE_REPO_URL" const val PIPELINE_GIT_HEAD_REPO_URL = "GIT_CI_HEAD_REPO_URL" const val PIPELINE_GIT_MR_URL = "GIT_CI_MR_URL" +const val PIPELINE_GIT_COMMIT_AUTHOR = "STREAM_COMMIT_AUTHOR" +const val PIPELINE_GIT_UPDATE_USER = "STREAM_PIPELINE_UPDATE_USER" +const val PIPELINE_GIT_AUTHORIZER = "STREAM_AUTHORIZER" +const val PIPELINE_GIT_MR_ID = "STREAM_MR_ID" +const val PIPELINE_GIT_MR_IID = "STREAM_MR_IID" + // 代码库构建Value常量 const val PIPELINE_GIT_TIME_TRIGGER_KIND = "schedule" diff --git a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt index 1b2562ba7a0..3ac5f199d29 100644 --- a/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt +++ b/src/backend/ci/core/process/api-process/src/main/kotlin/com/tencent/devops/process/utils/PipelineVarUtil.kt @@ -28,12 +28,16 @@ package com.tencent.devops.process.utils import com.tencent.devops.common.pipeline.enums.BuildFormPropertyType +import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_AUTHORIZER import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_BASE_REF import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_BASE_REPO_URL +import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_COMMIT_AUTHOR import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_COMMIT_MESSAGE import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_EVENT_CONTENT import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_HEAD_REF import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_HEAD_REPO_URL +import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_MR_ID +import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_MR_IID import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_MR_URL import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_REF import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_REPO @@ -42,6 +46,7 @@ import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_REPO_NAME import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_REPO_URL import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_SHA import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_SHA_SHORT +import com.tencent.devops.common.pipeline.utils.PIPELINE_GIT_UPDATE_USER object PipelineVarUtil { @@ -137,7 +142,12 @@ object PipelineVarUtil { "ci.repo_url" to PIPELINE_GIT_REPO_URL, "ci.base_repo_url" to PIPELINE_GIT_BASE_REPO_URL, "ci.head_repo_url" to PIPELINE_GIT_HEAD_REPO_URL, - "ci.mr_url" to PIPELINE_GIT_MR_URL + "ci.mr_url" to PIPELINE_GIT_MR_URL, + "ci.commit_author" to PIPELINE_GIT_COMMIT_AUTHOR, + "ci.pipeline_update_user" to PIPELINE_GIT_UPDATE_USER, + "ci.authorizer" to PIPELINE_GIT_AUTHORIZER, + "ci.mr_id" to PIPELINE_GIT_MR_ID, + "ci.mr_iid" to PIPELINE_GIT_MR_IID ) private val newVarMappingOldVar = oldVarMappingNewVar.map { kv -> kv.value to kv.key }.toMap()