Merge pull request #11422 from tangruotian/issue_11421

第三方构建机Docker支持JDK17 #11421

Author: bkci-bot

src/agent/agent/src/pkg/job/build_docker.go

@@ -30,6 +30,7 @@ package job
 import (
 	"context"
 	"fmt"
+	"github.com/TencentBlueKing/bk-ci/agent/src/third_components"
 	"github.com/pkg/errors"
 	"io"
 	"os"
@@ -460,17 +461,38 @@ func postLog(red bool, message string, buildInfo *api.ThirdPartyBuildInfo, logTy
 	}
 }
 
+const (
+	targetJreDir  = "/usr/local/jre"
+	targetJre8Dir = "/usr/local/jre8"
+)
+
 // parseContainerMounts 解析生成容器挂载内容
 func parseContainerMounts(buildInfo *api.ThirdPartyBuildInfo) ([]mount.Mount, error) {
 	var mounts []mount.Mount
 
-	// 默认绑定本机的java用来执行worker
-	mounts = append(mounts, mount.Mount{
-		Type:     mount.TypeBind,
-		Source:   config.GAgentConfig.JdkDirPath,
-		Target:   "/usr/local/jre",
-		ReadOnly: true,
-	})
+	// 默认绑定本机的java用来执行worker，如果有jdk17优先用jdk17，否则用jdk8
+	if third_components.Jdk.Jdk17.GetJavaOrNull() != "" {
+		mounts = append(mounts, mount.Mount{
+			Type:     mount.TypeBind,
+			Source:   config.GAgentConfig.Jdk17DirPath,
+			Target:   targetJreDir,
+			ReadOnly: true,
+		})
+		// 用jdk17的同时保存jdk8
+		mounts = append(mounts, mount.Mount{
+			Type:     mount.TypeBind,
+			Source:   config.GAgentConfig.JdkDirPath,
+			Target:   targetJre8Dir,
+			ReadOnly: true,
+		})
+	} else {
+		mounts = append(mounts, mount.Mount{
+			Type:     mount.TypeBind,
+			Source:   config.GAgentConfig.JdkDirPath,
+			Target:   targetJreDir,
+			ReadOnly: true,
+		})
+	}
 
 	// 默认绑定本机的 worker 用来执行
 	mounts = append(mounts, mount.Mount{
@@ -534,6 +556,11 @@ func parseContainerEnv(dockerBuildInfo *api.ThirdPartyDockerBuildInfo) []string
 	envs = append(envs, "devops_gateway="+config.GetGateWay())
 	// 通过环境变量区分agent docker
 	envs = append(envs, "agent_build_env=DOCKER")
+	// JDK版本，只有jdk17的过渡期需要这个
+	if third_components.Jdk.Jdk17.GetJavaOrNull() != "" {
+		envs = append(envs, "DEVOPS_AGENT_JDK_8_PATH="+(targetJre8Dir+"/bin/java"))
+		envs = append(envs, "DEVOPS_AGENT_JDK_17_PATH="+(targetJreDir+"/bin/java"))
+	}
 
 	return envs
 }