Merge pull request #5843 from Tencent/r1723

r1.7.23
TencentBlueKing · Dec 22, 2021 · dac3c6a · dac3c6a
2 parents a93e0c3 + 1e31134
commit dac3c6a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 6 deletions.
diff --git a/scripts/bkenv.properties b/scripts/bkenv.properties
@@ -213,6 +213,7 @@ BK_CI_NOTIFY_WEWORK_API_URL=https://qyapi.weixin.qq.com
 BK_CI_NOTIFY_WEWORK_SEND_CHANNEL=weworkAgent
 # BK_CI_ARTIFACTORY_REALM 默认值为local,按需修改,制品库存储方式,可选值local, bkrepo
 BK_CI_ARTIFACTORY_REALM=local
+
 ##########
 # 4-微服务依赖
 ##########
@@ -310,6 +311,8 @@ BK_CI_TURBO_REDIS_PORT=$BK_CI_REDIS_PORT
 BK_REPO_API_URL=
 # BK_REPO_AUTHORIZATION无默认值. 按需修改. 如部署了蓝鲸制品库bkrepo，并且需要集成到CI，需要配置为访问bkrepo所提供的鉴权信息
 BK_REPO_AUTHORIZATION=
+# BK_REPO_GATEWAY_IP无默认值，按需修改，如部署了蓝鲸制品库bkrepo，并且需要集成到CI，需要配置bkrepo网关的IP地址
+BK_REPO_GATEWAY_IP=
 
 ##########
 # 5-api port

diff --git a/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt b/src/backend/ci/buildSrc/src/main/kotlin/constants/Versions.kt
@@ -36,5 +36,5 @@ object Versions {
     const val Oshi = "5.8.3"
     const val Leaf = "1.0.1-RELEASE"
     const val p4 = "2021.1.2163843"
-    const val log4j = "2.16.0"
+    const val log4j = "2.17.0"
 }
diff --git a/...mmon/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt b/...mmon/src/main/kotlin/com/tencent/devops/plugin/worker/task/archive/BuildArchiveGetTask.kt
@@ -38,8 +38,8 @@ import com.tencent.devops.process.pojo.BuildHistory
 import com.tencent.devops.process.pojo.BuildTask
 import com.tencent.devops.process.pojo.BuildVariables
 import com.tencent.devops.process.utils.PIPELINE_START_USER_ID
-import com.tencent.devops.worker.common.api.ArtifactApiFactory
 import com.tencent.devops.worker.common.api.ApiFactory
+import com.tencent.devops.worker.common.api.ArtifactApiFactory
 import com.tencent.devops.worker.common.api.archive.ArchiveSDKApi
 import com.tencent.devops.worker.common.api.archive.pojo.TokenType
 import com.tencent.devops.worker.common.api.process.BuildSDKApi
@@ -67,7 +67,7 @@ class BuildArchiveGetTask : ITask() {
     override fun execute(buildTask: BuildTask, buildVariables: BuildVariables, workspace: File) {
         val taskParams = buildTask.params ?: mapOf()
         val pipelineId = taskParams["pipelineId"] ?: throw ParamBlankException("pipelineId is null")
-        val buildNo = taskParams["buildNo"] ?: "-1"
+        val buildNo = if (taskParams["buildNo"].isNullOrBlank()) "-1" else taskParams["buildNo"]!!
         val buildId = getBuildId(pipelineId, buildVariables, buildNo).id
         val destPath = File(workspace, taskParams["destPath"] ?: ".")
         val srcPaths = taskParams["srcPaths"] ?: throw ParamBlankException("srcPaths can not be null")

diff --git a/src/backend/codecc/build.gradle b/src/backend/codecc/build.gradle
@@ -47,7 +47,7 @@ buildscript {
         commonsHttpclientVersion = "3.1"
         ciVersion = "1.5.8-RELEASE"
         jsonVersion = "20180130"
-        log4jVersion = "2.16.0"
+        log4jVersion = "2.17.0"
     }
 
     def mavenRepoUrl = System.getProperty("mavenRepoUrl")

diff --git a/src/backend/turbo/buildSrc/build.gradle.kts b/src/backend/turbo/buildSrc/build.gradle.kts
@@ -1,5 +1,3 @@
-import java.net.URI
-
 @Suppress("NewLineAtEndOfFile")
 plugins {
     `kotlin-dsl`

diff --git a/support-files/templates/#etc#ci#common.yml b/support-files/templates/#etc#ci#common.yml
@@ -100,6 +100,7 @@ auth:
   iamCallBackUser: __BK_CI_IAM_CALLBACK_USER__
   # 用户组权限申请前端跳转页面HOST
   webHost: __BK_CI_IAM_WEB_URL__
+  token: __BK_CI_APP_TOKEN__
 
 #bk esb config for cd plugin in pipeline
 esb:

diff --git a/support-files/templates/gateway#core#devops.server.conf b/support-files/templates/gateway#core#devops.server.conf
@@ -49,4 +49,7 @@ server {
 
     # 重定向
     include vhosts/devops.redirect.conf;
+
+    # 社区版bkrepo域名解析
+    include vhosts/devops.bkrepo.upstream.conf;
 }
diff --git a/support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf b/support-files/templates/gateway#core#vhosts#devops.bkrepo.upstream.conf
@@ -0,0 +1,3 @@
+upstream __BK_REPO_HOST__ {
+    server __BK_REPO_GATEWAY_IP__;
+}