Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Do not report verification status for branches

Change-Id: I4bc07ca2c5de5e78419be6f56afbe82f5df67987
This commit is contained in:
David Pursehouse
2019-11-27 08:53:43 +09:00

12
Jenkinsfile vendored
View File

@@ -185,10 +185,18 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
def collectBuilds() {
def builds = [:]
if (env.GERRIT_CHANGE_NUMBER == "") {
builds["java8"] = { -> build "Gerrit-bazel-${env.BRANCH_NAME}" }
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
}
@@ -274,15 +282,18 @@ def createVerifyMsgBody(builds) {
node ('master') {
if (env.GERRIT_CHANGE_NUMBER != "") {
stage('Preparing'){
gerritReview labels: ['Verified': 0, 'Code-Style': 0]
getChangeMetaData()
collectBuildModes()
}
}
parallel(collectBuilds())
if (env.GERRIT_CHANGE_NUMBER != "") {
stage('Retry Flaky Builds'){
def flakyBuildsModes = findFlakyBuilds()
if (flakyBuildsModes.size() > 0){
@@ -314,4 +325,5 @@ node ('master') {
setResult(resVerify, resCodeStyle)
}
}
}