opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  Update 'font-roboto' to 'font-roboto-local' in license files
  Update paper-styles to dd0b13e186b9690d5e74a93f6e51e0835ea60495
  Fix reporting for flaky builds in Jenkinsfile

Change-Id: I5799957d82eb9aaa5e3d25784535016f2e570550
This commit is contained in:
David Pursehouse
2019-11-26 10:38:16 +09:00
parent 6336802f35 df8e69fc10
commit a59dd58743
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/js_licenses.txt
View File

@@ -409,7 +409,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[[polymer]] [[polymer]]
polymer polymer
* js:font-roboto * js:font-roboto-local
* js:iron-a11y-announcer * js:iron-a11y-announcer
* js:iron-a11y-keys-behavior * js:iron-a11y-keys-behavior
* js:iron-autogrow-textarea * js:iron-autogrow-textarea

2
Documentation/licenses.txt
View File

@@ -2665,7 +2665,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[[polymer]] [[polymer]]
polymer polymer
* js:font-roboto * js:font-roboto-local
* js:iron-a11y-announcer * js:iron-a11y-announcer
* js:iron-a11y-keys-behavior * js:iron-a11y-keys-behavior
* js:iron-autogrow-textarea * js:iron-autogrow-textarea

14
Jenkinsfile vendored
View File

@@ -154,18 +154,19 @@ def collectBuildModes() {
} }
def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) { def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
def propagate = retryTimes == 1 ? false : true
return { return {
stage("${buildName}/${mode}") { stage("${buildName}/${mode}") {
catchError{ def slaveBuild = null
retry(retryTimes){ for (int i = 1; i <= retryTimes; i++) {
def slaveBuild = build job: "${buildName}", parameters: [ try {
slaveBuild = build job: "${buildName}", parameters: [
string(name: 'REFSPEC', value: Change.ref), string(name: 'REFSPEC', value: Change.ref),
string(name: 'BRANCH', value: Change.sha1), string(name: 'BRANCH', value: Change.sha1),
string(name: 'CHANGE_URL', value: Change.url), string(name: 'CHANGE_URL', value: Change.url),
string(name: 'MODE', value: mode), string(name: 'MODE', value: mode),
string(name: 'TARGET_BRANCH', value: Change.branch) string(name: 'TARGET_BRANCH', value: Change.branch)
], propagate: propagate ], propagate: false
} finally {
if (buildName == "Gerrit-codestyle"){ if (buildName == "Gerrit-codestyle"){
Builds.codeStyle = new Build( Builds.codeStyle = new Build(
slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
@@ -173,6 +174,9 @@ def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
Builds.verification[mode] = new Build( Builds.verification[mode] = new Build(
slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) slaveBuild.getAbsoluteUrl(), slaveBuild.getResult())
} }
if (slaveBuild.getResult() == "SUCCESS") {
break
}
} }
} }
} }