188516 2018-08-13 06:58:07 -0700 [ews-build] Separate queues for Builders and Testers - macOS Sierra 2018-08-16 13:41:17 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188396 https://bugs.webkit.org/show_bug.cgi?id=188540 InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap commit-queue ews-watchlist lforschler webkit-bug-importer oldest_to_newest 1449632 0 aakash_jain 2018-08-13 06:58:07 -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 macOS Sierra Release queues in builders and testers. 1449633 1 347013 aakash_jain 2018-08-13 07:11:26 -0700 Created attachment 347013 Proposed patch This change results in a clear efficiency improvement. Instead of Building (compiling WebKit) on multiple queues (WK1 and WK2), Build would be done only on one queue (Builder) and it would be re-used on 3 queues (WK1, WK2, API-tests). For each patch, we are saving WebKit compilation time twice. This would results in bots being more available and reduce the overall time engineers have to wait to get the EWS results after a patch is uploaded. Sample runs: macOS-Sierra-Release-Build-EWS: http://ews-build.webkit-uat.org/#/builders/25/builds/11 macOS-Sierra-Release-WK1-Tests-EWS: http://ews-build.webkit-uat.org/#/builders/26/builds/13 macOS-Sierra-Release-WK2-Tests-EWS: http://ews-build.webkit-uat.org/#/builders/27/builds/12 1449634 2 ews-watchlist 2018-08-13 07:12:34 -0700 Attachment 347013 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:139: [MacWK1Factory] Undefined variable 'RunWebKit1Tests' [pylint/E0602] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:143: [MacWK2Factory] Undefined variable 'RunWebKitTests' [pylint/E0602] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1449949 3 347013 lforschler 2018-08-14 09:15:41 -0700 Comment on attachment 347013 Proposed patch Mac OS is now called macOS...I think we should probably use 'macOS' everywhere, rather than 'Mac'. I could be convinced to use MacOS (capitol M) since it is the first letter of the class name. But, I would not oppose using lowercase. others may have a stronger opinion. Please ask around and see what others think. Also, let's either fix the style errors, or override them for buildbot instances if they are false. 1450129 4 aakash_jain 2018-08-14 15:54:55 -0700 (In reply to Lucas Forschler from comment #3) > Mac OS is now called macOS...I think we should probably use 'macOS' everywhere, rather than 'Mac'. Good point. I have changed to macOS everywhere in updated patch. > Also, let's either fix the style errors, or override them for buildbot instances if they are false. Filed https://bugs.webkit.org/show_bug.cgi?id=188584 to track style checker issue. 1450130 5 347119 aakash_jain 2018-08-14 15:55:39 -0700 Created attachment 347119 Updated patch 1450135 6 ews-watchlist 2018-08-14 15:58:35 -0700 Attachment 347119 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:139: [macOSWK1Factory] Undefined variable 'RunWebKit1Tests' [pylint/E0602] [5] ERROR: Tools/BuildSlaveSupport/ews-build/factories.py:143: [macOSWK2Factory] Undefined variable 'RunWebKitTests' [pylint/E0602] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1450817 7 lforschler 2018-08-16 12:53:40 -0700 (In reply to Aakash Jain from comment #4) > (In reply to Lucas Forschler from comment #3) > > Mac OS is now called macOS...I think we should probably use 'macOS' everywhere, rather than 'Mac'. > Good point. I have changed to macOS everywhere in updated patch. can you file a bug to update other instances outside of this patch? > > > Also, let's either fix the style errors, or override them for buildbot instances if they are false. > Filed https://bugs.webkit.org/show_bug.cgi?id=188584 to track style checker > issue. 1450823 8 aakash_jain 2018-08-16 13:02:46 -0700 > can you file a bug to update other instances outside of this patch? Done in: https://bugs.webkit.org/show_bug.cgi?id=188540 1450848 9 347119 commit-queue 2018-08-16 13:40:22 -0700 Comment on attachment 347119 Updated patch Clearing flags on attachment: 347119 Committed r234951: <https://trac.webkit.org/changeset/234951> 1450849 10 commit-queue 2018-08-16 13:40:23 -0700 All reviewed patches have been landed. Closing bug. 1450850 11 webkit-bug-importer 2018-08-16 13:41:17 -0700 <rdar://problem/43394566> 347013 2018-08-13 07:11:26 -0700 2018-08-14 15:55:39 -0700 Proposed patch ews_split_mac_sierra_release.patch text/plain 3930 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDc5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE4LTA4LTEzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBTZXBhcmF0ZSBxdWV1ZXMgZm9yIEJ1aWxkZXJzIGFu ZCBUZXN0ZXJzIC0gbWFjT1MgU2llcnJhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODg1MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNv bjogU3BsaXR0ZWQgbWFjT1MgU2llcnJhIFJlbGVhc2UgcXVldWVzIGludG8gYnVpbGRlcnMgYW5k IHRlc3RlcnMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weTogVXNlZCBhcHByb3ByaWF0ZSBiYXNlIGNsYXNzZXMgZm9yIGJ1aWxkZXJzIGFuZCB0ZXN0 ZXJzLgorCiAyMDE4LTA4LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW0xGQ10gRmxvYXQgcHJldi9uZXh0IHNpYmxpbmcgc2hvdWxkIHByZXZlbnQgdG9wL2Jv dHRvbSBtYXJnaW4gY29sbGFwc2luZyB3aXRoIHBhcmVudC4KSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24JKHJldmlzaW9uIDIzNDc5OSkKKysr IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgkod29ya2luZyBj b3B5KQpAQCAtMjI0LDE2ICsyMjQsMjQgQEAKICAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTIx IiwgImV3czEyMiIsICJld3MxMjMiLCAiZXdzMTI0IiwgImV3czEyNSIsICJld3MxMjYiXQogICAg IH0sCiAgICAgewotICAgICAgIm5hbWUiOiAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0sxLUVXUyIs CisgICAgICAibmFtZSI6ICJtYWNPUy1TaWVycmEtUmVsZWFzZS1CdWlsZC1FV1MiLAorICAgICAg ImZhY3RvcnkiOiAiTWFjQnVpbGRGYWN0b3J5IiwKKyAgICAgICJwbGF0Zm9ybSI6ICJtYWMtc2ll cnJhIiwKKyAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLAorICAgICAgImFyY2hpdGVj dHVyZXMiOiBbIng4Nl82NCJdLAorICAgICAgInRyaWdnZXJzIjogWyJhcGktdGVzdHMtbWFjLWV3 cyIsICJtYWNvcy1zaWVycmEtcmVsZWFzZS13azEtdGVzdHMtZXdzIiwgIm1hY29zLXNpZXJyYS1y ZWxlYXNlLXdrMi10ZXN0cy1ld3MiXSwKKyAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTAwIiwg ImV3czEwMSIsICJld3MxMDIiLCAiZXdzMTAzIl0KKyAgICB9LAorICAgIHsKKyAgICAgICJuYW1l IjogIm1hY09TLVNpZXJyYS1SZWxlYXNlLVdLMS1UZXN0cy1FV1MiLAogICAgICAgImZhY3Rvcnki OiAiTWFjV0sxRmFjdG9yeSIsCiAgICAgICAicGxhdGZvcm0iOiAibWFjLXNpZXJyYSIsCiAgICAg ICAiY29uZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwKICAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJ4 ODZfNjQiXSwKLSAgICAgICJ0cmlnZ2VycyI6IFsiYXBpLXRlc3RzLW1hYy1ld3MiXSwKICAgICAg ICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTAwIiwgImV3czEwMSIsICJld3MxMDIiLCAiZXdzMTAzIl0K ICAgICB9LAogICAgIHsKLSAgICAgICJuYW1lIjogIm1hY09TLVNpZXJyYS1SZWxlYXNlLVdLMi1F V1MiLAorICAgICAgIm5hbWUiOiAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0syLVRlc3RzLUVXUyIs CiAgICAgICAiZmFjdG9yeSI6ICJNYWNXSzJGYWN0b3J5IiwKICAgICAgICJwbGF0Zm9ybSI6ICJt YWMtc2llcnJhIiwKICAgICAgICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLApAQCAtMzE3LDcg KzMyNSw3IEBACiAgICAgICAidHlwZSI6ICJUcnlfVXNlcnBhc3MiLAogICAgICAgIm5hbWUiOiAi dHJ5IiwKICAgICAgICJwb3J0IjogNTU1NSwKLSAgICAgICJidWlsZGVyTmFtZXMiOiBbIlN0eWxl LUVXUyIsICJKU0MtVGVzdHMtRVdTIiwgIm1hY09TLVNpZXJyYS1SZWxlYXNlLVdLMS1FV1MiLCAi R1RLLVdlYmtpdDItRVdTIiwgIm1hY09TLVNpZXJyYS1SZWxlYXNlLVdLMi1FV1MiLAorICAgICAg ImJ1aWxkZXJOYW1lcyI6IFsiU3R5bGUtRVdTIiwgIkpTQy1UZXN0cy1FV1MiLCAibWFjT1MtU2ll cnJhLVJlbGVhc2UtQnVpbGQtRVdTIiwgIkdUSy1XZWJraXQyLUVXUyIsCiAgICAgICAgICAgICAg ICAgICAgICAgICJtYWNPUy1IaWdoLVNpZXJyYS1SZWxlYXNlLTMyYml0LVdLMi1FV1MiLCAiV1BF LUVXUyIsICJXaW5kb3dzLUVXUyIsICJpT1MtMTEtQnVpbGQtRVdTIiwgIldpbkNhaXJvLUVXUyIs ICJpT1MtMTEtU2ltdWxhdG9yLUJ1aWxkLUVXUyIsCiAgICAgICAgICAgICAgICAgICAgICAgICJX ZWJLaXRQeS1UZXN0cy1FV1MiLCAiV2ViS2l0UGVybC1UZXN0cy1FV1MiLCAibWFjT1MtU2llcnJh LURlYnVnLVdLMS1FV1MiLCAiQmluZGluZ3MtVGVzdHMtRVdTIl0KICAgICB9LApAQCAtMzMwLDYg KzMzOCwyMCBAQAogICAgIH0sCiAgICAgewogICAgICAgInR5cGUiOiAiVHJpZ2dlcmFibGUiLAor ICAgICAgIm5hbWUiOiAibWFjb3Mtc2llcnJhLXJlbGVhc2Utd2sxLXRlc3RzLWV3cyIsCisgICAg ICAiYnVpbGRlck5hbWVzIjogWworICAgICAgICAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0sxLVRl c3RzLUVXUyIKKyAgICAgIF0KKyAgICB9LAorICAgIHsKKyAgICAgICJ0eXBlIjogIlRyaWdnZXJh YmxlIiwKKyAgICAgICJuYW1lIjogIm1hY29zLXNpZXJyYS1yZWxlYXNlLXdrMi10ZXN0cy1ld3Mi LAorICAgICAgImJ1aWxkZXJOYW1lcyI6IFsKKyAgICAgICAgIm1hY09TLVNpZXJyYS1SZWxlYXNl LVdLMi1UZXN0cy1FV1MiCisgICAgICBdCisgICAgfSwKKyAgICB7CisgICAgICAidHlwZSI6ICJU cmlnZ2VyYWJsZSIsCiAgICAgICAibmFtZSI6ICJhcGktdGVzdHMtaW9zLXNpbS1ld3MiLAogICAg ICAgImJ1aWxkZXJOYW1lcyI6IFsKICAgICAgICAgIkFQSS1UZXN0cy1pT1MtU2ltdWxhdG9yLUVX UyIKSW5kZXg6IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weQkocmV2aXNpb24gMjM0Nzk5KQorKysgVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1 aWxkL2ZhY3Rvcmllcy5weQkod29ya2luZyBjb3B5KQpAQCAtMTMxLDEyICsxMzEsMTYgQEAgY2xh c3MgaU9TVGVzdHNGYWN0b3J5KFRlc3RGYWN0b3J5KToKICAgICBMYXlvdXRUZXN0Q2xhc3MgPSBS dW5XZWJLaXRUZXN0cwogCiAKLWNsYXNzIE1hY1dLMUZhY3RvcnkoQnVpbGRGYWN0b3J5KToKK2Ns YXNzIE1hY0J1aWxkRmFjdG9yeShCdWlsZEZhY3RvcnkpOgogICAgIHBhc3MKIAogCi1jbGFzcyBN YWNXSzJGYWN0b3J5KEJ1aWxkRmFjdG9yeSk6Ci0gICAgcGFzcworY2xhc3MgTWFjV0sxRmFjdG9y eShUZXN0RmFjdG9yeSk6CisgICAgTGF5b3V0VGVzdENsYXNzID0gUnVuV2ViS2l0MVRlc3RzCisK KworY2xhc3MgTWFjV0syRmFjdG9yeShUZXN0RmFjdG9yeSk6CisgICAgTGF5b3V0VGVzdENsYXNz ID0gUnVuV2ViS2l0VGVzdHMKIAogCiBjbGFzcyBXaW5kb3dzRmFjdG9yeShGYWN0b3J5KToK 347119 2018-08-14 15:55:39 -0700 2018-08-16 13:40:22 -0700 Updated patch ews_split_mac_sierra_release_v2.patch text/plain 4574 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDc5OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE4LTA4LTEzICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBTZXBhcmF0ZSBxdWV1ZXMgZm9yIEJ1aWxkZXJzIGFu ZCBUZXN0ZXJzIC0gbWFjT1MgU2llcnJhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODg1MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNv bjogU3BsaXR0ZWQgbWFjT1MgU2llcnJhIFJlbGVhc2UgcXVldWVzIGludG8gYnVpbGRlcnMgYW5k IHRlc3RlcnMuCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2ZhY3Rvcmll cy5weTogVXNlZCBhcHByb3ByaWF0ZSBiYXNlIGNsYXNzZXMgZm9yIGJ1aWxkZXJzIGFuZCB0ZXN0 ZXJzLgorCiAyMDE4LTA4LTEyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW0xGQ10gRmxvYXQgcHJldi9uZXh0IHNpYmxpbmcgc2hvdWxkIHByZXZlbnQgdG9wL2Jv dHRvbSBtYXJnaW4gY29sbGFwc2luZyB3aXRoIHBhcmVudC4KSW5kZXg6IFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvY29uZmlnLmpzb24JKHJldmlzaW9uIDIzNDg2MSkKKysr IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3cy1idWlsZC9jb25maWcuanNvbgkod29ya2luZyBj b3B5KQpAQCAtMjI0LDE3ICsyMjQsMjUgQEAKICAgICAgICJ3b3JrZXJuYW1lcyI6IFsiZXdzMTIx IiwgImV3czEyMiIsICJld3MxMjMiLCAiZXdzMTI0IiwgImV3czEyNSIsICJld3MxMjYiXQogICAg IH0sCiAgICAgewotICAgICAgIm5hbWUiOiAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0sxLUVXUyIs Ci0gICAgICAiZmFjdG9yeSI6ICJNYWNXSzFGYWN0b3J5IiwKKyAgICAgICJuYW1lIjogIm1hY09T LVNpZXJyYS1SZWxlYXNlLUJ1aWxkLUVXUyIsCisgICAgICAiZmFjdG9yeSI6ICJtYWNPU0J1aWxk RmFjdG9yeSIsCiAgICAgICAicGxhdGZvcm0iOiAibWFjLXNpZXJyYSIsCiAgICAgICAiY29uZmln dXJhdGlvbiI6ICJyZWxlYXNlIiwKICAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwK LSAgICAgICJ0cmlnZ2VycyI6IFsiYXBpLXRlc3RzLW1hYy1ld3MiXSwKKyAgICAgICJ0cmlnZ2Vy cyI6IFsiYXBpLXRlc3RzLW1hYy1ld3MiLCAibWFjb3Mtc2llcnJhLXJlbGVhc2Utd2sxLXRlc3Rz LWV3cyIsICJtYWNvcy1zaWVycmEtcmVsZWFzZS13azItdGVzdHMtZXdzIl0sCiAgICAgICAid29y a2VybmFtZXMiOiBbImV3czEwMCIsICJld3MxMDEiLCAiZXdzMTAyIiwgImV3czEwMyJdCiAgICAg fSwKICAgICB7Ci0gICAgICAibmFtZSI6ICJtYWNPUy1TaWVycmEtUmVsZWFzZS1XSzItRVdTIiwK LSAgICAgICJmYWN0b3J5IjogIk1hY1dLMkZhY3RvcnkiLAorICAgICAgIm5hbWUiOiAibWFjT1Mt U2llcnJhLVJlbGVhc2UtV0sxLVRlc3RzLUVXUyIsCisgICAgICAiZmFjdG9yeSI6ICJtYWNPU1dL MUZhY3RvcnkiLAorICAgICAgInBsYXRmb3JtIjogIm1hYy1zaWVycmEiLAorICAgICAgImNvbmZp Z3VyYXRpb24iOiAicmVsZWFzZSIsCisgICAgICAiYXJjaGl0ZWN0dXJlcyI6IFsieDg2XzY0Il0s CisgICAgICAid29ya2VybmFtZXMiOiBbImV3czEwMCIsICJld3MxMDEiLCAiZXdzMTAyIiwgImV3 czEwMyJdCisgICAgfSwKKyAgICB7CisgICAgICAibmFtZSI6ICJtYWNPUy1TaWVycmEtUmVsZWFz ZS1XSzItVGVzdHMtRVdTIiwKKyAgICAgICJmYWN0b3J5IjogIm1hY09TV0syRmFjdG9yeSIsCiAg ICAgICAicGxhdGZvcm0iOiAibWFjLXNpZXJyYSIsCiAgICAgICAiY29uZmlndXJhdGlvbiI6ICJy ZWxlYXNlIiwKICAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJ4ODZfNjQiXSwKQEAgLTI0Miw3ICsy NTAsNyBAQAogICAgIH0sCiAgICAgewogICAgICAgIm5hbWUiOiAibWFjT1MtU2llcnJhLURlYnVn LVdLMS1FV1MiLAotICAgICAgImZhY3RvcnkiOiAiTWFjV0sxRmFjdG9yeSIsCisgICAgICAiZmFj dG9yeSI6ICJtYWNPU1dLMUZhY3RvcnkiLAogICAgICAgInBsYXRmb3JtIjogIm1hYy1zaWVycmEi LAogICAgICAgImNvbmZpZ3VyYXRpb24iOiAiZGVidWciLAogICAgICAgImFyY2hpdGVjdHVyZXMi OiBbIng4Nl82NCJdLApAQCAtMjUwLDcgKzI1OCw3IEBACiAgICAgfSwKICAgICB7CiAgICAgICAi bmFtZSI6ICJtYWNPUy1IaWdoLVNpZXJyYS1SZWxlYXNlLTMyYml0LVdLMi1FV1MiLAotICAgICAg ImZhY3RvcnkiOiAiTWFjV0syRmFjdG9yeSIsCisgICAgICAiZmFjdG9yeSI6ICJtYWNPU1dLMkZh Y3RvcnkiLAogICAgICAgInBsYXRmb3JtIjogIm1hYy1oaWdoLXNpZXJyYSIsCiAgICAgICAiY29u ZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwKICAgICAgICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0s CkBAIC0zMTcsNyArMzI1LDcgQEAKICAgICAgICJ0eXBlIjogIlRyeV9Vc2VycGFzcyIsCiAgICAg ICAibmFtZSI6ICJ0cnkiLAogICAgICAgInBvcnQiOiA1NTU1LAotICAgICAgImJ1aWxkZXJOYW1l cyI6IFsiU3R5bGUtRVdTIiwgIkpTQy1UZXN0cy1FV1MiLCAibWFjT1MtU2llcnJhLVJlbGVhc2Ut V0sxLUVXUyIsICJHVEstV2Via2l0Mi1FV1MiLCAibWFjT1MtU2llcnJhLVJlbGVhc2UtV0syLUVX UyIsCisgICAgICAiYnVpbGRlck5hbWVzIjogWyJTdHlsZS1FV1MiLCAiSlNDLVRlc3RzLUVXUyIs ICJtYWNPUy1TaWVycmEtUmVsZWFzZS1CdWlsZC1FV1MiLCAiR1RLLVdlYmtpdDItRVdTIiwKICAg ICAgICAgICAgICAgICAgICAgICAgIm1hY09TLUhpZ2gtU2llcnJhLVJlbGVhc2UtMzJiaXQtV0sy LUVXUyIsICJXUEUtRVdTIiwgIldpbmRvd3MtRVdTIiwgImlPUy0xMS1CdWlsZC1FV1MiLCAiV2lu Q2Fpcm8tRVdTIiwgImlPUy0xMS1TaW11bGF0b3ItQnVpbGQtRVdTIiwKICAgICAgICAgICAgICAg ICAgICAgICAgIldlYktpdFB5LVRlc3RzLUVXUyIsICJXZWJLaXRQZXJsLVRlc3RzLUVXUyIsICJt YWNPUy1TaWVycmEtRGVidWctV0sxLUVXUyIsICJCaW5kaW5ncy1UZXN0cy1FV1MiXQogICAgIH0s CkBAIC0zMzAsNiArMzM4LDIwIEBACiAgICAgfSwKICAgICB7CiAgICAgICAidHlwZSI6ICJUcmln Z2VyYWJsZSIsCisgICAgICAibmFtZSI6ICJtYWNvcy1zaWVycmEtcmVsZWFzZS13azEtdGVzdHMt ZXdzIiwKKyAgICAgICJidWlsZGVyTmFtZXMiOiBbCisgICAgICAgICJtYWNPUy1TaWVycmEtUmVs ZWFzZS1XSzEtVGVzdHMtRVdTIgorICAgICAgXQorICAgIH0sCisgICAgeworICAgICAgInR5cGUi OiAiVHJpZ2dlcmFibGUiLAorICAgICAgIm5hbWUiOiAibWFjb3Mtc2llcnJhLXJlbGVhc2Utd2sy LXRlc3RzLWV3cyIsCisgICAgICAiYnVpbGRlck5hbWVzIjogWworICAgICAgICAibWFjT1MtU2ll cnJhLVJlbGVhc2UtV0syLVRlc3RzLUVXUyIKKyAgICAgIF0KKyAgICB9LAorICAgIHsKKyAgICAg ICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwKICAgICAgICJuYW1lIjogImFwaS10ZXN0cy1pb3Mtc2lt LWV3cyIsCiAgICAgICAiYnVpbGRlck5hbWVzIjogWwogICAgICAgICAiQVBJLVRlc3RzLWlPUy1T aW11bGF0b3ItRVdTIgpJbmRleDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL2Zh Y3Rvcmllcy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5CShyZXZpc2lvbiAyMzQ4NjEpCisrKyBUb29scy9CdWlsZFNsYXZlU3Vw cG9ydC9ld3MtYnVpbGQvZmFjdG9yaWVzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsMTIgKzEz MSwxNiBAQCBjbGFzcyBpT1NUZXN0c0ZhY3RvcnkoVGVzdEZhY3RvcnkpOgogICAgIExheW91dFRl c3RDbGFzcyA9IFJ1bldlYktpdFRlc3RzCiAKIAotY2xhc3MgTWFjV0sxRmFjdG9yeShCdWlsZEZh Y3RvcnkpOgorY2xhc3MgbWFjT1NCdWlsZEZhY3RvcnkoQnVpbGRGYWN0b3J5KToKICAgICBwYXNz CiAKIAotY2xhc3MgTWFjV0syRmFjdG9yeShCdWlsZEZhY3RvcnkpOgotICAgIHBhc3MKK2NsYXNz IG1hY09TV0sxRmFjdG9yeShUZXN0RmFjdG9yeSk6CisgICAgTGF5b3V0VGVzdENsYXNzID0gUnVu V2ViS2l0MVRlc3RzCisKKworY2xhc3MgbWFjT1NXSzJGYWN0b3J5KFRlc3RGYWN0b3J5KToKKyAg ICBMYXlvdXRUZXN0Q2xhc3MgPSBSdW5XZWJLaXRUZXN0cwogCiAKIGNsYXNzIFdpbmRvd3NGYWN0 b3J5KEZhY3RvcnkpOgo=