Skip to content

update #1074

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.

Sign up for GitHub

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

Merged
heibaijian merged 9 commits into from
Jun 2, 2022
Merged

update #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab9ad3d
update
heibaijian Jun 2, 2022
ea3da5e
update
heibaijian Jun 2, 2022
ecf0971
update
heibaijian Jun 2, 2022
3c17dc3
update
heibaijian Jun 2, 2022
10964c5
Merge branch 'main' into update0602
heibaijian Jun 2, 2022
b7a85c4
update
heibaijian Jun 2, 2022
2b8129c
Merge remote-tracking branch 'fork/update0602' into update0602
heibaijian Jun 2, 2022
e0106f0
fix
heibaijian Jun 2, 2022
e0c15a4
update
heibaijian Jun 2, 2022
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
27 changes: 12 additions & 15 deletions jenkins/pipelines/cd/release-GA.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,7 @@ try {
}
publishs["publish dm tiup offline package"] = {
if (DEBUG_MODE == "true") {
sh
"""
echo "DEBUG MODE:publish dm tiup offline packag"
"""
echo "DEBUG MODE:publish dm tiup offline package"
} else {
// publish dm offline package (include linux amd64 and arm64)
build job: 'tiup-package-offline-mirror-dm',
Expand All @@ -230,17 +227,17 @@ try {
} catch (Exception e) {
currentBuild.result = "FAILURE"
} finally {
// build job: 'send_notify',
// wait: true,
// parameters: [
// [$class: 'StringParameterValue', name: 'RESULT_JOB_NAME', value: "${JOB_NAME}"],
// [$class: 'StringParameterValue', name: 'RESULT_BUILD_RESULT', value: currentBuild.result],
// [$class: 'StringParameterValue', name: 'RESULT_BUILD_NUMBER', value: "${BUILD_NUMBER}"],
// [$class: 'StringParameterValue', name: 'RESULT_RUN_DISPLAY_URL', value: "${RUN_DISPLAY_URL}"],
// [$class: 'StringParameterValue', name: 'RESULT_TASK_START_TS', value: "${taskStartTimeInMillis}"],
// [$class: 'StringParameterValue', name: 'SEND_TYPE', value: "ALL"]
//
// ]
build job: 'send_notify',
wait: true,
parameters: [
[$class: 'StringParameterValue', name: 'RESULT_JOB_NAME', value: "${JOB_NAME}"],
[$class: 'StringParameterValue', name: 'RESULT_BUILD_RESULT', value: currentBuild.result],
[$class: 'StringParameterValue', name: 'RESULT_BUILD_NUMBER', value: "${BUILD_NUMBER}"],
[$class: 'StringParameterValue', name: 'RESULT_RUN_DISPLAY_URL', value: "${RUN_DISPLAY_URL}"],
[$class: 'StringParameterValue', name: 'RESULT_TASK_START_TS', value: "${taskStartTimeInMillis}"],
[$class: 'StringParameterValue', name: 'SEND_TYPE', value: "ALL"]

]
}
//stage('download') {
// dir('centos7') {
Expand Down
24 changes: 15 additions & 9 deletions jenkins/pipelines/cd/tiup/tiup-mirror-update-test-new.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

def get_hash = { hash_or_branch, repo ->
if (DEBUG_MODE == "true") {
return sh(returnStdout: true, script: "python gethash.py -repo=${repo} -version=${RELEASE_BRANCH} -s=github").trim()
return sh(returnStdout: true, script: "python gethash.py -repo=${repo} -version=${RELEASE_BRANCH} -source=github").trim()
} else {
if (hash_or_branch.length() == 40) {
return hash_or_branch
Expand All @@ -30,7 +30,7 @@ def get_hash = { hash_or_branch, repo ->
}
}

def tidb_sha1, tikv_sha1, pd_sha1, tidb_ctl_sha1, dm_sha1, tidb_binlog_sha1, platform, tag, tarball_name, tidb_version
def tidb_sha1, tikv_sha1, pd_sha1, tidb_ctl_sha1, dm_sha1, tidb_binlog_sha1, br_sha1, ticdc_sha1, lightning_sha1, dumpling_sha1, tiflash_sha1, platform, tag, tarball_name, tidb_version
def tidb_desc = "TiDB is an open source distributed HTAP database compatible with the MySQL protocol"
def tikv_desc = "Distributed transactional key-value database, originally created to complement TiDB"
def pd_desc = "PD is the abbreviation for Placement Driver. It is used to manage and schedule the TiKV cluster"
Expand Down Expand Up @@ -339,6 +339,8 @@ node("build_go1130") {
}

tidb_sha1 = get_hash(TIDB_HASH, "tidb")
br_sha1 = get_hash(BR_HASH, "tidb")
dumpling_sha1 = get_hash(DUMPLING_HASH, "tidb")
tidb_ctl_sha1 = sh(returnStdout: true, script: "curl ${FILE_SERVER_URL}/download/refs/pingcap/tidb-ctl/master/sha1").trim()
tikv_sha1 = get_hash(TIKV_HASH, "tikv")
pd_sha1 = get_hash(PD_HASH, "pd")
Expand All @@ -355,15 +357,19 @@ node("build_go1130") {
if (RELEASE_TAG == "nightly" || RELEASE_TAG >= "v5.3.0") {
dm_sha1 = get_hash(DM_HASH, "tiflow")
}
tiflash_sha1 = get_hash(TIFLASH_HASH, "tics")

println "tidb_sha1: ${tidb_sha1}"
println "br_sha1: ${br_sha1}"
println "dumpling_sha1: ${dumpling_sha1}"
println "tidb_ctl_sha1: ${tidb_ctl_sha1}"
println "tikv_sha1: ${tikv_sha1}"
println "pd_sha1: ${pd_sha1}"
println "tidb_binlog_sha1: ${tidb_binlog_sha1}"
println "ticdc_sha1: ${ticdc_sha1}"
println "lightning_sha1: ${lightning_sha1}"
println "dm_sha1: ${dm_sha1}"
println "tiflash_sha1: ${tiflash_sha1}"
}

if (RELEASE_TAG == "v6.2.0-alpha") {
Expand Down Expand Up @@ -397,7 +403,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${CDC_HASH}"),
string(name: "ORIGIN_TAG", value: "${ticdc_sha1}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
[$class: 'BooleanParameterValue', name: 'ARCH_MAC', value: params.ARCH_MAC],
Expand All @@ -418,7 +424,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${BR_HASH}"),
string(name: "ORIGIN_TAG", value: "${br_sha1}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
[$class: 'BooleanParameterValue', name: 'ARCH_MAC', value: params.ARCH_MAC],
Expand All @@ -438,7 +444,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${DUMPLING_HASH}"),
string(name: "ORIGIN_TAG", value: "${dumpling_sha1}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
[$class: 'BooleanParameterValue', name: 'ARCH_MAC', value: params.ARCH_MAC],
Expand All @@ -459,7 +465,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${BR_HASH}"),
string(name: "ORIGIN_TAG", value: "${lightning_sha1}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
[$class: 'BooleanParameterValue', name: 'ARCH_MAC', value: params.ARCH_MAC],
Expand All @@ -479,7 +485,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${TIFLASH_HASH}"),
string(name: "ORIGIN_TAG", value: "${tiflash_sha1}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
[$class: 'BooleanParameterValue', name: 'ARCH_MAC', value: params.ARCH_MAC],
Expand All @@ -499,7 +505,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${TIFLASH_HASH}"),
string(name: "ORIGIN_TAG", value: "${tiflash_sha1}"),
string(name: "RELEASE_BRANCH", value: "${RELEASE_BRANCH}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
Expand All @@ -519,7 +525,7 @@ node("build_go1130") {
string(name: "RELEASE_TAG", value: "${RELEASE_TAG}"),
string(name: "TIDB_VERSION", value: "${tidb_version}"),
string(name: "TIUP_MIRRORS", value: "${TIUP_MIRRORS}"),
string(name: "ORIGIN_TAG", value: "${TIFLASH_HASH}"),
string(name: "ORIGIN_TAG", value: "${tiflash_sha1}"),
string(name: "RELEASE_BRANCH", value: "${RELEASE_BRANCH}"),
[$class: 'BooleanParameterValue', name: 'ARCH_X86', value: params.ARCH_X86],
[$class: 'BooleanParameterValue', name: 'ARCH_ARM', value: params.ARCH_ARM],
Expand Down
6 changes: 3 additions & 3 deletions jenkins/pipelines/cd/tiup/tiup-package-offline-mirror-6.0.0.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,20 +188,20 @@ node("delivery") {
stage("build community tarball linux/amd64") {
deleteDir()
package_community("amd64")
if (release_tag >= "v4") {
if (release_tag >= "v4" || DEBUG_MODE == "true") {
package_tools "community", "amd64"
}
}

stage("build community tarball linux/arm64") {
package_community("arm64")
if (release_tag >= "v4") {
if (release_tag >= "v4" || DEBUG_MODE == "true") {
package_tools "community", "arm64"
}
}

def noEnterpriseList = ["v4.0.0", "v4.0.1", "v4.0.2"]
if (release_tag >= "v4" && !noEnterpriseList.contains(release_tag)) {
if ((release_tag >= "v4" && !noEnterpriseList.contains(release_tag)) || DEBUG_MODE == "true") {
stage("build enterprise tarball linux/amd64") {
package_enterprise("amd64")
package_tools "enterprise", "amd64"
Expand Down