229498 2021-08-25 09:02:30 -0700 [git-webkit] Use Python 3 in CI 2022-03-09 10:46:01 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225929 https://bugs.webkit.org/show_bug.cgi?id=229574 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ews-watchlist webkit-bug-importer oldest_to_newest 1787180 0 jbedard 2021-08-25 09:02:30 -0700 Although git-webkit supports Python 2, it's a Python 3 script and should be invoked as such. A previous attempt to do this was effected by https://bugs.webkit.org/show_bug.cgi?id=229172, which has now been resolved 1787181 1 webkit-bug-importer 2021-08-25 09:06:19 -0700 <rdar://problem/82342387> 1787182 2 436394 jbedard 2021-08-25 09:07:07 -0700 Created attachment 436394 Patch 1787224 3 436404 jbedard 2021-08-25 11:08:31 -0700 Created attachment 436404 Patch 1787254 4 436404 aakash_jain 2021-08-25 12:32:13 -0700 Comment on attachment 436404 Patch I applied this patch on ews uat instance and tested in https://ews-build.webkit-uat.org/#/builders/35/builds/106357 Hopefully we wouldn't see any unexpected issue this time. 1787256 5 jbedard 2021-08-25 12:36:43 -0700 (In reply to Aakash Jain from comment #4) > Comment on attachment 436404 [details] > Patch > > I applied this patch on ews uat instance and tested in > https://ews-build.webkit-uat.org/#/builders/35/builds/106357 > > Hopefully we wouldn't see any unexpected issue this time. The issue last time had to do with the auto installer, which I fixed as part of run-webkit-tests moving to Python 3. 1787315 6 ews-feeder 2021-08-25 14:18:23 -0700 Committed r281586 (240950@main): <https://commits.webkit.org/240950@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436404. 1787671 7 aakash_jain 2021-08-26 10:40:40 -0700 buildbot on build.webkit.org has been restarted to pick up this change. 1787989 8 aakash_jain 2021-08-27 04:19:45 -0700 buildbot on EWS has been restarted to pick up this change. 1849771 9 jbedard 2022-03-09 10:46:01 -0800 *** Bug 222045 has been marked as a duplicate of this bug. *** 436394 2021-08-25 09:07:07 -0700 2021-08-25 11:08:30 -0700 Patch bug-229498-20210825090706.patch text/plain 5132 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTU1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDYwOWI4OTkyNjI2MmY4YTllZTI5Y2VhMmUxZmNiZDE5 ODAxMjU2My4uNTJmMjM3YThjNzEzYmQ4NzVmZjFlYTEzOTZlODliNTBhMGRiNDdiNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTA4LTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gVXNlIFB5dGhvbiAzIGluIENJCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk0OTgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIENJU3VwcG9ydC9idWlsZC13ZWJraXQt b3JnL3N0ZXBzLnB5OgorICAgICAgICAoU2hvd0lkZW50aWZpZXIuc3RhcnQpOiBJbnZva2UgZ2l0 LXdlYmtpdCB3aXRoIFB5dGhvbiAzLgorICAgICAgICAqIENJU3VwcG9ydC9idWlsZC13ZWJraXQt b3JnL3N0ZXBzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFNob3dJZGVudGlmaWVyLnRlc3Rf c3VjY2Vzcyk6CisgICAgICAgIChUZXN0U2hvd0lkZW50aWZpZXIudGVzdF9mYWlsdXJlKToKKyAg ICAgICAgKiBDSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoU2hvd0lkZW50 aWZpZXIuc3RhcnQpOiBJbnZva2UgZ2l0LXdlYmtpdCB3aXRoIFB5dGhvbiAzLgorICAgICAgICAq IENJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHk6CisKIDIwMjEtMDgtMjQgIEFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFsgaU9TIF0gVGVzdFdlYktp dEFQSS5Eb2N1bWVudEVkaXRpbmdDb250ZXh0LlJlcXVlc3QqIHRlc3RzIGFyZSBmYWlsaW5nCmRp ZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVwcy5weSBiL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5CmluZGV4IDc2NWZhMzBjMDk4 MmQ4YjkyM2Q1ZjAzN2EzOTJiYWM5MDE4N2MzNjYuLmVlMDNjMWMzMWJlYTFmYmQ1NTk5ZGZkY2Rm MDMwODMxMjkyNjBlNjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQt b3JnL3N0ZXBzLnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBz LnB5CkBAIC0xMjY0LDcgKzEyNjQsNyBAQCBjbGFzcyBTaG93SWRlbnRpZmllcihzaGVsbC5TaGVs bENvbW1hbmQpOgogICAgICAgICBzZWxmLmxvZ19vYnNlcnZlciA9IGxvZ29ic2VydmVyLkJ1ZmZl ckxvZ09ic2VydmVyKCkKICAgICAgICAgc2VsZi5hZGRMb2dPYnNlcnZlcignc3RkaW8nLCBzZWxm LmxvZ19vYnNlcnZlcikKICAgICAgICAgcmV2aXNpb24gPSBzZWxmLmdldFByb3BlcnR5KCdnb3Rf cmV2aXNpb24nKQotICAgICAgICBzZWxmLnNldENvbW1hbmQoWydweXRob24nLCAnVG9vbHMvU2Ny aXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAncnt9Jy5mb3JtYXQocmV2aXNpb24pXSkKKyAgICAg ICAgc2VsZi5zZXRDb21tYW5kKFsncHl0aG9uMycsICdUb29scy9TY3JpcHRzL2dpdC13ZWJraXQn LCAnZmluZCcsICdye30nLmZvcm1hdChyZXZpc2lvbildKQogICAgICAgICByZXR1cm4gc2hlbGwu U2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCiAKICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYs IGNtZCk6CmRpZmYgLS1naXQgYS9Ub29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9zdGVw c191bml0dGVzdC5weSBiL1Rvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzX3Vu aXR0ZXN0LnB5CmluZGV4IDVkMzA1NzQ2ZTgxOWFhMTVkNTA1MjY5Y2RlNTIzODc5YjI3NGVjZTEu Ljg4YmJhOGVmYzA4MWQwOTA1YTAzNzViMTFmNWM5NmFjZTM2ZGVmNzQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzX3VuaXR0ZXN0LnB5CisrKyBiL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC01MTMs NyArNTEzLDcgQEAgY2xhc3MgVGVzdFNob3dJZGVudGlmaWVyKEJ1aWxkU3RlcE1peGluQWRkaXRp b25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBFeHBlY3RTaGVsbCh3b3JrZGly PSd3a2RpcicsCiAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTYwMCwKICAgICAgICAg ICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCi0gICAgICAgICAgICAgICAgICAgICAg ICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdmaW5kJywg J3IyNzI2OTInXSkgKworICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbjMn LCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAncjI3MjY5MiddKSArCiAgICAg ICAgICAgICBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdJZGVudGlmaWVyOiAyMzM5 MzlAbWFpbicpICsKICAgICAgICAgICAgIDAsCiAgICAgICAgICkKQEAgLTUyOSw3ICs1MjksNyBA QCBjbGFzcyBUZXN0U2hvd0lkZW50aWZpZXIoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywK ICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9NjAwLAogICAgICAgICAgICAgICAgICAg ICAgICAgbG9nRW52aXJvbj1GYWxzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9 WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAncjI3MjY5Midd KSArCisgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uMycsICdUb29scy9T Y3JpcHRzL2dpdC13ZWJraXQnLCAnZmluZCcsICdyMjcyNjkyJ10pICsKICAgICAgICAgICAgIEV4 cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9J1VuZXhwZWN0ZWQgZmFpbHVyZScpICsKICAg ICAgICAgICAgIDIsCiAgICAgICAgICkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHkgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CmluZGV4 IDMzMWQxMWMwOGI2NmVjNzM0MDIyYWQ4YWZkZTE5NmRlZmIxZWE0Y2MuLjgxYzQwZjc1MDk4NTE1 Mjc3YjIyYjYyOTY1OTIzZDNkZmNiMjgyMGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NJU3VwcG9ydC9l d3MtYnVpbGQvc3RlcHMucHkKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5w eQpAQCAtMjIzLDcgKzIyMyw3IEBAIGNsYXNzIFNob3dJZGVudGlmaWVyKHNoZWxsLlNoZWxsQ29t bWFuZCk6CiAgICAgICAgIHJldmlzaW9uID0gc2VsZi5nZXRQcm9wZXJ0eSgnZXdzX3JldmlzaW9u Jywgc2VsZi5nZXRQcm9wZXJ0eSgnZ290X3JldmlzaW9uJykpCiAgICAgICAgIGlmIG5vdCByZXZp c2lvbjoKICAgICAgICAgICAgIHJldmlzaW9uID0gJ0hFQUQnCi0gICAgICAgIHNlbGYuc2V0Q29t bWFuZChbJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL2dpdC13ZWJraXQnLCAnZmluZCcsIHJldmlz aW9uXSkKKyAgICAgICAgc2VsZi5zZXRDb21tYW5kKFsncHl0aG9uMycsICdUb29scy9TY3JpcHRz L2dpdC13ZWJraXQnLCAnZmluZCcsIHJldmlzaW9uXSkKICAgICAgICAgcmV0dXJuIHNoZWxsLlNo ZWxsQ29tbWFuZC5zdGFydChzZWxmKQogCiAgICAgZGVmIGV2YWx1YXRlQ29tbWFuZChzZWxmLCBj bWQpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwc191bml0dGVz dC5weSBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXgg NTZiNTA1MTFlNzBlYzdjOWU2ZjY4ZDIyOTc2OWFkY2M2M2RkYWU3Yy4uY2ZiZmYyNmFhMTMyN2U4 Y2Q3ODQyNjE4YTA4ODgwYzFhOTcwM2JmMCAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3 cy1idWlsZC9zdGVwc191bml0dGVzdC5weQorKysgYi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzX3VuaXR0ZXN0LnB5CkBAIC00MzQ5LDcgKzQzNDksNyBAQCBjbGFzcyBUZXN0U2hvd0lk ZW50aWZpZXIoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAgICAgICAg ICAgICAgIHRpbWVvdXQ9MzAwLAogICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1G YWxzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMv U2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAnNTFhNmFlYzlmNjY0J10pICsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdl YmtpdCcsICdmaW5kJywgJzUxYTZhZWM5ZjY2NCddKSArCiAgICAgICAgICAgICBFeHBlY3RTaGVs bC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdJZGVudGlmaWVyOiAyMzMxNzVAbWFpbicpICsKICAgICAg ICAgICAgIDAsCiAgICAgICAgICkKQEAgLTQzNjQsNyArNDM2NCw3IEBAIGNsYXNzIFRlc3RTaG93 SWRlbnRpZmllcihCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAg ICAgICAgICAgdGltZW91dD0zMDAsCiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9u PUZhbHNlLAotICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29s cy9TY3JpcHRzL2dpdC13ZWJraXQnLCAnZmluZCcsICdIRUFEJ10pICsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcs ICdmaW5kJywgJ0hFQUQnXSkgKwogICAgICAgICAgICAgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycs IHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlJykgKwogICAgICAgICAgICAgMiwKICAgICAgICAg KQo= 436404 2021-08-25 11:08:31 -0700 2021-08-25 14:18:23 -0700 Patch bug-229498-20210825110830.patch text/plain 5167 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTY0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDYwOWI4OTkyNjI2MmY4YTllZTI5Y2VhMmUxZmNiZDE5 ODAxMjU2My4uNDVmZjA5NTY4ZGEwZmUxYTBmZDkzZGU3NTk0OTc1NjZiMjg1NTY2YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDIxLTA4LTI1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbZ2l0LXdlYmtpdF0gVXNlIFB5dGhvbiAzIGluIENJCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk0OTgKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzgyMzQyMzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHk6CisgICAgICAg IChTaG93SWRlbnRpZmllci5zdGFydCk6IEludm9rZSBnaXQtd2Via2l0IHdpdGggUHl0aG9uIDMu CisgICAgICAgICogQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHk6 CisgICAgICAgIChUZXN0U2hvd0lkZW50aWZpZXIudGVzdF9zdWNjZXNzKToKKyAgICAgICAgKFRl c3RTaG93SWRlbnRpZmllci50ZXN0X2ZhaWx1cmUpOgorICAgICAgICAqIENJU3VwcG9ydC9ld3Mt YnVpbGQvc3RlcHMucHk6CisgICAgICAgIChTaG93SWRlbnRpZmllci5zdGFydCk6IEludm9rZSBn aXQtd2Via2l0IHdpdGggUHl0aG9uIDMuCisgICAgICAgICogQ0lTdXBwb3J0L2V3cy1idWlsZC9z dGVwc191bml0dGVzdC5weToKKwogMjAyMS0wOC0yNCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgWyBpT1MgXSBUZXN0V2ViS2l0QVBJLkRvY3VtZW50RWRpdGluZ0Nv bnRleHQuUmVxdWVzdCogdGVzdHMgYXJlIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NJU3Vw cG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5IGIvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdl YmtpdC1vcmcvc3RlcHMucHkKaW5kZXggNzY1ZmEzMGMwOTgyZDhiOTIzZDVmMDM3YTM5MmJhYzkw MTg3YzM2Ni4uZWUwM2MxYzMxYmVhMWZiZDU1OTlkZmRjZGYwMzA4MzEyOTI2MGU2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKKysrIGIvVG9v bHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKQEAgLTEyNjQsNyArMTI2NCw3 IEBAIGNsYXNzIFNob3dJZGVudGlmaWVyKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgICAgIHNl bGYubG9nX29ic2VydmVyID0gbG9nb2JzZXJ2ZXIuQnVmZmVyTG9nT2JzZXJ2ZXIoKQogICAgICAg ICBzZWxmLmFkZExvZ09ic2VydmVyKCdzdGRpbycsIHNlbGYubG9nX29ic2VydmVyKQogICAgICAg ICByZXZpc2lvbiA9IHNlbGYuZ2V0UHJvcGVydHkoJ2dvdF9yZXZpc2lvbicpCi0gICAgICAgIHNl bGYuc2V0Q29tbWFuZChbJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL2dpdC13ZWJraXQnLCAnZmlu ZCcsICdye30nLmZvcm1hdChyZXZpc2lvbildKQorICAgICAgICBzZWxmLnNldENvbW1hbmQoWydw eXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdmaW5kJywgJ3J7fScuZm9ybWF0 KHJldmlzaW9uKV0pCiAgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2Vs ZikKIAogICAgIGRlZiBldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKToKZGlmZiAtLWdpdCBhL1Rv b2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzX3VuaXR0ZXN0LnB5IGIvVG9vbHMv Q0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkKaW5kZXggNWQzMDU3 NDZlODE5YWExNWQ1MDUyNjljZGU1MjM4NzliMjc0ZWNlMS4uODhiYmE4ZWZjMDgxZDA5MDVhMDM3 NWIxMWY1Yzk2YWNlMzZkZWY3NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdl YmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdl YmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkKQEAgLTUxMyw3ICs1MTMsNyBAQCBjbGFzcyBUZXN0 U2hvd0lkZW50aWZpZXIoQnVpbGRTdGVwTWl4aW5BZGRpdGlvbnMsIHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgICAgIEV4cGVjdFNoZWxsKHdvcmtkaXI9J3drZGlyJywKICAgICAgICAgICAg ICAgICAgICAgICAgIHRpbWVvdXQ9NjAwLAogICAgICAgICAgICAgICAgICAgICAgICAgbG9nRW52 aXJvbj1GYWxzZSwKLSAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAn VG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAncjI3MjY5MiddKSArCisgICAgICAg ICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uMycsICdUb29scy9TY3JpcHRzL2dpdC13 ZWJraXQnLCAnZmluZCcsICdyMjcyNjkyJ10pICsKICAgICAgICAgICAgIEV4cGVjdFNoZWxsLmxv Zygnc3RkaW8nLCBzdGRvdXQ9J0lkZW50aWZpZXI6IDIzMzkzOUBtYWluJykgKwogICAgICAgICAg ICAgMCwKICAgICAgICAgKQpAQCAtNTI5LDcgKzUyOSw3IEBAIGNsYXNzIFRlc3RTaG93SWRlbnRp ZmllcihCdWlsZFN0ZXBNaXhpbkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAg ICAgdGltZW91dD02MDAsCiAgICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNl LAotICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9TY3Jp cHRzL2dpdC13ZWJraXQnLCAnZmluZCcsICdyMjcyNjkyJ10pICsKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdm aW5kJywgJ3IyNzI2OTInXSkgKwogICAgICAgICAgICAgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycs IHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlJykgKwogICAgICAgICAgICAgMiwKICAgICAgICAg KQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weSBiL1Rvb2xz L0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHkKaW5kZXggMzMxZDExYzA4YjY2ZWM3MzQwMjJh ZDhhZmRlMTk2ZGVmYjFlYTRjYy4uODFjNDBmNzUwOTg1MTUyNzdiMjJiNjI5NjU5MjNkM2RmY2Iy ODIwYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysg Yi9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CkBAIC0yMjMsNyArMjIzLDcgQEAg Y2xhc3MgU2hvd0lkZW50aWZpZXIoc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICAgICAgcmV2aXNp b24gPSBzZWxmLmdldFByb3BlcnR5KCdld3NfcmV2aXNpb24nLCBzZWxmLmdldFByb3BlcnR5KCdn b3RfcmV2aXNpb24nKSkKICAgICAgICAgaWYgbm90IHJldmlzaW9uOgogICAgICAgICAgICAgcmV2 aXNpb24gPSAnSEVBRCcKLSAgICAgICAgc2VsZi5zZXRDb21tYW5kKFsncHl0aG9uJywgJ1Rvb2xz L1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdmaW5kJywgcmV2aXNpb25dKQorICAgICAgICBzZWxmLnNl dENvbW1hbmQoWydweXRob24zJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdmaW5kJywg cmV2aXNpb25dKQogICAgICAgICByZXR1cm4gc2hlbGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYp CiAKICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6CmRpZmYgLS1naXQgYS9Ub29s cy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvQ0lTdXBwb3J0 L2V3cy1idWlsZC9zdGVwc191bml0dGVzdC5weQppbmRleCA1NmI1MDUxMWU3MGVjN2M5ZTZmNjhk MjI5NzY5YWRjYzYzZGRhZTdjLi5jZmJmZjI2YWExMzI3ZThjZDc4NDI2MThhMDg4ODBjMWE5NzAz YmYwIDEwMDY0NAotLS0gYS9Ub29scy9DSVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzX3VuaXR0ZXN0 LnB5CisrKyBiL1Rvb2xzL0NJU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHNfdW5pdHRlc3QucHkKQEAg LTQzNDksNyArNDM0OSw3IEBAIGNsYXNzIFRlc3RTaG93SWRlbnRpZmllcihCdWlsZFN0ZXBNaXhp bkFkZGl0aW9ucywgdW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgRXhwZWN0U2hlbGwo d29ya2Rpcj0nd2tkaXInLAogICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0zMDAsCiAg ICAgICAgICAgICAgICAgICAgICAgICBsb2dFbnZpcm9uPUZhbHNlLAotICAgICAgICAgICAgICAg ICAgICAgICAgY29tbWFuZD1bJ3B5dGhvbicsICdUb29scy9TY3JpcHRzL2dpdC13ZWJraXQnLCAn ZmluZCcsICc1MWE2YWVjOWY2NjQnXSkgKworICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFu ZD1bJ3B5dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAnNTFhNmFl YzlmNjY0J10pICsKICAgICAgICAgICAgIEV4cGVjdFNoZWxsLmxvZygnc3RkaW8nLCBzdGRvdXQ9 J0lkZW50aWZpZXI6IDIzMzE3NUBtYWluJykgKwogICAgICAgICAgICAgMCwKICAgICAgICAgKQpA QCAtNDM2NCw3ICs0MzY0LDcgQEAgY2xhc3MgVGVzdFNob3dJZGVudGlmaWVyKEJ1aWxkU3RlcE1p eGluQWRkaXRpb25zLCB1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICBFeHBlY3RTaGVs bCh3b3JrZGlyPSd3a2RpcicsCiAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lb3V0PTMwMCwK ICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2UsCi0gICAgICAgICAgICAg ICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1NjcmlwdHMvZ2l0LXdlYmtpdCcs ICdmaW5kJywgJ0hFQUQnXSkgKworICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZD1bJ3B5 dGhvbjMnLCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAnSEVBRCddKSArCiAg ICAgICAgICAgICBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0PSdVbmV4cGVjdGVkIGZh aWx1cmUnKSArCiAgICAgICAgICAgICAyLAogICAgICAgICApCg==