Skip to content

Commit

Permalink
ci(tidb): support release-6.3 (#1386)
Browse files Browse the repository at this point in the history
  • Loading branch information
purelind authored Sep 20, 2022
1 parent ef81c47 commit 9dd46e4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions jenkins/pipelines/ci/tidb/tidb_ghpr_check.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 ""
Expand Down
5 changes: 3 additions & 2 deletions jenkins/pipelines/ci/tidb/tidb_ghpr_check_2.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 ""
Expand Down
4 changes: 2 additions & 2 deletions jenkins/pipelines/goversion-select-lib.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 9dd46e4

Please sign in to comment.