188396 2018-08-07 17:04:43 -0700 [ews-build] Separate queues for Builders and Testers - iOS 2018-08-13 07:12:20 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188516 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue ews-watchlist lforschler webkit-bug-importer oldest_to_newest 1448642 0 aakash_jain 2018-08-07 17:04:43 -0700 Currently EWS bots build and test on same machine. This is not very efficient. We should instead build (and upload) the archive and re-use it for multiple types of tests (e.g.: WK1, WK2, API tests). This would improve the overall system efficiency by reducing the number of builds while producing same kind of output. This would also improve the overall turn-around time to get EWS results after an engineer uploads a patch. This bug tracks splitting iOS queues in builders and testers. 1448644 1 346745 aakash_jain 2018-08-07 17:38:19 -0700 Created attachment 346745 Proposed patch Sample run: iOS-11-Build-EWS: http://ews-build.webkit-uat.org/#/builders/24/builds/12 iOS-11-Simulator-Build-EWS: http://ews-build.webkit-uat.org/#/builders/23/builds/13 iOS-11-Simulator-Tests-EWS: http://ews-build.webkit-uat.org/#/builders/22/builds/11 1448645 2 ews-watchlist 2018-08-07 17:39:19 -0700 Attachment 346745 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:93: [TestsFactory.getProduct] Undefined variable 'DownloadBuiltProduct' [pylint/E0602] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:94: [TestsFactory.getProduct] Undefined variable 'ExtractBuiltProduct' [pylint/E0602] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:100: [TestsFactory.__init__] self.LayoutTestClass is not callable [pylint/E1102] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:102: [TestsFactory.__init__] self.APITestClass is not callable [pylint/E1102] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:119: [APITestsFactory] Undefined variable 'RunAPITests' [pylint/E0602] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:131: [iOSTestsFactory] Undefined variable 'RunWebKitTests' [pylint/E0602] [5] Total errors found: 6 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1449189 3 346745 lforschler 2018-08-09 17:23:38 -0700 Comment on attachment 346745 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=346745&action=review > Tools/BuildSlaveSupport/ews-build/factories.py:88 > +class TestsFactory(Factory): We use BuildFactory (singular)... maybe we should use TestFactory (singular) here as well? TestsFactory has a weird pronunciation. 1449520 4 346981 aakash_jain 2018-08-11 20:34:25 -0700 Created attachment 346981 Updated patch > We use BuildFactory (singular)... maybe we should use TestFactory (singular) here as well? Done. 1449525 5 346981 commit-queue 2018-08-11 21:14:00 -0700 Comment on attachment 346981 Updated patch Clearing flags on attachment: 346981 Committed r234785: <https://trac.webkit.org/changeset/234785> 1449526 6 commit-queue 2018-08-11 21:14:01 -0700 All reviewed patches have been landed. Closing bug. 1449527 7 webkit-bug-importer 2018-08-11 21:15:03 -0700 <rdar://problem/43193062> 346745 2018-08-07 17:38:19 -0700 2018-08-11 20:34:25 -0700 Proposed patch ews_split_ios.patch text/plain 6182 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDY4MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE4LTA4LTA3ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBTZXBhcmF0ZSBxdWV1ZXMgZm9yIEJ1aWxkZXJzIGFu ZCBUZXN0ZXJzIC0gaU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODgzOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbjogU3BsaXR0 ZWQgaU9TIHF1ZXVlcyBpbnRvIGJ1aWxkZXJzIGFuZCB0ZXN0ZXJzLgorICAgICAgICBBbHNvIGFk ZGVkIGV3czEyMSBhbmQgZXdzMTIyIHRvIG1hdGNoIHdpdGggY3VycmVudCBFV1MgY29uZmlndXJh dGlvbi4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5 OgorICAgICAgICAoVGVzdHNGYWN0b3J5KTogQmFzZSBjbGFzc2VzIGZvciB2YXJpb3VzIFRlc3Qg ZmFjdG9yaWVzLgorICAgICAgICAoVGVzdHNGYWN0b3J5LmdldFByb2R1Y3QpOiBEb3dubG9hZCBh bmQgZXh0cmFjdCB0aGUgYXJjaGl2ZS4KKwogMjAxOC0wOC0wNyAgQWxleCBDaHJpc3RlbnNlbiAg PGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBhIHRlc3QgZm9yIHVzaW5n IFNhZmVCcm93c2luZwpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2Nv bmZpZy5qc29uCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWls ZC9jb25maWcuanNvbgkocmV2aXNpb24gMjM0NjgwKQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvZXdzLWJ1aWxkL2NvbmZpZy5qc29uCSh3b3JraW5nIGNvcHkpCkBAIC0xMTcsNiArMTE3LDE0 IEBACiAgICAgICAicGxhdGZvcm0iOiAibWFjLWhpZ2gtc2llcnJhIgogICAgIH0sCiAgICAgewor ICAgICAgIm5hbWUiOiAiZXdzMTIxIiwKKyAgICAgICJwbGF0Zm9ybSI6ICJpb3Mtc2ltdWxhdG9y LTExIgorICAgIH0sCisgICAgeworICAgICAgIm5hbWUiOiAiZXdzMTIyIiwKKyAgICAgICJwbGF0 Zm9ybSI6ICJpb3Mtc2ltdWxhdG9yLTExIgorICAgIH0sCisgICAgewogICAgICAgIm5hbWUiOiAi ZXdzMTIzIiwKICAgICAgICJwbGF0Zm9ybSI6ICJpb3Mtc2ltdWxhdG9yLTExIgogICAgIH0sCkBA IC0xOTEsMjEgKzE5OSwyOSBAQAogICAgICAgIndvcmtlcm5hbWVzIjogWyJ0YW50eS1ndGstd2sy LWV3cyIsICJsdGlsdmUtZ3RrLXdrMi1ld3MiXQogICAgIH0sCiAgICAgewotICAgICAgIm5hbWUi OiAiaU9TLTExLUVXUyIsCi0gICAgICAiZmFjdG9yeSI6ICJpT1NGYWN0b3J5IiwKKyAgICAgICJu YW1lIjogImlPUy0xMS1CdWlsZC1FV1MiLAorICAgICAgImZhY3RvcnkiOiAiaU9TQnVpbGRGYWN0 b3J5IiwKICAgICAgICJwbGF0Zm9ybSI6ICJpb3MtMTEiLAogICAgICAgImNvbmZpZ3VyYXRpb24i OiAicmVsZWFzZSIsCiAgICAgICAiYXJjaGl0ZWN0dXJlcyI6IFsiYXJtNjQiXSwKICAgICAgICJ3 b3JrZXJuYW1lcyI6IFsiZXdzMTA4IiwgImV3czEwOSJdCiAgICAgfSwKICAgICB7Ci0gICAgICAi bmFtZSI6ICJpT1MtMTEtU2ltdWxhdG9yLUVXUyIsCi0gICAgICAiZmFjdG9yeSI6ICJpT1NTaW11 bGF0b3JGYWN0b3J5IiwKKyAgICAgICJuYW1lIjogImlPUy0xMS1TaW11bGF0b3ItQnVpbGQtRVdT IiwKKyAgICAgICJmYWN0b3J5IjogImlPU0J1aWxkRmFjdG9yeSIsCiAgICAgICAicGxhdGZvcm0i OiAiaW9zLXNpbXVsYXRvci0xMSIsCiAgICAgICAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwK ICAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwKLSAgICAgICJ0cmlnZ2VycyI6IFsi YXBpLXRlc3RzLWlvcy1zaW0tZXdzIl0sCi0gICAgICAid29ya2VybmFtZXMiOiBbImV3czEyMyIs ICJld3MxMjQiLCAiZXdzMTI1IiwgImV3czEyNiJdCisgICAgICAidHJpZ2dlcnMiOiBbImFwaS10 ZXN0cy1pb3Mtc2ltLWV3cyIsICJpb3MtMTEtc2ltLXRlc3RzLWV3cyJdLAorICAgICAgIndvcmtl cm5hbWVzIjogWyJld3MxMjEiLCAiZXdzMTIyIiwgImV3czEyMyIsICJld3MxMjQiLCAiZXdzMTI1 IiwgImV3czEyNiJdCisgICAgfSwKKyAgICB7CisgICAgICAibmFtZSI6ICJpT1MtMTEtU2ltdWxh dG9yLVRlc3RzLUVXUyIsCisgICAgICAiZmFjdG9yeSI6ICJpT1NUZXN0c0ZhY3RvcnkiLAorICAg ICAgInBsYXRmb3JtIjogImlvcy1zaW11bGF0b3ItMTEiLAorICAgICAgImNvbmZpZ3VyYXRpb24i OiAicmVsZWFzZSIsCisgICAgICAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0sCisgICAgICAi d29ya2VybmFtZXMiOiBbImV3czEyMSIsICJld3MxMjIiLCAiZXdzMTIzIiwgImV3czEyNCIsICJl d3MxMjUiLCAiZXdzMTI2Il0KICAgICB9LAogICAgIHsKICAgICAgICJuYW1lIjogIm1hY09TLVNp ZXJyYS1SZWxlYXNlLVdLMS1FV1MiLApAQCAtMzAyLDIyICszMTgsMjkgQEAKICAgICAgICJuYW1l IjogInRyeSIsCiAgICAgICAicG9ydCI6IDU1NTUsCiAgICAgICAiYnVpbGRlck5hbWVzIjogWyJT dHlsZS1FV1MiLCAiSlNDLVRlc3RzLUVXUyIsICJtYWNPUy1TaWVycmEtUmVsZWFzZS1XSzEtRVdT IiwgIkdUSy1XZWJraXQyLUVXUyIsICJtYWNPUy1TaWVycmEtUmVsZWFzZS1XSzItRVdTIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgIm1hY09TLUhpZ2gtU2llcnJhLVJlbGVhc2UtMzJiaXQtV0sy LUVXUyIsICJXUEUtRVdTIiwgIldpbmRvd3MtRVdTIiwgImlPUy0xMS1FV1MiLCAiV2luQ2Fpcm8t RVdTIiwgImlPUy0xMS1TaW11bGF0b3ItRVdTIiwKKyAgICAgICAgICAgICAgICAgICAgICAgIm1h Y09TLUhpZ2gtU2llcnJhLVJlbGVhc2UtMzJiaXQtV0syLUVXUyIsICJXUEUtRVdTIiwgIldpbmRv d3MtRVdTIiwgImlPUy0xMS1CdWlsZC1FV1MiLCAiV2luQ2Fpcm8tRVdTIiwgImlPUy0xMS1TaW11 bGF0b3ItQnVpbGQtRVdTIiwKICAgICAgICAgICAgICAgICAgICAgICAgIldlYktpdFB5LVRlc3Rz LUVXUyIsICJXZWJLaXRQZXJsLVRlc3RzLUVXUyIsICJtYWNPUy1TaWVycmEtRGVidWctV0sxLUVX UyIsICJCaW5kaW5ncy1UZXN0cy1FV1MiXQogICAgIH0sCiAgICAgewogICAgICAgInR5cGUiOiAi VHJpZ2dlcmFibGUiLAorICAgICAgIm5hbWUiOiAiaW9zLTExLXNpbS10ZXN0cy1ld3MiLAorICAg ICAgImJ1aWxkZXJOYW1lcyI6IFsKKyAgICAgICAgImlPUy0xMS1TaW11bGF0b3ItVGVzdHMtRVdT IgorICAgICAgXQorICAgIH0sCisgICAgeworICAgICAgInR5cGUiOiAiVHJpZ2dlcmFibGUiLAog ICAgICAgIm5hbWUiOiAiYXBpLXRlc3RzLWlvcy1zaW0tZXdzIiwKICAgICAgICJidWlsZGVyTmFt ZXMiOiBbCiAgICAgICAgICJBUEktVGVzdHMtaU9TLVNpbXVsYXRvci1FV1MiCi0gICAgICBdICAg ICAKKyAgICAgIF0KICAgICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwK ICAgICAgICJuYW1lIjogImFwaS10ZXN0cy1tYWMtZXdzIiwKICAgICAgICJidWlsZGVyTmFtZXMi OiBbCiAgICAgICAgICJBUEktVGVzdHMtbWFjT1MtRVdTIgotICAgICAgXSAgICAgCisgICAgICBd CiAgICAgfQogICBdCiB9CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQv ZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1i dWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDIzNDY4MCkKKysrIFRvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1 LDIzIEBAIGNsYXNzIEJ1aWxkRmFjdG9yeShGYWN0b3J5KToKICAgICAgICAgfQogCiAKK2NsYXNz IFRlc3RzRmFjdG9yeShGYWN0b3J5KToKKyAgICBMYXlvdXRUZXN0Q2xhc3MgPSBOb25lCisgICAg QVBJVGVzdENsYXNzID0gTm9uZQorCisgICAgZGVmIGdldFByb2R1Y3Qoc2VsZik6CisgICAgICAg IHNlbGYuYWRkU3RlcChEb3dubG9hZEJ1aWx0UHJvZHVjdCgpKQorICAgICAgICBzZWxmLmFkZFN0 ZXAoRXh0cmFjdEJ1aWx0UHJvZHVjdCgpKQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRm b3JtLCBjb25maWd1cmF0aW9uPU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRkaXRpb25hbEFy Z3VtZW50cz1Ob25lLCAqKmt3YXJncyk6CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwg cGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFs QXJndW1lbnRzKQorICAgICAgICBzZWxmLmdldFByb2R1Y3QoKQorICAgICAgICBpZiBzZWxmLkxh eW91dFRlc3RDbGFzczoKKyAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkxheW91dFRlc3RD bGFzcygpKQorICAgICAgICBpZiBzZWxmLkFQSVRlc3RDbGFzczoKKyAgICAgICAgICAgIHNlbGYu YWRkU3RlcChzZWxmLkFQSVRlc3RDbGFzcygpKQorCisKIGNsYXNzIEpTQ1Rlc3RzRmFjdG9yeShG YWN0b3J5KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249 J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwg Kiprd2FyZ3MpOgogICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKQEAg LTk4LDI5ICsxMTUsMjAgQEAgY2xhc3MgSlNDVGVzdHNGYWN0b3J5KEZhY3RvcnkpOgogICAgICAg ICBzZWxmLmFkZFN0ZXAoUnVuSmF2YVNjcmlwdENvcmVUZXN0c1RvVCgpKQogCiAKLWNsYXNzIEFQ SVRlc3RzRmFjdG9yeShGYWN0b3J5KToKLSAgICBkZWYgZ2V0UHJvZHVjdChzZWxmKToKLSAgICAg ICAgc2VsZi5hZGRTdGVwKERvd25sb2FkQnVpbHRQcm9kdWN0KCkpCi0gICAgICAgIHNlbGYuYWRk U3RlcChFeHRyYWN0QnVpbHRQcm9kdWN0KCkpCi0KLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxh dGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9uZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBhZGRpdGlvbmFs QXJndW1lbnRzPU5vbmUsICoqa3dhcmdzKToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxm LCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgRmFsc2UsIGFkZGl0aW9u YWxBcmd1bWVudHMpCi0gICAgICAgIHNlbGYuZ2V0UHJvZHVjdCgpCi0gICAgICAgIHNlbGYuYWRk U3RlcChSdW5BUElUZXN0cygpKQorY2xhc3MgQVBJVGVzdHNGYWN0b3J5KFRlc3RzRmFjdG9yeSk6 CisgICAgQVBJVGVzdENsYXNzID0gUnVuQVBJVGVzdHMKIAogCiBjbGFzcyBHVEtGYWN0b3J5KEZh Y3RvcnkpOgogICAgIHBhc3MKIAogCi1jbGFzcyBpT1NGYWN0b3J5KEJ1aWxkRmFjdG9yeSk6Citj bGFzcyBpT1NCdWlsZEZhY3RvcnkoQnVpbGRGYWN0b3J5KToKICAgICBwYXNzCiAKIAotY2xhc3Mg aU9TU2ltdWxhdG9yRmFjdG9yeShCdWlsZEZhY3RvcnkpOgotICAgIGRlZiBfX2luaXRfXyhzZWxm LCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0 aW9uYWxBcmd1bWVudHM9Tm9uZSwgdHJpZ2dlcnM9Tm9uZSwgKiprd2FyZ3MpOgotICAgICAgICBC dWlsZEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIGFkZGl0aW9uYWxBcmd1bWVudHMsIHRyaWdnZXJzKQotICAgICAgICBzZWxmLmFk ZFN0ZXAoUnVuV2ViS2l0VGVzdHMoKSkKK2NsYXNzIGlPU1Rlc3RzRmFjdG9yeShUZXN0c0ZhY3Rv cnkpOgorICAgIExheW91dFRlc3RDbGFzcyA9IFJ1bldlYktpdFRlc3RzCiAKIAogY2xhc3MgTWFj V0sxRmFjdG9yeShCdWlsZEZhY3RvcnkpOgo= 346981 2018-08-11 20:34:25 -0700 2018-08-11 21:14:00 -0700 Updated patch ews_split_ios_v2.patch text/plain 6213 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDc4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE4LTA4LTExICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBTZXBhcmF0ZSBxdWV1ZXMgZm9yIEJ1aWxkZXJzIGFu ZCBUZXN0ZXJzIC0gaU9TCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xODgzOTYKKworICAgICAgICBSZXZpZXdlZCBieSBMdWNhcyBGb3JzY2hsZXIuCisK KyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb246IFNwbGl0 dGVkIGlPUyBxdWV1ZXMgaW50byBidWlsZGVycyBhbmQgdGVzdGVycy4KKyAgICAgICAgQWxzbyBh ZGRlZCBld3MxMjEgYW5kIGV3czEyMiB0byBtYXRjaCB3aXRoIGN1cnJlbnQgRVdTIGNvbmZpZ3Vy YXRpb24uCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5w eToKKyAgICAgICAgKFRlc3RzRmFjdG9yeSk6IEJhc2UgY2xhc3NlcyBmb3IgdmFyaW91cyBUZXN0 IGZhY3Rvcmllcy4KKyAgICAgICAgKFRlc3RzRmFjdG9yeS5nZXRQcm9kdWN0KTogRG93bmxvYWQg YW5kIGV4dHJhY3QgdGhlIGFyY2hpdmUuCisKIDIwMTgtMDgtMTAgIERhbmllbCBCYXRlcyAgPGRh YmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIHdlYmtpdC1wYXRjaCBzZXR1cC1naXQtY2xvbmUg c2hvdWxkIHNldCBHaXQgY29yZSBlZGl0b3IgdG8gY29tbWl0LWxvZy1lZGl0b3IKSW5kZXg6IFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24JKHJldmlzaW9u IDIzNDc4NCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNv bgkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNywxNCBAQAogICAgICAgInBsYXRmb3JtIjog Im1hYy1oaWdoLXNpZXJyYSIKICAgICB9LAogICAgIHsKKyAgICAgICJuYW1lIjogImV3czEyMSIs CisgICAgICAicGxhdGZvcm0iOiAiaW9zLXNpbXVsYXRvci0xMSIKKyAgICB9LAorICAgIHsKKyAg ICAgICJuYW1lIjogImV3czEyMiIsCisgICAgICAicGxhdGZvcm0iOiAiaW9zLXNpbXVsYXRvci0x MSIKKyAgICB9LAorICAgIHsKICAgICAgICJuYW1lIjogImV3czEyMyIsCiAgICAgICAicGxhdGZv cm0iOiAiaW9zLXNpbXVsYXRvci0xMSIKICAgICB9LApAQCAtMTkxLDIxICsxOTksMjkgQEAKICAg ICAgICJ3b3JrZXJuYW1lcyI6IFsidGFudHktZ3RrLXdrMi1ld3MiLCAibHRpbHZlLWd0ay13azIt ZXdzIl0KICAgICB9LAogICAgIHsKLSAgICAgICJuYW1lIjogImlPUy0xMS1FV1MiLAotICAgICAg ImZhY3RvcnkiOiAiaU9TRmFjdG9yeSIsCisgICAgICAibmFtZSI6ICJpT1MtMTEtQnVpbGQtRVdT IiwKKyAgICAgICJmYWN0b3J5IjogImlPU0J1aWxkRmFjdG9yeSIsCiAgICAgICAicGxhdGZvcm0i OiAiaW9zLTExIiwKICAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLAogICAgICAgImFy Y2hpdGVjdHVyZXMiOiBbImFybTY0Il0sCiAgICAgICAid29ya2VybmFtZXMiOiBbImV3czEwOCIs ICJld3MxMDkiXQogICAgIH0sCiAgICAgewotICAgICAgIm5hbWUiOiAiaU9TLTExLVNpbXVsYXRv ci1FV1MiLAotICAgICAgImZhY3RvcnkiOiAiaU9TU2ltdWxhdG9yRmFjdG9yeSIsCisgICAgICAi bmFtZSI6ICJpT1MtMTEtU2ltdWxhdG9yLUJ1aWxkLUVXUyIsCisgICAgICAiZmFjdG9yeSI6ICJp T1NCdWlsZEZhY3RvcnkiLAogICAgICAgInBsYXRmb3JtIjogImlvcy1zaW11bGF0b3ItMTEiLAog ICAgICAgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsCiAgICAgICAiYXJjaGl0ZWN0dXJlcyI6 IFsieDg2XzY0Il0sCi0gICAgICAidHJpZ2dlcnMiOiBbImFwaS10ZXN0cy1pb3Mtc2ltLWV3cyJd LAotICAgICAgIndvcmtlcm5hbWVzIjogWyJld3MxMjMiLCAiZXdzMTI0IiwgImV3czEyNSIsICJl d3MxMjYiXQorICAgICAgInRyaWdnZXJzIjogWyJhcGktdGVzdHMtaW9zLXNpbS1ld3MiLCAiaW9z LTExLXNpbS10ZXN0cy1ld3MiXSwKKyAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTIxIiwgImV3 czEyMiIsICJld3MxMjMiLCAiZXdzMTI0IiwgImV3czEyNSIsICJld3MxMjYiXQorICAgIH0sCisg ICAgeworICAgICAgIm5hbWUiOiAiaU9TLTExLVNpbXVsYXRvci1UZXN0cy1FV1MiLAorICAgICAg ImZhY3RvcnkiOiAiaU9TVGVzdHNGYWN0b3J5IiwKKyAgICAgICJwbGF0Zm9ybSI6ICJpb3Mtc2lt dWxhdG9yLTExIiwKKyAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLAorICAgICAgImFy Y2hpdGVjdHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgIndvcmtlcm5hbWVzIjogWyJld3MxMjEi LCAiZXdzMTIyIiwgImV3czEyMyIsICJld3MxMjQiLCAiZXdzMTI1IiwgImV3czEyNiJdCiAgICAg fSwKICAgICB7CiAgICAgICAibmFtZSI6ICJtYWNPUy1TaWVycmEtUmVsZWFzZS1XSzEtRVdTIiwK QEAgLTMwMiwyMiArMzE4LDI5IEBACiAgICAgICAibmFtZSI6ICJ0cnkiLAogICAgICAgInBvcnQi OiA1NTU1LAogICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiU3R5bGUtRVdTIiwgIkpTQy1UZXN0cy1F V1MiLCAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0sxLUVXUyIsICJHVEstV2Via2l0Mi1FV1MiLCAi bWFjT1MtU2llcnJhLVJlbGVhc2UtV0syLUVXUyIsCi0gICAgICAgICAgICAgICAgICAgICAgICJt YWNPUy1IaWdoLVNpZXJyYS1SZWxlYXNlLTMyYml0LVdLMi1FV1MiLCAiV1BFLUVXUyIsICJXaW5k b3dzLUVXUyIsICJpT1MtMTEtRVdTIiwgIldpbkNhaXJvLUVXUyIsICJpT1MtMTEtU2ltdWxhdG9y LUVXUyIsCisgICAgICAgICAgICAgICAgICAgICAgICJtYWNPUy1IaWdoLVNpZXJyYS1SZWxlYXNl LTMyYml0LVdLMi1FV1MiLCAiV1BFLUVXUyIsICJXaW5kb3dzLUVXUyIsICJpT1MtMTEtQnVpbGQt RVdTIiwgIldpbkNhaXJvLUVXUyIsICJpT1MtMTEtU2ltdWxhdG9yLUJ1aWxkLUVXUyIsCiAgICAg ICAgICAgICAgICAgICAgICAgICJXZWJLaXRQeS1UZXN0cy1FV1MiLCAiV2ViS2l0UGVybC1UZXN0 cy1FV1MiLCAibWFjT1MtU2llcnJhLURlYnVnLVdLMS1FV1MiLCAiQmluZGluZ3MtVGVzdHMtRVdT Il0KICAgICB9LAogICAgIHsKICAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwKKyAgICAgICJu YW1lIjogImlvcy0xMS1zaW0tdGVzdHMtZXdzIiwKKyAgICAgICJidWlsZGVyTmFtZXMiOiBbCisg ICAgICAgICJpT1MtMTEtU2ltdWxhdG9yLVRlc3RzLUVXUyIKKyAgICAgIF0KKyAgICB9LAorICAg IHsKKyAgICAgICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwKICAgICAgICJuYW1lIjogImFwaS10ZXN0 cy1pb3Mtc2ltLWV3cyIsCiAgICAgICAiYnVpbGRlck5hbWVzIjogWwogICAgICAgICAiQVBJLVRl c3RzLWlPUy1TaW11bGF0b3ItRVdTIgotICAgICAgXSAgICAgCisgICAgICBdCiAgICAgfSwKICAg ICB7CiAgICAgICAidHlwZSI6ICJUcmlnZ2VyYWJsZSIsCiAgICAgICAibmFtZSI6ICJhcGktdGVz dHMtbWFjLWV3cyIsCiAgICAgICAiYnVpbGRlck5hbWVzIjogWwogICAgICAgICAiQVBJLVRlc3Rz LW1hY09TLUVXUyIKLSAgICAgIF0gICAgIAorICAgICAgXQogICAgIH0KICAgXQogfQpJbmRleDog VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmllcy5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CShyZXZp c2lvbiAyMzQ3ODQpCisrKyBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvZmFjdG9y aWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04NSw2ICs4NSwyMyBAQCBjbGFzcyBCdWlsZEZhY3Rv cnkoRmFjdG9yeSk6CiAgICAgICAgIH0KIAogCitjbGFzcyBUZXN0RmFjdG9yeShGYWN0b3J5KToK KyAgICBMYXlvdXRUZXN0Q2xhc3MgPSBOb25lCisgICAgQVBJVGVzdENsYXNzID0gTm9uZQorCisg ICAgZGVmIGdldFByb2R1Y3Qoc2VsZik6CisgICAgICAgIHNlbGYuYWRkU3RlcChEb3dubG9hZEJ1 aWx0UHJvZHVjdCgpKQorICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0cmFjdEJ1aWx0UHJvZHVjdCgp KQorCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uPU5vbmUs IGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCAqKmt3YXJncyk6 CisgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24s IGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzKQorICAgICAgICBzZWxm LmdldFByb2R1Y3QoKQorICAgICAgICBpZiBzZWxmLkxheW91dFRlc3RDbGFzczoKKyAgICAgICAg ICAgIHNlbGYuYWRkU3RlcChzZWxmLkxheW91dFRlc3RDbGFzcygpKQorICAgICAgICBpZiBzZWxm LkFQSVRlc3RDbGFzczoKKyAgICAgICAgICAgIHNlbGYuYWRkU3RlcChzZWxmLkFQSVRlc3RDbGFz cygpKQorCisKIGNsYXNzIEpTQ1Rlc3RzRmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVz PU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBGYWN0 b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKQEAgLTk4LDI5ICsxMTUsMjAgQEAgY2xhc3Mg SlNDVGVzdHNGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBzZWxmLmFkZFN0ZXAoUnVuSmF2YVNj cmlwdENvcmVUZXN0c1RvVCgpKQogCiAKLWNsYXNzIEFQSVRlc3RzRmFjdG9yeShGYWN0b3J5KToK LSAgICBkZWYgZ2V0UHJvZHVjdChzZWxmKToKLSAgICAgICAgc2VsZi5hZGRTdGVwKERvd25sb2Fk QnVpbHRQcm9kdWN0KCkpCi0gICAgICAgIHNlbGYuYWRkU3RlcChFeHRyYWN0QnVpbHRQcm9kdWN0 KCkpCi0KLSAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249Tm9u ZSwgYXJjaGl0ZWN0dXJlcz1Ob25lLCBhZGRpdGlvbmFsQXJndW1lbnRzPU5vbmUsICoqa3dhcmdz KToKLSAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlv biwgYXJjaGl0ZWN0dXJlcywgRmFsc2UsIGFkZGl0aW9uYWxBcmd1bWVudHMpCi0gICAgICAgIHNl bGYuZ2V0UHJvZHVjdCgpCi0gICAgICAgIHNlbGYuYWRkU3RlcChSdW5BUElUZXN0cygpKQorY2xh c3MgQVBJVGVzdHNGYWN0b3J5KFRlc3RGYWN0b3J5KToKKyAgICBBUElUZXN0Q2xhc3MgPSBSdW5B UElUZXN0cwogCiAKIGNsYXNzIEdUS0ZhY3RvcnkoRmFjdG9yeSk6CiAgICAgcGFzcwogCiAKLWNs YXNzIGlPU0ZhY3RvcnkoQnVpbGRGYWN0b3J5KToKK2NsYXNzIGlPU0J1aWxkRmFjdG9yeShCdWls ZEZhY3RvcnkpOgogICAgIHBhc3MKIAogCi1jbGFzcyBpT1NTaW11bGF0b3JGYWN0b3J5KEJ1aWxk RmFjdG9yeSk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9u PU5vbmUsIGFyY2hpdGVjdHVyZXM9Tm9uZSwgYWRkaXRpb25hbEFyZ3VtZW50cz1Ob25lLCB0cmln Z2Vycz1Ob25lLCAqKmt3YXJncyk6Ci0gICAgICAgIEJ1aWxkRmFjdG9yeS5fX2luaXRfXyhzZWxm LCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYWRkaXRpb25hbEFyZ3Vt ZW50cywgdHJpZ2dlcnMpCi0gICAgICAgIHNlbGYuYWRkU3RlcChSdW5XZWJLaXRUZXN0cygpKQor Y2xhc3MgaU9TVGVzdHNGYWN0b3J5KFRlc3RGYWN0b3J5KToKKyAgICBMYXlvdXRUZXN0Q2xhc3Mg PSBSdW5XZWJLaXRUZXN0cwogCiAKIGNsYXNzIE1hY1dLMUZhY3RvcnkoQnVpbGRGYWN0b3J5KToK