diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-12-08 11:31:52 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-12-08 11:31:52 +0900 |
| commit | 82ee9dc5ae4fdb88a267118170b512bc36f05693 (patch) | |
| tree | 32fb6aee21c829f70e3e30b565947cbdae25a039 | |
| parent | 0e3b7bcb9ca5c10ee5906bc1133e908c799db581 (diff) | |
| parent | c5e879b8adfc019750b6ec0b16c0d5e6d90adcaa (diff) | |
Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Use reliable check for empty env.GERRIT_CHANGE_NUMBER
Do not build on stable-2.14 branch
Change-Id: If60fc67b15f4b5090cbee6dd9c65f4dbe4b5fcba
| -rw-r--r-- | Jenkinsfile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index f21c7897e6..988f839533 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -88,6 +88,10 @@ class GerritCheck { } } +def hasChangeNumber() { + env.GERRIT_CHANGE_NUMBER?.trim() +} + def postCheck(check) { def gerritPostUrl = Globals.gerritUrl + "a/changes/${check.changeNum}/revisions/${check.sha1}/checks" @@ -185,17 +189,17 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) { def collectBuilds() { def builds = [:] - if (env.GERRIT_CHANGE_NUMBER == "") { + if (hasChangeNumber()) { + builds["Gerrit-codestyle"] = prepareBuildsForMode("Gerrit-codestyle") + Builds.modes.each { + builds["Gerrit-verification(${it})"] = prepareBuildsForMode("Gerrit-verifier-bazel", it) + } + } else { 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 } @@ -282,7 +286,7 @@ def createVerifyMsgBody(builds) { node ('master') { - if (env.GERRIT_CHANGE_NUMBER != "") { + if (hasChangeNumber()) { stage('Preparing'){ gerritReview labels: ['Verified': 0, 'Code-Style': 0] @@ -293,7 +297,7 @@ node ('master') { parallel(collectBuilds()) - if (env.GERRIT_CHANGE_NUMBER != "") { + if (hasChangeNumber()) { stage('Retry Flaky Builds'){ def flakyBuildsModes = findFlakyBuilds() if (flakyBuildsModes.size() > 0){ |