Skip to content

Commit

Permalink
chore: change nightly version (#2180)
Browse files Browse the repository at this point in the history 
* chore: add 7.2 to daily build

Signed-off-by: lijie <lijie@pingcap.com>

* chore: change nightly version to be v7.3.0-alpha

Signed-off-by: lijie <lijie@pingcap.com>

---------

Signed-off-by: lijie <lijie@pingcap.com>
  • Loading branch information
lijie authored Jun 19, 2023
1 parent 2c4adf2 commit ae527a1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
3 changes: 2 additions & 1 deletion jenkins/pipelines/cd/nightly/release-all-images-by-branch.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ properties([
H 18 * * * % GIT_BRANCH=release-6.1;FORCE_REBUILD=false;NEED_MULTIARCH=true
H 18 * * * % GIT_BRANCH=release-6.5;FORCE_REBUILD=false;NEED_MULTIARCH=true
H 18 * * * % GIT_BRANCH=release-7.1;FORCE_REBUILD=false;NEED_MULTIARCH=true
H 18 * * * % GIT_BRANCH=release-7.2;FORCE_REBUILD=false;NEED_MULTIARCH=true
H 19 * * * % GIT_BRANCH=master;FORCE_REBUILD=false;NEED_MULTIARCH=true
''')
])
Expand Down Expand Up @@ -83,7 +84,7 @@ HARBOR_PROJECT_PREFIX = "hub.pingcap.net/qa"


// for master branch: use default local tag: v6.1.0-nightly
RELEASE_TAG = "v7.2.0-alpha"
RELEASE_TAG = "v7.3.0-alpha"
if (GIT_BRANCH.startsWith("release-")) {
RELEASE_TAG = "v" + trimPrefix(GIT_BRANCH) + ".0-nightly"
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins/pipelines/cd/nightly/tiup-release-tidb-master-nightly.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ String PRODUCED_VERSION
retry(2) {
try {
timeout(600) {
RELEASE_TAG = "v7.2.0-alpha"
RELEASE_TAG = "v7.3.0-alpha"
node("build_go1130") {
container("golang") {
def ws = pwd()
Expand Down
8 changes: 4 additions & 4 deletions jenkins/pipelines/cd/tiup/tiup-mirror-update-test-new.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ node("build_go1130") {
sh "curl -s ${FILE_SERVER_URL}/download/builds/pingcap/ee/gethash.py > gethash.py"

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

if (RELEASE_TAG == "v7.2.0-alpha") {
if (RELEASE_TAG == "v7.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 = "v7.2.0-alpha"
tidb_version = "v7.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-mirror-update-test.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ node("build_go1130") {
sh "curl -s ${FILE_SERVER_URL}/download/builds/pingcap/ee/gethash.py > gethash.py"

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

if (RELEASE_TAG == "v7.2.0-alpha") {
if (RELEASE_TAG == "v7.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 = "v7.2.0-alpha"
tidb_version = "v7.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 @@ -270,7 +270,7 @@ node("build_go1130") {
parallel builds
}

if (RELEASE_TAG == "v7.2.0-alpha") {
if (RELEASE_TAG == "v7.3.0-alpha") {
stage("TiUP build dm") {
retry(3) {
build(job: "dm-tiup-mirror-update-test", wait: true, parameters: params1)
Expand Down
10 changes: 5 additions & 5 deletions jenkins/pipelines/cd/tiup/tiup-online-mirror-atom.groovy
View file
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 = "v7.2.0-alpha"
RELEASE_TAG = "v7.2.0-alpha"
tag = "v7.3.0-alpha"
RELEASE_TAG = "v7.3.0-alpha"
} else {
tag = RELEASE_TAG
}
Expand All @@ -41,15 +41,15 @@ node("build_go1130") {
}
}

if (RELEASE_TAG == "v7.2.0-alpha") {
if (RELEASE_TAG == "v7.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 = "v7.2.0-alpha"
tidb_version = "v7.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-mirrior-update-test", wait: true, parameters: params1)
}

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

0 comments on commit ae527a1

Please sign in to comment.