230006 2021-09-07 09:39:54 -0700 [build.webkit.org][ews-build.webkit.org] Only try to download from S3 on the production server 2021-09-13 04:10:39 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=218439 https://bugs.webkit.org/show_bug.cgi?id=218755 InRadar P2 Normal --- 1 clopez clopez aakash_jain angelos ap clopez dpino jbedard pnormand webkit-bug-importer oldest_to_newest 1791059 0 clopez 2021-09-07 09:39:54 -0700 Uploading the built product to S3 is only possible on the official deployment (since it has the keys, etc) So on tests deployments we need to find a different way of passing the built product between workers. r269261 implemented this for ews-build.webkit.org and then r269634 implemented it for build.webkit.org After this patches on a test deployment the product is not uploaded to S3, is only uploaded from the worker to the main buildbot server (master) However, the worker still tries to download the test product from S3 and only if fails it fall-backs to download it from the master. This is an issue, because the URL identifiers on S3 are not random, so it can happen that the S3 download on a test deployment doesn't fail but instead downloads the built product from the official deployment For build.webkit.org the only variable in the URL is the bot name, architecture and svn revision and for ews-build.webkit.org is the same but instead of the svn revision the patch number. And why is a problem downloading the built product from the official deployment instead of the test one? There are several problems with this. For example there is no guarantee that on a test deployment the built configurations are the same than on the official one. So I think is safe to assume that the user would want to consume the built products from her own test deployment. Also, even when testing the same build configurations, this can also causes issue on testers, see this example: 1. Official GTK build EWS builds patch 437292 on top of 91691c326150 (r282009) <https://ews-build.webkit.org/#/builders/36/builds/43955> 2. Uploads product it to https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/gtk-x86_64-release/437292.zip 3. Triggers GTK API test EWS 4. Official GTK API test EWS downloads patch 437292 for testing and correctly checkouts 91691c326150 (r282009) <https://ews-build.webkit.org/#/builders/34/builds/42792> A. Unofficial GTK build EWS builds patch 437292 on top of 1ee2b9feb0a3 (r282020) <https://ews-build.webkit-uat.org/#/builders/35/builds/107607> B. It don't uploads the product (transfer-to-s3 step is skipped) C. Triggers GTK WK2 Layout tests EWS D. Unofficial GTK WK2 Layout test EWS downloads patch 437292 for testing, but it downloads the patch from the official buildbot instead of the one from UAT (See 1.). That patch was built on top of r282009. However, this buildbot checkouts 1ee2b9feb0a3 (r282020) (which was the checkout used by the UAT buildbot GTK builder) E. So we end with this GTK WK2 Layout tests worker checked out at r282009 testing a patch that was built on top of r282020 <https://ews-build.webkit-uat.org/#/builders/34/builds/41403> What is the problem with this? - r282020 removed several failures from the TestExpectations file because it fixed those tests - But since the built-product we are testing was built on top of r282009 it still don't has the fixes implemented by r282020 - However, on our checkout the failures are removed from the TestExpectations file (because we are checking r282020 instead of r282009). - This causes unexpected failures on this Unofficial GTK WK2 Layout test EWS run <https://ews-build.webkit-uat.org/#/builders/34/builds/41403>, the tests imported/w3c/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque-cross-origin.sub.html and imported/w3c/web-platform-tests/css/css-color-adjust/rendering/dark-color-scheme/color-scheme-iframe-background-mismatch-opaque.html are failing because the built-product tested doesn't match the checked-out base version. 1791071 1 437517 clopez 2021-09-07 09:56:10 -0700 Created attachment 437517 Patch 1791081 2 437521 clopez 2021-09-07 10:11:56 -0700 Created attachment 437521 Patch 1791089 3 437525 clopez 2021-09-07 10:20:56 -0700 Created attachment 437525 Patch v2: Add an unit test 1791106 4 437525 aakash_jain 2021-09-07 10:50:07 -0700 Comment on attachment 437525 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437525&action=review > Tools/CISupport/build-webkit-org/steps.py:412 > + self.results = SKIPPED Ditto. This line isn't needed. > Tools/CISupport/ews-build/steps.py:2806 > + self.results = SKIPPED This line isn't needed. Better to remove it. I tested in https://ews-build.webkit-uat.org/#/builders/34/builds/41512 that it works without this line. 1791132 5 clopez 2021-09-07 11:19:00 -0700 Committed r282100 (241398@main): <https://commits.webkit.org/241398@main> 1791133 6 webkit-bug-importer 2021-09-07 11:19:18 -0700 <rdar://problem/82831029> 1792910 7 clopez 2021-09-13 04:10:39 -0700 (In reply to Carlos Alberto Lopez Perez from comment #0) > Uploading the built product to S3 is only possible on the official > deployment (since it has the keys, etc) > So on tests deployments we need to find a different way of passing the built > product between workers. > > r269261 implemented this for ews-build.webkit.org and then r269634 > implemented it for build.webkit.org ^^^ just a minor edit, above should say: "" r269248 implemented this for ews-build.webkit.org "" 437517 2021-09-07 09:56:10 -0700 2021-09-07 10:11:46 -0700 Patch bug-230006-20210907175528.patch text/plain 3636 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQzODI3ODkxZDA3ZDVlMjVlMzNlZmEwYmU2NWFkNzli MDY3YTU1Yy4uZDM1NjUwY2IwZGQzMWE5N2Y1ODNmZjZjZjU0ZTc3MDVmNzI2ODQyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDIxLTA5LTA3ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtidWlsZC53ZWJraXQub3JnXVtld3MtYnVpbGQud2Via2l0Lm9y Z10gT25seSB0cnkgdG8gZG93bmxvYWQgZnJvbSBTMyBvbiB0aGUgcHJvZHVjdGlvbiBzZXJ2ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDAwNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBVUkwg aWRlbnRpZmllcnMgdXNlZCBmb3IgdGhlIFMzIGJ1aWx0IHByb2R1Y3RzIGFyZSBub3QgcmFuZG9t LAorICAgICAgICB0aGV5IGRlcGVuZCBvbiB0aGUgcmV2aXNpb24gbnVtYmVyIG9yIHRoZSBwYXRj aCBudW1iZXIuIFNvIGl0IGNhbgorICAgICAgICBoYXBwZW4gdGhhbiBvbiBhIHRlc3QgZGVwbG95 bWVudCB0aGUgdGVzdGVyIGRvd25sb2FkcyB0aGUgYnVpbHQtcHJvZHVjdAorICAgICAgICBmcm9t IHRoZSBvZmZpY2lhbCBkZXBsb3ltZW50IGF0IHdlYmtpdC5vcmcgcmF0aGVyIHRoYW4gZnJvbSBp dHMgb3duIHdvcmtlci4KKworICAgICAgICBBdm9pZCB0aGlzIGJ5IGVuc3VyaW5nIHRoYXQgb25s eSBvbiB0aGUgb2ZmaWNpYWwgZGVwbG95bWVudCBpdCBpcyB0cmllZCB0bworICAgICAgICBkb3du bG9hZCBmcm9tIFMzLiBPbiB0aGUgdGVzdCBkZXBsb3ltZW50cyB0aGUgY29kZSB3aWxsIG5vdyBz a2lwIHRoZSBzdGVwIHRvCisgICAgICAgIGRvd25sb2FkIGZyb20gUzMgYW5kIGluc3RlYWQgaXQg d2lsbCBkb3dubG9hZCB0aGUgYnVpbHQgcHJvZHVjdCBmcm9tIHRoZSBtYXN0ZXIuCisKKyAgICAg ICAgKiBDSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVwcy5weToKKyAgICAgICAgKERvd25s b2FkQnVpbHRQcm9kdWN0LnN0YXJ0KToKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3QuZ2V0UmVzdWx0U3VtbWFyeSk6 CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdC5zdGFydCk6CisKIDIwMjEtMDktMDcgIEpv bmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIEV4Y2VwdGlvbiBp biBydW4td2Via2l0LXRlc3RzOiBCYWQgZmlsZSBkZXNjcmlwdG9yIChQYXJ0IDEpCmRpZmYgLS1n aXQgYS9Ub29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVwcy5weSBiL1Rvb2xzL0NJ U3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5CmluZGV4IDlhZWU0ZTAzYzc0ZTg2YTc0 MGUyNGQ3ODhmMDVjZDRmODZjNTc2NmEuLmY4OTdmMWM0ZTRmNDRmYzczMjM5N2U5MmNmZjZiYjE4 MGMyNzhhMmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0 ZXBzLnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5CkBA IC00MDUsNyArNDA1LDEzIEBAIGNsYXNzIERvd25sb2FkQnVpbHRQcm9kdWN0KHNoZWxsLlNoZWxs Q29tbWFuZCk6CiAgICAgZmx1bmtPbkZhaWx1cmUgPSBGYWxzZQogCiAgICAgZGVmIHN0YXJ0KHNl bGYpOgotICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCisgICAg ICAgICMgT25seSB0cnkgdG8gZG93bmxvYWQgZnJvbSBTMyBvbiB0aGUgb2ZmaWNpYWwgZGVwbG95 bWVudCA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMjMwMDA2PgorICAgICAgICBpZiBDVVJSRU5UX0hP U1ROQU1FID09IEJVSUxEX1dFQktJVF9IT1NUTkFNRToKKyAgICAgICAgICAgIHJldHVybiBzaGVs bC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKKyAgICAgICAgc2VsZi5idWlsZC5hZGRTdGVwc0Fm dGVyQ3VycmVudFN0ZXAoW0Rvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlcigpXSkKKyAgICAg ICAgc2VsZi5yZXN1bHRzID0gU0tJUFBFRAorICAgICAgICBzZWxmLmZpbmlzaGVkKFNLSVBQRUQp CisgICAgICAgIHJldHVybiBkZWZlci5zdWNjZWVkKE5vbmUpCiAKICAgICBkZWYgZXZhbHVhdGVD b21tYW5kKHNlbGYsIGNtZCk6CiAgICAgICAgIHJjID0gc2hlbGwuU2hlbGxDb21tYW5kLmV2YWx1 YXRlQ29tbWFuZChzZWxmLCBjbWQpCmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1 aWxkL3N0ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQppbmRleCBh NmFmM2NhMjg3NzYyZjI5YjQzZjExZTJlZGIxMGU5MThmY2JkODJkLi4yZGQ0MzdkN2VjNWZjMGQy MDdhMDk2NGEwYTYxMGNiZjY5MGVlMjNlIDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdz LWJ1aWxkL3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkK QEAgLTI3OTEsMTMgKzI3OTEsMjIgQEAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3Qoc2hlbGwu U2hlbGxDb21tYW5kKToKICAgICBmbHVua09uRmFpbHVyZSA9IEZhbHNlCiAKICAgICBkZWYgZ2V0 UmVzdWx0U3VtbWFyeShzZWxmKToKLSAgICAgICAgaWYgc2VsZi5yZXN1bHRzICE9IFNVQ0NFU1M6 CisgICAgICAgIGlmIHNlbGYucmVzdWx0cyBub3QgaW4gW1NVQ0NFU1MsIFNLSVBQRURdOgogICAg ICAgICAgICAgcmV0dXJuIHsnc3RlcCc6ICdGYWlsZWQgdG8gZG93bmxvYWQgYnVpbHQgcHJvZHVj dCBmcm9tIFMzJ30KICAgICAgICAgcmV0dXJuIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0LCBz ZWxmKS5nZXRSZXN1bHRTdW1tYXJ5KCkKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJn cyk6CiAgICAgICAgIHN1cGVyKERvd25sb2FkQnVpbHRQcm9kdWN0LCBzZWxmKS5fX2luaXRfXyhs b2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKIAorICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAg ICAgIyBPbmx5IHRyeSB0byBkb3dubG9hZCBmcm9tIFMzIG9uIHRoZSBvZmZpY2lhbCBkZXBsb3lt ZW50IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMzAwMDY+CisgICAgICAgIGlmIENVUlJFTlRfSE9T VE5BTUUgPT0gRVdTX0JVSUxEX0hPU1ROQU1FOgorICAgICAgICAgICAgcmV0dXJuIHNoZWxsLlNo ZWxsQ29tbWFuZC5zdGFydChzZWxmKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJD dXJyZW50U3RlcChbRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKCldKQorICAgICAgICBz ZWxmLnJlc3VsdHMgPSBTS0lQUEVECisgICAgICAgIHNlbGYuZmluaXNoZWQoU0tJUFBFRCkKKyAg ICAgICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKKwogICAgIGRlZiBldmFsdWF0ZUNvbW1h bmQoc2VsZiwgY21kKToKICAgICAgICAgcmMgPSBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVD b21tYW5kKHNlbGYsIGNtZCkKICAgICAgICAgaWYgcmMgPT0gRkFJTFVSRToK 437521 2021-09-07 10:11:56 -0700 2021-09-07 10:20:41 -0700 Patch bug-230006-20210907181114.patch text/plain 4831 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQzODI3ODkxZDA3ZDVlMjVlMzNlZmEwYmU2NWFkNzli MDY3YTU1Yy4uNzhlMjkwMTMzMTIxNDkyZGYxMjI4ZjU5MGUzNmI5YWVmNmVjMDM3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTA5LTA3ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtidWlsZC53ZWJraXQub3JnXVtld3MtYnVpbGQud2Via2l0Lm9y Z10gT25seSB0cnkgdG8gZG93bmxvYWQgZnJvbSBTMyBvbiB0aGUgcHJvZHVjdGlvbiBzZXJ2ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDAwNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBVUkwg aWRlbnRpZmllcnMgdXNlZCBmb3IgdGhlIFMzIGJ1aWx0IHByb2R1Y3RzIGFyZSBub3QgcmFuZG9t LAorICAgICAgICB0aGV5IGRlcGVuZCBvbiB0aGUgcmV2aXNpb24gbnVtYmVyIG9yIHRoZSBwYXRj aCBudW1iZXIuIFNvIGl0IGNhbgorICAgICAgICBoYXBwZW4gdGhhbiBvbiBhIHRlc3QgZGVwbG95 bWVudCB0aGUgdGVzdGVyIGRvd25sb2FkcyB0aGUgYnVpbHQtcHJvZHVjdAorICAgICAgICBmcm9t IHRoZSBvZmZpY2lhbCBkZXBsb3ltZW50IGF0IHdlYmtpdC5vcmcgcmF0aGVyIHRoYW4gZnJvbSBp dHMgb3duIHdvcmtlci4KKworICAgICAgICBBdm9pZCB0aGlzIGJ5IGVuc3VyaW5nIHRoYXQgb25s eSBvbiB0aGUgb2ZmaWNpYWwgZGVwbG95bWVudCBpdCBpcyB0cmllZCB0bworICAgICAgICBkb3du bG9hZCBmcm9tIFMzLiBPbiB0aGUgdGVzdCBkZXBsb3ltZW50cyB0aGUgY29kZSB3aWxsIG5vdyBz a2lwIHRoZSBzdGVwIHRvCisgICAgICAgIGRvd25sb2FkIGZyb20gUzMgYW5kIGluc3RlYWQgaXQg d2lsbCBkb3dubG9hZCB0aGUgYnVpbHQgcHJvZHVjdCBmcm9tIHRoZSBtYXN0ZXIuCisKKyAgICAg ICAgKiBDSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVwcy5weToKKyAgICAgICAgKERvd25s b2FkQnVpbHRQcm9kdWN0LnN0YXJ0KToKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3QuZ2V0UmVzdWx0U3VtbWFyeSk6 CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdC5zdGFydCk6CisgICAgICAgICogQ0lTdXBw b3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weToKKwogMjAyMS0wOS0wNyAgSm9uYXRoYW4g QmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgRXhjZXB0aW9uIGluIHJ1bi13 ZWJraXQtdGVzdHM6IEJhZCBmaWxlIGRlc2NyaXB0b3IgKFBhcnQgMSkKZGlmZiAtLWdpdCBhL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0 L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKaW5kZXggOWFlZTRlMDNjNzRlODZhNzQwZTI0ZDc4 OGYwNWNkNGY4NmM1NzY2YS4uZjg5N2YxYzRlNGY0NGZjNzMyMzk3ZTkyY2ZmNmJiMTgwYzI3OGEy ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkK KysrIGIvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKQEAgLTQwNSw3 ICs0MDUsMTMgQEAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3Qoc2hlbGwuU2hlbGxDb21tYW5k KToKICAgICBmbHVua09uRmFpbHVyZSA9IEZhbHNlCiAKICAgICBkZWYgc3RhcnQoc2VsZik6Ci0g ICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKKyAgICAgICAgIyBP bmx5IHRyeSB0byBkb3dubG9hZCBmcm9tIFMzIG9uIHRoZSBvZmZpY2lhbCBkZXBsb3ltZW50IDxo dHRwczovL3dlYmtpdC5vcmcvYi8yMzAwMDY+CisgICAgICAgIGlmIENVUlJFTlRfSE9TVE5BTUUg PT0gQlVJTERfV0VCS0lUX0hPU1ROQU1FOgorICAgICAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxs Q29tbWFuZC5zdGFydChzZWxmKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJy ZW50U3RlcChbRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKCldKQorICAgICAgICBzZWxm LnJlc3VsdHMgPSBTS0lQUEVECisgICAgICAgIHNlbGYuZmluaXNoZWQoU0tJUFBFRCkKKyAgICAg ICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKIAogICAgIGRlZiBldmFsdWF0ZUNvbW1hbmQo c2VsZiwgY21kKToKICAgICAgICAgcmMgPSBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVDb21t YW5kKHNlbGYsIGNtZCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHkgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IGE2YWYzY2Ey ODc3NjJmMjliNDNmMTFlMmVkYjEwZTkxOGZjYmQ4MmQuLjJkZDQzN2Q3ZWM1ZmMwZDIwN2EwOTY0 YTBhNjEwY2JmNjkwZWUyM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHMucHkKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMjc5 MSwxMyArMjc5MSwyMiBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENv bW1hbmQpOgogICAgIGZsdW5rT25GYWlsdXJlID0gRmFsc2UKIAogICAgIGRlZiBnZXRSZXN1bHRT dW1tYXJ5KHNlbGYpOgotICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VDQ0VTUzoKKyAgICAg ICAgaWYgc2VsZi5yZXN1bHRzIG5vdCBpbiBbU1VDQ0VTUywgU0tJUFBFRF06CiAgICAgICAgICAg ICByZXR1cm4geydzdGVwJzogJ0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0IGZyb20g UzMnfQogICAgICAgICByZXR1cm4gc3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLmdl dFJlc3VsdFN1bW1hcnkoKQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAg ICAgICAgc3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmly b249RmFsc2UsICoqa3dhcmdzKQogCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICAjIE9u bHkgdHJ5IHRvIGRvd25sb2FkIGZyb20gUzMgb24gdGhlIG9mZmljaWFsIGRlcGxveW1lbnQgPGh0 dHBzOi8vd2Via2l0Lm9yZy9iLzIzMDAwNj4KKyAgICAgICAgaWYgQ1VSUkVOVF9IT1NUTkFNRSA9 PSBFV1NfQlVJTERfSE9TVE5BTUU6CisgICAgICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21t YW5kLnN0YXJ0KHNlbGYpCisgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRT dGVwKFtEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoKV0pCisgICAgICAgIHNlbGYucmVz dWx0cyA9IFNLSVBQRUQKKyAgICAgICAgc2VsZi5maW5pc2hlZChTS0lQUEVEKQorICAgICAgICBy ZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQorCiAgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxm LCBjbWQpOgogICAgICAgICByYyA9IHNoZWxsLlNoZWxsQ29tbWFuZC5ldmFsdWF0ZUNvbW1hbmQo c2VsZiwgY21kKQogICAgICAgICBpZiByYyA9PSBGQUlMVVJFOgpkaWZmIC0tZ2l0IGEvVG9vbHMv Q0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weSBiL1Rvb2xzL0NJU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXggN2U0YmE1OGQ5N2IxMWFhZDIzM2NkZGVm YWVkYWM4NzBiMTFkZGZjNC4uYTA1YWNmYjZlMzcwNjYyYWRkZWFjODNjN2YwNzAwYWQ4YmM1YTJk MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5w eQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC0z MDM5LDcgKzMwMzksOCBAQCBjbGFzcyBUZXN0RG93bmxvYWRCdWlsdFByb2R1Y3QoQnVpbGRTdGVw TWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICsgMCwKICAg ICAgICAgKQogICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRl X3N0cmluZz0nRG93bmxvYWRlZCBidWlsdCBwcm9kdWN0JykKLSAgICAgICAgcmV0dXJuIHNlbGYu cnVuU3RlcCgpCisgICAgICAgIHdpdGggY3VycmVudF9ob3N0bmFtZShFV1NfQlVJTERfSE9TVE5B TUUpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKICAgICBkZWYgdGVzdF9m YWlsdXJlKHNlbGYpOgogICAgICAgICBzZWxmLnNldHVwU3RlcChEb3dubG9hZEJ1aWx0UHJvZHVj dCgpKQpAQCAtMzA1Niw3ICszMDU3LDggQEAgY2xhc3MgVGVzdERvd25sb2FkQnVpbHRQcm9kdWN0 KEJ1aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAg ICArIDIsCiAgICAgICAgICkKICAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1GQUlM VVJFLCBzdGF0ZV9zdHJpbmc9J0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0IGZyb20g UzMnKQotICAgICAgICByZXR1cm4gc2VsZi5ydW5TdGVwKCkKKyAgICAgICAgd2l0aCBjdXJyZW50 X2hvc3RuYW1lKEVXU19CVUlMRF9IT1NUTkFNRSk6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5y dW5TdGVwKCkKIAogCiBjbGFzcyBUZXN0RG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKEJ1 aWxkU3RlcE1peGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6Cg== 437525 2021-09-07 10:20:56 -0700 2021-09-07 11:19:54 -0700 Patch bug-230006-20210907182014.patch text/plain 5270 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMDkxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQzODI3ODkxZDA3ZDVlMjVlMzNlZmEwYmU2NWFkNzli MDY3YTU1Yy4uNzhlMjkwMTMzMTIxNDkyZGYxMjI4ZjU5MGUzNmI5YWVmNmVjMDM3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIxLTA5LTA3ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtidWlsZC53ZWJraXQub3JnXVtld3MtYnVpbGQud2Via2l0Lm9y Z10gT25seSB0cnkgdG8gZG93bmxvYWQgZnJvbSBTMyBvbiB0aGUgcHJvZHVjdGlvbiBzZXJ2ZXIK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDAwNgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBVUkwg aWRlbnRpZmllcnMgdXNlZCBmb3IgdGhlIFMzIGJ1aWx0IHByb2R1Y3RzIGFyZSBub3QgcmFuZG9t LAorICAgICAgICB0aGV5IGRlcGVuZCBvbiB0aGUgcmV2aXNpb24gbnVtYmVyIG9yIHRoZSBwYXRj aCBudW1iZXIuIFNvIGl0IGNhbgorICAgICAgICBoYXBwZW4gdGhhbiBvbiBhIHRlc3QgZGVwbG95 bWVudCB0aGUgdGVzdGVyIGRvd25sb2FkcyB0aGUgYnVpbHQtcHJvZHVjdAorICAgICAgICBmcm9t IHRoZSBvZmZpY2lhbCBkZXBsb3ltZW50IGF0IHdlYmtpdC5vcmcgcmF0aGVyIHRoYW4gZnJvbSBp dHMgb3duIHdvcmtlci4KKworICAgICAgICBBdm9pZCB0aGlzIGJ5IGVuc3VyaW5nIHRoYXQgb25s eSBvbiB0aGUgb2ZmaWNpYWwgZGVwbG95bWVudCBpdCBpcyB0cmllZCB0bworICAgICAgICBkb3du bG9hZCBmcm9tIFMzLiBPbiB0aGUgdGVzdCBkZXBsb3ltZW50cyB0aGUgY29kZSB3aWxsIG5vdyBz a2lwIHRoZSBzdGVwIHRvCisgICAgICAgIGRvd25sb2FkIGZyb20gUzMgYW5kIGluc3RlYWQgaXQg d2lsbCBkb3dubG9hZCB0aGUgYnVpbHQgcHJvZHVjdCBmcm9tIHRoZSBtYXN0ZXIuCisKKyAgICAg ICAgKiBDSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVwcy5weToKKyAgICAgICAgKERvd25s b2FkQnVpbHRQcm9kdWN0LnN0YXJ0KToKKyAgICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0 ZXBzLnB5OgorICAgICAgICAoRG93bmxvYWRCdWlsdFByb2R1Y3QuZ2V0UmVzdWx0U3VtbWFyeSk6 CisgICAgICAgIChEb3dubG9hZEJ1aWx0UHJvZHVjdC5zdGFydCk6CisgICAgICAgICogQ0lTdXBw b3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weToKKwogMjAyMS0wOS0wNyAgSm9uYXRoYW4g QmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgRXhjZXB0aW9uIGluIHJ1bi13 ZWJraXQtdGVzdHM6IEJhZCBmaWxlIGRlc2NyaXB0b3IgKFBhcnQgMSkKZGlmZiAtLWdpdCBhL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0 L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKaW5kZXggOWFlZTRlMDNjNzRlODZhNzQwZTI0ZDc4 OGYwNWNkNGY4NmM1NzY2YS4uZjg5N2YxYzRlNGY0NGZjNzMyMzk3ZTkyY2ZmNmJiMTgwYzI3OGEy ZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkK KysrIGIvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKQEAgLTQwNSw3 ICs0MDUsMTMgQEAgY2xhc3MgRG93bmxvYWRCdWlsdFByb2R1Y3Qoc2hlbGwuU2hlbGxDb21tYW5k KToKICAgICBmbHVua09uRmFpbHVyZSA9IEZhbHNlCiAKICAgICBkZWYgc3RhcnQoc2VsZik6Ci0g ICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKKyAgICAgICAgIyBP bmx5IHRyeSB0byBkb3dubG9hZCBmcm9tIFMzIG9uIHRoZSBvZmZpY2lhbCBkZXBsb3ltZW50IDxo dHRwczovL3dlYmtpdC5vcmcvYi8yMzAwMDY+CisgICAgICAgIGlmIENVUlJFTlRfSE9TVE5BTUUg PT0gQlVJTERfV0VCS0lUX0hPU1ROQU1FOgorICAgICAgICAgICAgcmV0dXJuIHNoZWxsLlNoZWxs Q29tbWFuZC5zdGFydChzZWxmKQorICAgICAgICBzZWxmLmJ1aWxkLmFkZFN0ZXBzQWZ0ZXJDdXJy ZW50U3RlcChbRG93bmxvYWRCdWlsdFByb2R1Y3RGcm9tTWFzdGVyKCldKQorICAgICAgICBzZWxm LnJlc3VsdHMgPSBTS0lQUEVECisgICAgICAgIHNlbGYuZmluaXNoZWQoU0tJUFBFRCkKKyAgICAg ICAgcmV0dXJuIGRlZmVyLnN1Y2NlZWQoTm9uZSkKIAogICAgIGRlZiBldmFsdWF0ZUNvbW1hbmQo c2VsZiwgY21kKToKICAgICAgICAgcmMgPSBzaGVsbC5TaGVsbENvbW1hbmQuZXZhbHVhdGVDb21t YW5kKHNlbGYsIGNtZCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3Rl cHMucHkgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4IGE2YWYzY2Ey ODc3NjJmMjliNDNmMTFlMmVkYjEwZTkxOGZjYmQ4MmQuLjJkZDQzN2Q3ZWM1ZmMwZDIwN2EwOTY0 YTBhNjEwY2JmNjkwZWUyM2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQv c3RlcHMucHkKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQpAQCAtMjc5 MSwxMyArMjc5MSwyMiBAQCBjbGFzcyBEb3dubG9hZEJ1aWx0UHJvZHVjdChzaGVsbC5TaGVsbENv bW1hbmQpOgogICAgIGZsdW5rT25GYWlsdXJlID0gRmFsc2UKIAogICAgIGRlZiBnZXRSZXN1bHRT dW1tYXJ5KHNlbGYpOgotICAgICAgICBpZiBzZWxmLnJlc3VsdHMgIT0gU1VDQ0VTUzoKKyAgICAg ICAgaWYgc2VsZi5yZXN1bHRzIG5vdCBpbiBbU1VDQ0VTUywgU0tJUFBFRF06CiAgICAgICAgICAg ICByZXR1cm4geydzdGVwJzogJ0ZhaWxlZCB0byBkb3dubG9hZCBidWlsdCBwcm9kdWN0IGZyb20g UzMnfQogICAgICAgICByZXR1cm4gc3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLmdl dFJlc3VsdFN1bW1hcnkoKQogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICoqa3dhcmdzKToKICAg ICAgICAgc3VwZXIoRG93bmxvYWRCdWlsdFByb2R1Y3QsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmly b249RmFsc2UsICoqa3dhcmdzKQogCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICAjIE9u bHkgdHJ5IHRvIGRvd25sb2FkIGZyb20gUzMgb24gdGhlIG9mZmljaWFsIGRlcGxveW1lbnQgPGh0 dHBzOi8vd2Via2l0Lm9yZy9iLzIzMDAwNj4KKyAgICAgICAgaWYgQ1VSUkVOVF9IT1NUTkFNRSA9 PSBFV1NfQlVJTERfSE9TVE5BTUU6CisgICAgICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21t YW5kLnN0YXJ0KHNlbGYpCisgICAgICAgIHNlbGYuYnVpbGQuYWRkU3RlcHNBZnRlckN1cnJlbnRT dGVwKFtEb3dubG9hZEJ1aWx0UHJvZHVjdEZyb21NYXN0ZXIoKV0pCisgICAgICAgIHNlbGYucmVz dWx0cyA9IFNLSVBQRUQKKyAgICAgICAgc2VsZi5maW5pc2hlZChTS0lQUEVEKQorICAgICAgICBy ZXR1cm4gZGVmZXIuc3VjY2VlZChOb25lKQorCiAgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxm LCBjbWQpOgogICAgICAgICByYyA9IHNoZWxsLlNoZWxsQ29tbWFuZC5ldmFsdWF0ZUNvbW1hbmQo c2VsZiwgY21kKQogICAgICAgICBpZiByYyA9PSBGQUlMVVJFOgpkaWZmIC0tZ2l0IGEvVG9vbHMv Q0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weSBiL1Rvb2xzL0NJU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXggN2U0YmE1OGQ5N2IxMWFhZDIzM2NkZGVm YWVkYWM4NzBiMTFkZGZjNC4uMjI4OGYzNGM3ZGM5YWEwYWEzMzQ5YTdiZmIyZmFiOTQxMTQ2ODI5 MCAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5w eQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC0z MDM5LDcgKzMwMzksOCBAQCBjbGFzcyBUZXN0RG93bmxvYWRCdWlsdFByb2R1Y3QoQnVpbGRTdGVw TWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICsgMCwKICAg ICAgICAgKQogICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1MsIHN0YXRl X3N0cmluZz0nRG93bmxvYWRlZCBidWlsdCBwcm9kdWN0JykKLSAgICAgICAgcmV0dXJuIHNlbGYu cnVuU3RlcCgpCisgICAgICAgIHdpdGggY3VycmVudF9ob3N0bmFtZShFV1NfQlVJTERfSE9TVE5B TUUpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKICAgICBkZWYgdGVzdF9m YWlsdXJlKHNlbGYpOgogICAgICAgICBzZWxmLnNldHVwU3RlcChEb3dubG9hZEJ1aWx0UHJvZHVj dCgpKQpAQCAtMzA1Niw3ICszMDU3LDE4IEBAIGNsYXNzIFRlc3REb3dubG9hZEJ1aWx0UHJvZHVj dChCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAg ICAgKyAyLAogICAgICAgICApCiAgICAgICAgIHNlbGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9RkFJ TFVSRSwgc3RhdGVfc3RyaW5nPSdGYWlsZWQgdG8gZG93bmxvYWQgYnVpbHQgcHJvZHVjdCBmcm9t IFMzJykKLSAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCisgICAgICAgIHdpdGggY3VycmVu dF9ob3N0bmFtZShFV1NfQlVJTERfSE9TVE5BTUUpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYu cnVuU3RlcCgpCisKKyAgICBkZWYgdGVzdF9kZXBsb3ltZW50X3NraXBwZWQoc2VsZik6CisgICAg ICAgIHNlbGYuc2V0dXBTdGVwKERvd25sb2FkQnVpbHRQcm9kdWN0KCkpCisgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScsICdndGsnKQorICAgICAgICBzZWxmLnNldFByb3Bl cnR5KCdjb25maWd1cmF0aW9uJywgJ3JlbGVhc2UnKQorICAgICAgICBzZWxmLnNldFByb3BlcnR5 KCdhcmNoaXRlY3R1cmUnLCAneDg2XzY0JykKKyAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgncGF0 Y2hfaWQnLCAnMTIzNDU2JykKKyAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TS0lQ UEVEKQorICAgICAgICB3aXRoIGN1cnJlbnRfaG9zdG5hbWUoJ3Rlc3QtZXdzLWRlcGxveW1lbnQu aWdhbGlhLmNvbScpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYucnVuU3RlcCgpCiAKIAogY2xh c3MgVGVzdERvd25sb2FkQnVpbHRQcm9kdWN0RnJvbU1hc3RlcihCdWlsZFN0ZXBNaXhpbkFkZGl0 aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgo=