diff --git a/jenkins/pipelines/ci/tidb/tidb_ghpr_check.groovy b/jenkins/pipelines/ci/tidb/tidb_ghpr_check.groovy index 543581c5a..d1f43b709 100644 --- a/jenkins/pipelines/ci/tidb/tidb_ghpr_check.groovy +++ b/jenkins/pipelines/ci/tidb/tidb_ghpr_check.groovy @@ -19,7 +19,7 @@ if (ghprbPullId != null && ghprbPullId != "") { specStr = "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*" } -GO_VERSION = "go1.18" +GO_VERSION = "go1.19" POD_GO_IMAGE = "" GO_IMAGE_MAP = [ "go1.13": "hub.pingcap.net/jenkins/centos7_golang-1.13:latest", @@ -37,7 +37,8 @@ VOLUMES = [ def user_bazel(branch) { if (branch in ["master"] || - branch.matches("^feature[/_].*") /* feature branches */) { + branch.matches("^feature[/_].*") /* feature branches */ || + (branch.startsWith("release-") && branch >= "release-6.2")) { return GO_IMAGE_MAP["master"] } return "" diff --git a/jenkins/pipelines/ci/tidb/tidb_ghpr_check_2.groovy b/jenkins/pipelines/ci/tidb/tidb_ghpr_check_2.groovy index 42f3032e2..ef75ff07d 100644 --- a/jenkins/pipelines/ci/tidb/tidb_ghpr_check_2.groovy +++ b/jenkins/pipelines/ci/tidb/tidb_ghpr_check_2.groovy @@ -42,7 +42,7 @@ if (m2) { m2 = null println "PD_BRANCH=${PD_BRANCH}" -GO_VERSION = "go1.18" +GO_VERSION = "go1.19" POD_GO_IMAGE = "" GO_IMAGE_MAP = [ "go1.13": "hub.pingcap.net/jenkins/centos7_golang-1.13:latest", @@ -52,7 +52,8 @@ GO_IMAGE_MAP = [ ] def user_bazel(branch) { - if (branch in ["master"] || branch.matches("^feature[/_].*") /* feature branches */) { + if (branch in ["master"] || branch.matches("^feature[/_].*") /* feature branches */ || + (branch.startsWith("release-") && branch >= "release-6.2")) { return GO_IMAGE_MAP["master"] } return "" diff --git a/jenkins/pipelines/goversion-select-lib.groovy b/jenkins/pipelines/goversion-select-lib.groovy index bca928129..4a8c148a9 100644 --- a/jenkins/pipelines/goversion-select-lib.groovy +++ b/jenkins/pipelines/goversion-select-lib.groovy @@ -37,8 +37,8 @@ def selectGoVersion(branchNameOrTag) { println "tag ${branchNameOrTag} use go 1.13" return "go1.13" } - println "tag ${branchNameOrTag} use default version go 1.18" - return "go1.18" + println "tag ${branchNameOrTag} use default version go 1.19" + return "go1.19" } else { println "this is a branch" if (branchNameOrTag in feature_branch_use_go13) {