Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump master nightly version to v8.3.0-alpha #3033

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ HARBOR_PROJECT_PREFIX = "hub.pingcap.net/qa"


// for master branch: use default local tag: v6.1.0-nightly
RELEASE_TAG = "v8.2.0-alpha"
RELEASE_TAG = "v8.3.0-alpha"
if (GIT_BRANCH.startsWith("release-")) {
RELEASE_TAG = "v" + trimPrefix(GIT_BRANCH) + ".0-nightly"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def fetch_hash={repo->
retry(2) {
try {
timeout(600) {
RELEASE_TAG = "v8.2.0-alpha"
RELEASE_TAG = "v8.3.0-alpha"
node("gethash") {
container("gethash") {
def ws = pwd()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ node("build_go1130") {
sh "curl -s ${FILE_SERVER_URL}/download/builds/pingcap/ee/gethash.py > gethash.py"

if (RELEASE_TAG == "nightly") {
tag = "v8.2.0-alpha"
RELEASE_TAG = "v8.2.0-alpha"
tag = "v8.3.0-alpha"
RELEASE_TAG = "v8.3.0-alpha"
} else {
tag = RELEASE_TAG
}
Expand Down Expand Up @@ -378,15 +378,15 @@ node("build_go1130") {
println "tiflash_sha1: ${tiflash_sha1}"
}

if (RELEASE_TAG == "v8.2.0-alpha") {
if (RELEASE_TAG == "v8.3.0-alpha") {
stage("Get version info when nightly") {
dir("tidb") {
// sh"""
// wget ${FILE_SERVER_URL}/download/builds/pingcap/tidb/${tidb_sha1}/centos7/tidb-server.tar.gz
// tar xf tidb-server.tar.gz
// """
// tidb_version = sh(returnStdout: true, script: "./bin/tidb-server -V | awk 'NR==1{print \$NF}' | sed -r 's/(^[^-]*).*/\\1/'").trim()
tidb_version = "v8.2.0-alpha"
tidb_version = "v8.3.0-alpha"
time = sh(returnStdout: true, script: "date '+%Y%m%d'").trim()
tidb_version = "${tidb_version}-nightly-${time}"
RELEASE_BRANCH = "master"
Expand Down
10 changes: 5 additions & 5 deletions jenkins/pipelines/cd/tiup/tiup-online-mirror-atom.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ node("build_go1130") {
sh "curl -s ${FILE_SERVER_URL}/download/builds/pingcap/ee/gethash.py > gethash.py"

if (RELEASE_TAG == "nightly") {
tag = "v8.2.0-alpha"
RELEASE_TAG = "v8.2.0-alpha"
tag = "v8.3.0-alpha"
RELEASE_TAG = "v8.3.0-alpha"
} else {
tag = RELEASE_TAG
}
Expand All @@ -41,15 +41,15 @@ node("build_go1130") {
}
}

if (RELEASE_TAG == "v8.2.0-alpha") {
if (RELEASE_TAG == "v8.3.0-alpha") {
stage("Get version info when nightly") {
dir("tidb") {
// sh"""
// wget ${FILE_SERVER_URL}/download/builds/pingcap/tidb/${tidb_sha1}/centos7/tidb-server.tar.gz
// tar xf tidb-server.tar.gz
// """
// tidb_version = sh(returnStdout: true, script: "./bin/tidb-server -V | awk 'NR==1{print \$NF}' | sed -r 's/(^[^-]*).*/\\1/'").trim()
tidb_version = "v8.2.0-alpha"
tidb_version = "v8.3.0-alpha"
time = sh(returnStdout: true, script: "date '+%Y%m%d'").trim()
tidb_version = "${tidb_version}-nightly-${time}"
RELEASE_BRANCH = "master"
Expand Down Expand Up @@ -103,7 +103,7 @@ node("build_go1130") {
build(job: "prometheus-tiup-mirror-update-test", wait: true, parameters: params1)
}

if (RELEASE_TAG == "v8.2.0-alpha") {
if (RELEASE_TAG == "v8.3.0-alpha") {
stage("TiUP build dm") {
build(job: "dm-tiup-mirror-update-test", wait: true, parameters: params1)
}
Expand Down