opendev/gerrit
Code Issues Proposed changes

Merge "Do not report verification status for branches" into stable-2.16

Browse Source
This commit is contained in:
David Pursehouse
2019-11-26 23:52:53 +00:00
committed by Gerrit Code Review
parent a94efbceed fff6e5cf4a
commit c8a5f9c187
1 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Jenkinsfile vendored
View File

@@ -185,9 +185,17 @@ def prepareBuildsForMode(buildName, mode="reviewdb", retryTimes = 1) {
def collectBuilds() { def collectBuilds() {
def builds = [:] def builds = [:]
builds["Gerrit-codestyle"] = prepareBuildsForMode("Gerrit-codestyle") if (env.GERRIT_CHANGE_NUMBER == "") {
Builds.modes.each { builds["java8"] = { -> build "Gerrit-bazel-${env.BRANCH_NAME}" }
builds["Gerrit-verification(${it})"] = prepareBuildsForMode("Gerrit-verifier-bazel", it)
if (env.BRANCH_NAME == "master") {
builds["java11"] = { -> build "Gerrit-bazel-java11-${env.BRANCH_NAME}" }
}
} else {
builds["Gerrit-codestyle"] = prepareBuildsForMode("Gerrit-codestyle")
Builds.modes.each {
builds["Gerrit-verification(${it})"] = prepareBuildsForMode("Gerrit-verifier-bazel", it)
}
} }
return builds return builds
} }
@@ -274,44 +282,48 @@ def createVerifyMsgBody(builds) {
node ('master') { node ('master') {
stage('Preparing'){ if (env.GERRIT_CHANGE_NUMBER != "") {
gerritReview labels: ['Verified': 0, 'Code-Style': 0] stage('Preparing'){
gerritReview labels: ['Verified': 0, 'Code-Style': 0]
getChangeMetaData() getChangeMetaData()
collectBuildModes() collectBuildModes()
}
} }
parallel(collectBuilds()) parallel(collectBuilds())
stage('Retry Flaky Builds'){ if (env.GERRIT_CHANGE_NUMBER != "") {
def flakyBuildsModes = findFlakyBuilds() stage('Retry Flaky Builds'){
if (flakyBuildsModes.size() > 0){ def flakyBuildsModes = findFlakyBuilds()
parallel flakyBuildsModes.collectEntries { if (flakyBuildsModes.size() > 0){
["Gerrit-verification(${it})" : parallel flakyBuildsModes.collectEntries {
prepareBuildsForMode("Gerrit-verifier-bazel", it, 3)] ["Gerrit-verification(${it})" :
prepareBuildsForMode("Gerrit-verifier-bazel", it, 3)]
}
} }
} }
}
stage('Report to Gerrit'){ stage('Report to Gerrit'){
resCodeStyle = getLabelValue(1, Builds.codeStyle.result) resCodeStyle = getLabelValue(1, Builds.codeStyle.result)
gerritReview( gerritReview(
labels: ['Code-Style': resCodeStyle], labels: ['Code-Style': resCodeStyle],
message: createCodeStyleMsgBody(Builds.codeStyle, resCodeStyle)) message: createCodeStyleMsgBody(Builds.codeStyle, resCodeStyle))
postCheck(new GerritCheck("codestyle", Change.number, Change.sha1, Builds.codeStyle)) postCheck(new GerritCheck("codestyle", Change.number, Change.sha1, Builds.codeStyle))
def verificationResults = Builds.verification.collect { k, v -> v } def verificationResults = Builds.verification.collect { k, v -> v }
def resVerify = verificationResults.inject(1) { def resVerify = verificationResults.inject(1) {
acc, build -> getLabelValue(acc, build.result) acc, build -> getLabelValue(acc, build.result)
}
gerritReview(
labels: ['Verified': resVerify],
message: createVerifyMsgBody(Builds.verification))
Builds.verification.each { type, build -> postCheck(
new GerritCheck(type, Change.number, Change.sha1, build)
)}
setResult(resVerify, resCodeStyle)
} }
gerritReview(
labels: ['Verified': resVerify],
message: createVerifyMsgBody(Builds.verification))
Builds.verification.each { type, build -> postCheck(
new GerritCheck(type, Change.number, Change.sha1, build)
)}
setResult(resVerify, resCodeStyle)
} }
} }