From bf79cd73eb88db2c8cf752e975343051c97bfd54 Mon Sep 17 00:00:00 2001 From: Thomas Draebing Date: Fri, 15 Nov 2019 12:36:21 +0100 Subject: [PATCH 1/5] Fix reporting for flaky builds in Jenkinsfile The verification pipeline was not properly reporting the results of builds that were suspect to being flaky. This happened, because the build did not save the results in a variable, if the propagate option was used, which had to be done for the pipeline plugin's retry command to work. Instead of using the retry-command provided by the pipeline plugin, the Jenkinsfile implements this behaviour manually. Bug: Issue 11927 Change-Id: I419a20f69cabc4c54d7f57fd04ad354563eafd71 --- Jenkinsfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ebf2136b4b..e09b0f0bef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -154,18 +154,19 @@ def collectBuildModes() { } def prepareBuildsForMode(buildName, mode="reviewdb", retryTimes = 1) { - def propagate = retryTimes == 1 ? false : true return { stage("${buildName}/${mode}") { - catchError{ - retry(retryTimes){ - def slaveBuild = build job: "${buildName}", parameters: [ + def slaveBuild = null + for (int i = 1; i <= retryTimes; i++) { + try { + slaveBuild = build job: "${buildName}", parameters: [ string(name: 'REFSPEC', value: Change.ref), string(name: 'BRANCH', value: Change.sha1), string(name: 'CHANGE_URL', value: Change.url), string(name: 'MODE', value: mode), string(name: 'TARGET_BRANCH', value: Change.branch) - ], propagate: propagate + ], propagate: false + } finally { if (buildName == "Gerrit-codestyle"){ Builds.codeStyle = new Build( slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) @@ -173,6 +174,9 @@ def prepareBuildsForMode(buildName, mode="reviewdb", retryTimes = 1) { Builds.verification[mode] = new Build( slaveBuild.getAbsoluteUrl(), slaveBuild.getResult()) } + if (slaveBuild.getResult() == "SUCCESS") { + break + } } } } From 596ee7838f7a36a6f2d25221690ec7bdf8b6a799 Mon Sep 17 00:00:00 2001 From: Paladox none Date: Sun, 24 Nov 2019 16:45:18 +0000 Subject: [PATCH 2/5] Change on-tap to on-click for iron-dropdown This fixes an issue under iOS 13 when clicking a button in the dropdown would not work. Bug: Issue 11984 Change-Id: I339524e1c9cde49f74c2b5228ca35ec9c0dfdece (cherry picked from commit ed757c0e7ae001c346519024435c8ec252d2de25) --- .../app/elements/shared/gr-dropdown-list/gr-dropdown-list.html | 2 +- .../app/elements/shared/gr-dropdown-list/gr-dropdown-list.js | 2 +- polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html | 2 +- polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list.html b/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list.html index f4b120a6af..42b6f941f9 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list.html +++ b/polygerrit-ui/app/elements/shared/gr-dropdown-list/gr-dropdown-list.html @@ -147,7 +147,7 @@ limitations under the License. id="dropdown" vertical-align="top" allow-outside-scroll="true" - on-tap="_handleDropdownTap"> + on-click="_handleDropdownClick"> { diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html index 47ab03a1f4..373e77d9bc 100644 --- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html +++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html @@ -109,7 +109,7 @@ limitations under the License. vertical-offset="[[verticalOffset]]" allow-outside-scroll="true" horizontal-align="[[horizontalAlign]]" - on-tap="_handleDropdownTap"> + on-click="_handleDropdownClick">