From bf79cd73eb88db2c8cf752e975343051c97bfd54 Mon Sep 17 00:00:00 2001 From: Thomas Draebing Date: Fri, 15 Nov 2019 12:36:21 +0100 Subject: [PATCH 1/3] 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 c12ed4a869a03f2ca02b76b304a5b5688c997a84 Mon Sep 17 00:00:00 2001 From: Paladox none Date: Mon, 25 Nov 2019 16:34:10 +0000 Subject: [PATCH 2/3] Update paper-styles to dd0b13e186b9690d5e74a93f6e51e0835ea60495 This includes a fix to stop using google fonts external resource and rather use local fonts. Bug: Issue 11993 Change-Id: I731e54ca872a2430461bc4de7d3c2dfe6d56062e --- lib/js/bower_archives.bzl | 12 +++++++----- lib/js/bower_components.bzl | 4 ++-- tools/js/bower2bazel.py | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/js/bower_archives.bzl b/lib/js/bower_archives.bzl index 75c827700d..d84a2b6e7a 100644 --- a/lib/js/bower_archives.bzl +++ b/lib/js/bower_archives.bzl @@ -26,10 +26,10 @@ def load_bower_archives(): sha1 = "849ad3ee7c77506548b7b5db603a4e150b9431aa", ) bower_archive( - name = "font-roboto", - package = "PolymerElements/font-roboto", + name = "font-roboto-local", + package = "PolymerElements/font-roboto-local", version = "1.1.0", - sha1 = "ab4218d87b9ce569d6282b01f7642e551879c3d5", + sha1 = "de651abf9b1b2d0935f7b264d48131677196412f", ) bower_archive( name = "iron-a11y-announcer", @@ -136,8 +136,10 @@ def load_bower_archives(): bower_archive( name = "paper-styles", package = "PolymerElements/paper-styles", - version = "1.3.1", - sha1 = "4ee9c692366949a754e0e39f8031aa60ce66f24d", + # Basically 1.3.1 but with + # https://github.com/PolymerElements/paper-styles/pull/164 applied + version = "dd0b13e186b9690d5e74a93f6e51e0835ea60495", + sha1 = "f859a8dee403fbb724e8d0cf009db79c6dd61b47", ) bower_archive( name = "sinon-chai", diff --git a/lib/js/bower_components.bzl b/lib/js/bower_components.bzl index a54082845c..64ab611362 100644 --- a/lib/js/bower_components.bzl +++ b/lib/js/bower_components.bzl @@ -30,7 +30,7 @@ def define_bower_components(): seed = True, ) bower_component( - name = "font-roboto", + name = "font-roboto-local", license = "//lib:LICENSE-polymer", ) bower_component( @@ -286,7 +286,7 @@ def define_bower_components(): name = "paper-styles", license = "//lib:LICENSE-polymer", deps = [ - ":font-roboto", + ":font-roboto-local", ":iron-flex-layout", ":polymer", ], diff --git a/tools/js/bower2bazel.py b/tools/js/bower2bazel.py index 7b2452494c..7d00c0dba5 100755 --- a/tools/js/bower2bazel.py +++ b/tools/js/bower2bazel.py @@ -38,7 +38,7 @@ package_licenses = { "codemirror-minified": "codemirror-minified", "es6-promise": "es6-promise", "fetch": "fetch", - "font-roboto": "polymer", + "font-roboto-local": "polymer", "iron-a11y-announcer": "polymer", "iron-a11y-keys-behavior": "polymer", "iron-autogrow-textarea": "polymer", @@ -77,7 +77,7 @@ package_licenses = { "paper-behaviors": "polymer", "paper-ripple": "polymer", "iron-checked-element-behavior": "polymer", - "font-roboto": "polymer", + "font-roboto-local": "polymer", } From df8e69fc105c64ee5d873ce812e0ceaab9e81dbc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 26 Nov 2019 10:36:14 +0900 Subject: [PATCH 3/3] Update 'font-roboto' to 'font-roboto-local' in license files font-roboto was replaced with font-roboto-local in Change I731e54ca8 on stable-2.16, but the license files don't exist there. Change-Id: Iee735bdd574868ccaf4d801cabd3e63f88f7e3f5 --- Documentation/js_licenses.txt | 2 +- Documentation/licenses.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/js_licenses.txt b/Documentation/js_licenses.txt index 6a83980923..bb1399d9d9 100644 --- a/Documentation/js_licenses.txt +++ b/Documentation/js_licenses.txt @@ -410,7 +410,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. [[polymer]] polymer -* js:font-roboto +* js:font-roboto-local * js:iron-a11y-announcer * js:iron-a11y-keys-behavior * js:iron-autogrow-textarea diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt index 6e61e29acf..dea563aeef 100644 --- a/Documentation/licenses.txt +++ b/Documentation/licenses.txt @@ -2665,7 +2665,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. [[polymer]] polymer -* js:font-roboto +* js:font-roboto-local * js:iron-a11y-announcer * js:iron-a11y-keys-behavior * js:iron-autogrow-textarea