183194 2018-02-27 19:13:53 -0800 BuildbotBuildEntry for buildbot 0.9 uses incorrect buildrequestid 2018-03-12 17:17:23 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175969 1 aakash_jain aakash_jain aakash_jain ap commit-queue dean_johnson dewei_zhu lforschler rniwa webkit-bug-importer oldest_to_newest 1402512 0 aakash_jain 2018-02-27 19:13:53 -0800 Buildbot 0.9 has a property named 'buildrequestid'. Also perf syncing script set a build property named 'build-request-id'. Both these properties looks very similar in name but have very different purpose. https://trac.webkit.org/browser/webkit/trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js#L18 uses 'buildrequestid' provided by buildbot. This is not what we want. We want to fetch the 'build-request-id' set by us in the properties. We should correct BuildbotBuildEntry to use the right variable. Also, we should also rename 'build-request-id' to something else to avoid confusion in future. 1402513 1 aakash_jain 2018-02-27 19:15:54 -0800 The issue is with pending build-requests. Buildbot API for buildrequests doesn't provide properties. We need to figure out a solution to that first. 1403539 2 aakash_jain 2018-03-04 10:04:05 -0800 > The issue is with pending build-requests. Buildbot API for buildrequests doesn't provide properties. We need to figure out a solution to that first. Buildbot API now provides the properties for build-requests after the fix in https://github.com/buildbot/buildbot/pull/3976 1403541 3 334982 aakash_jain 2018-03-04 11:30:57 -0800 Created attachment 334982 Patch - WIP 1403855 4 335060 aakash_jain 2018-03-05 17:51:53 -0800 Created attachment 335060 Proposed patch Tested using unit-test. Will test by running syncing scripts as well. Please review meanwhile. 1405086 5 335060 rniwa 2018-03-08 23:14:21 -0800 Comment on attachment 335060 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=335060&action=review > Websites/perf.webkit.org/tools/js/buildbot-syncer.js:24 > + this._buildRequestId = rawData['properties'] && rawData['properties'][syncer._buildRequestPropertyName] ? > + rawData['properties'][syncer._buildRequestPropertyName][0] : null; Nit: Wrong indentation. '?' should be on line 24, and '?' should appear exactly 4 spaces to the right of this._buildRequestId. 1405325 6 335468 aakash_jain 2018-03-09 14:50:37 -0800 Created attachment 335468 Patch for landing Also passed workerName parameter to samplePendingBuildRequestData, instead of hard-coding worker name inside this sample data. This matches with samplePendingBuildRequestDeprecated. 1405371 7 aakash_jain 2018-03-09 15:48:57 -0800 Committed r229489: <https://trac.webkit.org/changeset/229489> 1405985 8 webkit-bug-importer 2018-03-12 17:17:22 -0700 <rdar://problem/38397677> 1405986 9 webkit-bug-importer 2018-03-12 17:17:23 -0700 <rdar://problem/38397676> 334982 2018-03-04 11:30:57 -0800 2018-03-05 17:51:53 -0800 Patch - WIP buildrequestid_fix.patch text/plain 5293 aakash_jain SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5MjAzKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE4LTAzLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBCdWlsZGJvdEJ1aWxkRW50cnkgZm9yIGJ1aWxkYm90IDAuOSB1c2VzIGlu Y29ycmVjdCBidWlsZHJlcXVlc3RpZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgzMTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiB0b29scy9qcy9idWlsZGJvdC1zeW5jZXIuanM6CisgICAgICAgIChC dWlsZGJvdEJ1aWxkRW50cnkucHJvdG90eXBlLmluaXRpYWxpemUpOiBVcGRhdGVkIF9idWlsZFJl cXVlc3RJZCB0byB1c2UgY29ycmVjdCBidWlsZC1yZXF1ZXN0LWlkLgorICAgICAgICAoQnVpbGRi b3RTeW5jZXIucHJvdG90eXBlLnBhdGhGb3JQZW5kaW5nQnVpbGRzKTogVXBkYXRlZCB1cmwgdG8g ZmV0Y2ggcHJvcGVydGllcyBmb3IgYnVpbGQtcmVxdWVzdHMuCisgICAgICAgICogdW5pdC10ZXN0 cy9idWlsZGJvdC1zeW5jZXItdGVzdHMuanM6CisgICAgICAgIChzYW1wbGVCdWlsZERhdGEpOiBV cGRhdGVkIHNhbXBsZUJ1aWxkRGF0YSB3aXRoIGNvcnJlY3QgYnVpbGQtcmVxdWVzdC1pZCBpbiBw cm9wZXJ0aWVzLiBBZGRlZAorICAgICAgICBwcm9wZXJ0aWVzIHRvIHNhbXBsZVBlbmRpbmdCdWls ZFJlcXVlc3REYXRhLgorCiAyMDE4LTAyLTI4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFw cGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgc2FtcGxlUGVuZGluZ0J1aWxkIHRvIHNhbXBsZVBl bmRpbmdCdWlsZFJlcXVlc3QKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9idWlsZGJvdC1zeW5jZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qcwkocmV2aXNpb24gMjI5MjAzKQorKysgV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMTUsMTIgKzE1LDEzIEBAIGNsYXNzIEJ1aWxkYm90QnVpbGRFbnRyeSB7CiAg ICAgICAgIGFzc2VydC5lcXVhbChzeW5jZXIuYnVpbGRlcklEKCksIHJhd0RhdGFbJ2J1aWxkZXJp ZCddKTsKIAogICAgICAgICB0aGlzLl9zeW5jZXIgPSBzeW5jZXI7Ci0gICAgICAgIHRoaXMuX2J1 aWxkUmVxdWVzdElkID0gcmF3RGF0YVsnYnVpbGRyZXF1ZXN0aWQnXTsKKyAgICAgICAgdGhpcy5f YnVpbGRSZXF1ZXN0SWQgPSBudWxsOwogICAgICAgICB0aGlzLl9oYXNGaW5pc2hlZCA9IHJhd0Rh dGFbJ2NvbXBsZXRlJ107CiAgICAgICAgIHRoaXMuX2lzUGVuZGluZyA9ICdjbGFpbWVkJyBpbiBy YXdEYXRhICYmICFyYXdEYXRhWydjbGFpbWVkJ107CiAgICAgICAgIHRoaXMuX2lzSW5Qcm9ncmVz cyA9ICF0aGlzLl9pc1BlbmRpbmcgJiYgIXRoaXMuX2hhc0ZpbmlzaGVkOwogICAgICAgICB0aGlz Ll9idWlsZE51bWJlciA9IHJhd0RhdGFbJ251bWJlciddOwogICAgICAgICB0aGlzLl93b3JrZXJO YW1lID0gcmF3RGF0YVsncHJvcGVydGllcyddICYmIHJhd0RhdGFbJ3Byb3BlcnRpZXMnXVsnd29y a2VybmFtZSddID8gcmF3RGF0YVsncHJvcGVydGllcyddWyd3b3JrZXJuYW1lJ11bMF0gOiBudWxs CisgICAgICAgIHRoaXMuX2J1aWxkUmVxdWVzdElkID0gcmF3RGF0YVsncHJvcGVydGllcyddICYm IHJhd0RhdGFbJ3Byb3BlcnRpZXMnXVsnYnVpbGQtcmVxdWVzdC1pZCddID8gcmF3RGF0YVsncHJv cGVydGllcyddWydidWlsZC1yZXF1ZXN0LWlkJ11bMF0gOiBudWxsCiAgICAgfQogCiAgICAgc3lu Y2VyKCkgeyByZXR1cm4gdGhpcy5fc3luY2VyOyB9CkBAIC0yNjUsNyArMjY2LDcgQEAgY2xhc3Mg QnVpbGRib3RTeW5jZXIgewogICAgIH0KIAogICAgIHBhdGhGb3JQZW5kaW5nQnVpbGRzSlNPTkRl cHJlY2F0ZWQoKSB7IHJldHVybiBgL2pzb24vYnVpbGRlcnMvJHtlc2NhcGUodGhpcy5fYnVpbGRl ck5hbWUpfS9wZW5kaW5nQnVpbGRzYDsgfQotICAgIHBhdGhGb3JQZW5kaW5nQnVpbGRzKCkgeyBy ZXR1cm4gYC9hcGkvdjIvYnVpbGRlcnMvJHt0aGlzLl9idWlsZGVySUR9L2J1aWxkcmVxdWVzdHM/ Y29tcGxldGU9ZmFsc2UmY2xhaW1lZD1mYWxzZWA7IH0KKyAgICBwYXRoRm9yUGVuZGluZ0J1aWxk cygpIHsgcmV0dXJuIGAvYXBpL3YyL2J1aWxkZXJzLyR7dGhpcy5fYnVpbGRlcklEfS9idWlsZHJl cXVlc3RzP2NvbXBsZXRlPWZhbHNlJmNsYWltZWQ9ZmFsc2UmcHJvcGVydHk9KmA7IH0KICAgICBw YXRoRm9yQnVpbGRKU09ORGVwcmVjYXRlZChzZWxlY3RlZEJ1aWxkcykKICAgICB7CiAgICAgICAg IHJldHVybiBgL2pzb24vYnVpbGRlcnMvJHtlc2NhcGUodGhpcy5fYnVpbGRlck5hbWUpfS9idWls ZHMvP2AgKyBzZWxlY3RlZEJ1aWxkcy5tYXAoKG51bWJlcikgPT4gJ3NlbGVjdD0nICsgbnVtYmVy KS5qb2luKCcmJyk7CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9i dWlsZGJvdC1zeW5jZXItdGVzdHMuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCShyZXZpc2lvbiAyMjky MDMpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5j ZXItdGVzdHMuanMJKHdvcmtpbmcgY29weSkKQEAgLTMwMSw3ICszMDEsNyBAQCBmdW5jdGlvbiBz YW1wbGVQZW5kaW5nQnVpbGRSZXF1ZXN0RGF0YShiCiB7CiAgICAgcmV0dXJuIHsKICAgICAgICAg ImJ1aWxkZXJpZCI6IGJ1aWxkZXJJZCB8fCAxMDIsCi0gICAgICAgICJidWlsZHJlcXVlc3RpZCI6 IGJ1aWxkUmVxdWVzdElkIHx8IDE2NzMzLAorICAgICAgICAiYnVpbGRyZXF1ZXN0aWQiOiAxNywK ICAgICAgICAgImJ1aWxkc2V0aWQiOiA4OTQ3MjAsCiAgICAgICAgICJjbGFpbWVkIjogZmFsc2Us CiAgICAgICAgICJjbGFpbWVkX2F0IjogbnVsbCwKQEAgLTMxMSw3ICszMTEsMTMgQEAgZnVuY3Rp b24gc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERhdGEoYgogICAgICAgICAicHJpb3JpdHkiOiAw LAogICAgICAgICAicmVzdWx0cyI6IC0xLAogICAgICAgICAic3VibWl0dGVkX2F0IjogYnVpbGRU aW1lIHx8IDE0NTg3MDQ5ODMsCi0gICAgICAgICJ3YWl0ZWRfZm9yIjogZmFsc2UKKyAgICAgICAg IndhaXRlZF9mb3IiOiBmYWxzZSwKKyAgICAgICAgInByb3BlcnRpZXMiOiB7CisgICAgICAgICAg ICAiYnVpbGQtcmVxdWVzdC1pZCI6IFtidWlsZFJlcXVlc3RJZCB8fCAxNjczMywgIkZvcmNlIEJ1 aWxkIEZvcm0iXSwKKyAgICAgICAgICAgICJzY2hlZHVsZXIiOiBbIkFCVGVzdC1pUGFkLVJ1bkJl bmNobWFyay1UZXN0cy1Gb3JjZVNjaGVkdWxlciIsICJTY2hlZHVsZXIiXSwKKyAgICAgICAgICAg ICJzbGF2ZW5hbWUiOiBbIkFCVGVzdC1pUGFkLTAiLCAiV29ya2VyIChkZXByZWNhdGVkKSJdLAor ICAgICAgICAgICAgIndvcmtlcm5hbWUiOiBbIkFCVGVzdC1pUGFkLTAiLCAiV29ya2VyIl0KKyAg ICAgICAgfQogICAgIH07CiB9CiAKQEAgLTMyNyw3ICszMzMsNyBAQCBmdW5jdGlvbiBzYW1wbGVC dWlsZERhdGEod29ya2VyTmFtZSwgaXNDCiAgICAgcmV0dXJuIHsKICAgICAgICAgImJ1aWxkZXJp ZCI6IGJ1aWxkZXJJZCB8fCAxMDIsCiAgICAgICAgICJudW1iZXIiOiBidWlsZE51bWJlciB8fCA2 MTQsCi0gICAgICAgICJidWlsZHJlcXVlc3RpZCI6IGJ1aWxkUmVxdWVzdElkIHx8IDE2NzMzLAor ICAgICAgICAiYnVpbGRyZXF1ZXN0aWQiOiAxNywKICAgICAgICAgImNvbXBsZXRlIjogaXNDb21w bGV0ZSwKICAgICAgICAgImNvbXBsZXRlX2F0IjogbnVsbCwKICAgICAgICAgImJ1aWxkaWQiOiA0 MTg3NDQsCkBAIC0zMzcsMTEgKzM0MywxMSBAQCBmdW5jdGlvbiBzYW1wbGVCdWlsZERhdGEod29y a2VyTmFtZSwgaXNDCiAgICAgICAgICJzdGF0ZV9zdHJpbmciOiAiYnVpbGRpbmciLAogICAgICAg ICAid29ya2VyaWQiOiA0MSwKICAgICAgICAgInByb3BlcnRpZXMiOiB7CisgICAgICAgICAgICAi YnVpbGQtcmVxdWVzdC1pZCI6IFtidWlsZFJlcXVlc3RJZCB8fCAxNjczMywgIkZvcmNlIEJ1aWxk IEZvcm0iXSwKICAgICAgICAgICAgICJwbGF0Zm9ybSI6IFsibWFjIiwgIlVua25vd24iXSwKICAg ICAgICAgICAgICJzY2hlZHVsZXIiOiBbIkFCVGVzdC1pUGFkLVJ1bkJlbmNobWFyay1UZXN0cy1G b3JjZVNjaGVkdWxlciIsICJTY2hlZHVsZXIiXSwKICAgICAgICAgICAgICJzbGF2ZW5hbWUiOiBb d29ya2VyTmFtZSB8fCAiQUJUZXN0LWlQYWQtMCIsICJXb3JrZXIgKGRlcHJlY2F0ZWQpIl0sCi0g ICAgICAgICAgICAid29ya2VybmFtZSI6IFt3b3JrZXJOYW1lIHx8ICJBQlRlc3QtaVBhZC0wIiwg IldvcmtlciIKLSAgICAgICAgICAgIF0KKyAgICAgICAgICAgICJ3b3JrZXJuYW1lIjogW3dvcmtl ck5hbWUgfHwgIkFCVGVzdC1pUGFkLTAiLCAiV29ya2VyIl0KICAgICAgICAgfQogICAgIH07CiB9 CkBAIC0xMjgyLDcgKzEyODgsNyBAQCBkZXNjcmliZSgnQnVpbGRib3RTeW5jZXInLCAoKSA9PiB7 CiAgICAgICAgICAgICBjb25zdCBlbnRyeSA9IHBlbmRpbmdFbnRyaWVzWzBdOwogICAgICAgICAg ICAgYXNzZXJ0Lm9rKGVudHJ5IGluc3RhbmNlb2YgQnVpbGRib3RCdWlsZEVudHJ5KTsKICAgICAg ICAgICAgIGFzc2VydC5vayghZW50cnkuYnVpbGROdW1iZXIoKSk7Ci0gICAgICAgICAgICBhc3Nl cnQub2soIWVudHJ5Lndvcmtlck5hbWUoKSk7CisgICAgICAgICAgICBhc3NlcnQub2soZW50cnku d29ya2VyTmFtZSgpKTsKICAgICAgICAgICAgIGFzc2VydC5lcXVhbChlbnRyeS5idWlsZFJlcXVl c3RJZCgpLCAxNjczMyk7CiAgICAgICAgICAgICBhc3NlcnQub2soZW50cnkuaXNQZW5kaW5nKCkp OwogICAgICAgICAgICAgYXNzZXJ0Lm9rKCFlbnRyeS5pc0luUHJvZ3Jlc3MoKSk7Cg== 335060 2018-03-05 17:51:53 -0800 2018-03-09 14:50:37 -0800 Proposed patch buildrequestid_fix_v2.patch text/plain 5502 aakash_jain SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5MjAzKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE4LTAzLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBCdWlsZGJvdEJ1aWxkRW50cnkgZm9yIGJ1aWxkYm90IDAuOSB1c2VzIGlu Y29ycmVjdCBidWlsZHJlcXVlc3RpZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgzMTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiB0b29scy9qcy9idWlsZGJvdC1zeW5jZXIuanM6CisgICAgICAgIChC dWlsZGJvdEJ1aWxkRW50cnkucHJvdG90eXBlLmluaXRpYWxpemUpOiBVcGRhdGVkIF9idWlsZFJl cXVlc3RJZCB0byB1c2UgY29ycmVjdCBidWlsZC1yZXF1ZXN0LWlkLCBhcyBzZXQgaW4gc3luY2Vy Ll9idWlsZFJlcXVlc3RQcm9wZXJ0eU5hbWUuCisgICAgICAgIChCdWlsZGJvdFN5bmNlci5wcm90 b3R5cGUucGF0aEZvclBlbmRpbmdCdWlsZHMpOiBVcGRhdGVkIHVybCB0byBmZXRjaCBwcm9wZXJ0 aWVzIGZvciBidWlsZC1yZXF1ZXN0cy4KKyAgICAgICAgKiB1bml0LXRlc3RzL2J1aWxkYm90LXN5 bmNlci10ZXN0cy5qczoKKyAgICAgICAgKHNhbXBsZUJ1aWxkRGF0YSk6IFVwZGF0ZWQgc2FtcGxl QnVpbGREYXRhIHdpdGggY29ycmVjdCBidWlsZC1yZXF1ZXN0LWlkIGluIHByb3BlcnRpZXMuIEFk ZGVkCisgICAgICAgIHByb3BlcnRpZXMgdG8gc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERhdGEu CisKIDIwMTgtMDItMjggIEFha2FzaCBKYWluICA8YWFrYXNoX2phaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbmFtZSBzYW1wbGVQZW5kaW5nQnVpbGQgdG8gc2FtcGxlUGVuZGluZ0J1aWxkUmVx dWVzdApJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5 bmNlci5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMv YnVpbGRib3Qtc3luY2VyLmpzCShyZXZpc2lvbiAyMjkyMDMpCisrKyBXZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvdG9vbHMvanMvYnVpbGRib3Qtc3luY2VyLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0x NSwxMiArMTUsMTMgQEAgY2xhc3MgQnVpbGRib3RCdWlsZEVudHJ5IHsKICAgICAgICAgYXNzZXJ0 LmVxdWFsKHN5bmNlci5idWlsZGVySUQoKSwgcmF3RGF0YVsnYnVpbGRlcmlkJ10pOwogCiAgICAg ICAgIHRoaXMuX3N5bmNlciA9IHN5bmNlcjsKLSAgICAgICAgdGhpcy5fYnVpbGRSZXF1ZXN0SWQg PSByYXdEYXRhWydidWlsZHJlcXVlc3RpZCddOwogICAgICAgICB0aGlzLl9oYXNGaW5pc2hlZCA9 IHJhd0RhdGFbJ2NvbXBsZXRlJ107CiAgICAgICAgIHRoaXMuX2lzUGVuZGluZyA9ICdjbGFpbWVk JyBpbiByYXdEYXRhICYmICFyYXdEYXRhWydjbGFpbWVkJ107CiAgICAgICAgIHRoaXMuX2lzSW5Q cm9ncmVzcyA9ICF0aGlzLl9pc1BlbmRpbmcgJiYgIXRoaXMuX2hhc0ZpbmlzaGVkOwogICAgICAg ICB0aGlzLl9idWlsZE51bWJlciA9IHJhd0RhdGFbJ251bWJlciddOwotICAgICAgICB0aGlzLl93 b3JrZXJOYW1lID0gcmF3RGF0YVsncHJvcGVydGllcyddICYmIHJhd0RhdGFbJ3Byb3BlcnRpZXMn XVsnd29ya2VybmFtZSddID8gcmF3RGF0YVsncHJvcGVydGllcyddWyd3b3JrZXJuYW1lJ11bMF0g OiBudWxsCisgICAgICAgIHRoaXMuX3dvcmtlck5hbWUgPSByYXdEYXRhWydwcm9wZXJ0aWVzJ10g JiYgcmF3RGF0YVsncHJvcGVydGllcyddWyd3b3JrZXJuYW1lJ10gPyByYXdEYXRhWydwcm9wZXJ0 aWVzJ11bJ3dvcmtlcm5hbWUnXVswXSA6IG51bGw7CisgICAgICAgIHRoaXMuX2J1aWxkUmVxdWVz dElkID0gcmF3RGF0YVsncHJvcGVydGllcyddICYmIHJhd0RhdGFbJ3Byb3BlcnRpZXMnXVtzeW5j ZXIuX2J1aWxkUmVxdWVzdFByb3BlcnR5TmFtZV0gPworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByYXdEYXRhWydwcm9wZXJ0aWVzJ11bc3luY2VyLl9idWlsZFJlcXVlc3RQcm9w ZXJ0eU5hbWVdWzBdIDogbnVsbDsKICAgICB9CiAKICAgICBzeW5jZXIoKSB7IHJldHVybiB0aGlz Ll9zeW5jZXI7IH0KQEAgLTI2NSw3ICsyNjYsNyBAQCBjbGFzcyBCdWlsZGJvdFN5bmNlciB7CiAg ICAgfQogCiAgICAgcGF0aEZvclBlbmRpbmdCdWlsZHNKU09ORGVwcmVjYXRlZCgpIHsgcmV0dXJu IGAvanNvbi9idWlsZGVycy8ke2VzY2FwZSh0aGlzLl9idWlsZGVyTmFtZSl9L3BlbmRpbmdCdWls ZHNgOyB9Ci0gICAgcGF0aEZvclBlbmRpbmdCdWlsZHMoKSB7IHJldHVybiBgL2FwaS92Mi9idWls ZGVycy8ke3RoaXMuX2J1aWxkZXJJRH0vYnVpbGRyZXF1ZXN0cz9jb21wbGV0ZT1mYWxzZSZjbGFp bWVkPWZhbHNlYDsgfQorICAgIHBhdGhGb3JQZW5kaW5nQnVpbGRzKCkgeyByZXR1cm4gYC9hcGkv djIvYnVpbGRlcnMvJHt0aGlzLl9idWlsZGVySUR9L2J1aWxkcmVxdWVzdHM/Y29tcGxldGU9ZmFs c2UmY2xhaW1lZD1mYWxzZSZwcm9wZXJ0eT0qYDsgfQogICAgIHBhdGhGb3JCdWlsZEpTT05EZXBy ZWNhdGVkKHNlbGVjdGVkQnVpbGRzKQogICAgIHsKICAgICAgICAgcmV0dXJuIGAvanNvbi9idWls ZGVycy8ke2VzY2FwZSh0aGlzLl9idWlsZGVyTmFtZSl9L2J1aWxkcy8/YCArIHNlbGVjdGVkQnVp bGRzLm1hcCgobnVtYmVyKSA9PiAnc2VsZWN0PScgKyBudW1iZXIpLmpvaW4oJyYnKTsKSW5kZXg6 IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2J1aWxkYm90LXN5bmNlci10ZXN0 cy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9i dWlsZGJvdC1zeW5jZXItdGVzdHMuanMJKHJldmlzaW9uIDIyOTIwMykKKysrIFdlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2J1aWxkYm90LXN5bmNlci10ZXN0cy5qcwkod29ya2lu ZyBjb3B5KQpAQCAtMzAxLDcgKzMwMSw3IEBAIGZ1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZFJl cXVlc3REYXRhKGIKIHsKICAgICByZXR1cm4gewogICAgICAgICAiYnVpbGRlcmlkIjogYnVpbGRl cklkIHx8IDEwMiwKLSAgICAgICAgImJ1aWxkcmVxdWVzdGlkIjogYnVpbGRSZXF1ZXN0SWQgfHwg MTY3MzMsCisgICAgICAgICJidWlsZHJlcXVlc3RpZCI6IDE3LAogICAgICAgICAiYnVpbGRzZXRp ZCI6IDg5NDcyMCwKICAgICAgICAgImNsYWltZWQiOiBmYWxzZSwKICAgICAgICAgImNsYWltZWRf YXQiOiBudWxsLApAQCAtMzExLDcgKzMxMSwxMyBAQCBmdW5jdGlvbiBzYW1wbGVQZW5kaW5nQnVp bGRSZXF1ZXN0RGF0YShiCiAgICAgICAgICJwcmlvcml0eSI6IDAsCiAgICAgICAgICJyZXN1bHRz IjogLTEsCiAgICAgICAgICJzdWJtaXR0ZWRfYXQiOiBidWlsZFRpbWUgfHwgMTQ1ODcwNDk4MywK LSAgICAgICAgIndhaXRlZF9mb3IiOiBmYWxzZQorICAgICAgICAid2FpdGVkX2ZvciI6IGZhbHNl LAorICAgICAgICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICJidWlsZF9yZXF1ZXN0X2lk IjogW2J1aWxkUmVxdWVzdElkIHx8IDE2NzMzLCAiRm9yY2UgQnVpbGQgRm9ybSJdLAorICAgICAg ICAgICAgInNjaGVkdWxlciI6IFsiQUJUZXN0LWlQYWQtUnVuQmVuY2htYXJrLVRlc3RzLUZvcmNl U2NoZWR1bGVyIiwgIlNjaGVkdWxlciJdLAorICAgICAgICAgICAgInNsYXZlbmFtZSI6IFsiQUJU ZXN0LWlQYWQtMCIsICJXb3JrZXIgKGRlcHJlY2F0ZWQpIl0sCisgICAgICAgICAgICAid29ya2Vy bmFtZSI6IFsiQUJUZXN0LWlQYWQtMCIsICJXb3JrZXIiXQorICAgICAgICB9CiAgICAgfTsKIH0K IApAQCAtMzI3LDcgKzMzMyw3IEBAIGZ1bmN0aW9uIHNhbXBsZUJ1aWxkRGF0YSh3b3JrZXJOYW1l LCBpc0MKICAgICByZXR1cm4gewogICAgICAgICAiYnVpbGRlcmlkIjogYnVpbGRlcklkIHx8IDEw MiwKICAgICAgICAgIm51bWJlciI6IGJ1aWxkTnVtYmVyIHx8IDYxNCwKLSAgICAgICAgImJ1aWxk cmVxdWVzdGlkIjogYnVpbGRSZXF1ZXN0SWQgfHwgMTY3MzMsCisgICAgICAgICJidWlsZHJlcXVl c3RpZCI6IDE3LAogICAgICAgICAiY29tcGxldGUiOiBpc0NvbXBsZXRlLAogICAgICAgICAiY29t cGxldGVfYXQiOiBudWxsLAogICAgICAgICAiYnVpbGRpZCI6IDQxODc0NCwKQEAgLTMzNywxMSAr MzQzLDExIEBAIGZ1bmN0aW9uIHNhbXBsZUJ1aWxkRGF0YSh3b3JrZXJOYW1lLCBpc0MKICAgICAg ICAgInN0YXRlX3N0cmluZyI6ICJidWlsZGluZyIsCiAgICAgICAgICJ3b3JrZXJpZCI6IDQxLAog ICAgICAgICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICJidWlsZF9yZXF1ZXN0X2lkIjog W2J1aWxkUmVxdWVzdElkIHx8IDE2NzMzLCAiRm9yY2UgQnVpbGQgRm9ybSJdLAogICAgICAgICAg ICAgInBsYXRmb3JtIjogWyJtYWMiLCAiVW5rbm93biJdLAogICAgICAgICAgICAgInNjaGVkdWxl ciI6IFsiQUJUZXN0LWlQYWQtUnVuQmVuY2htYXJrLVRlc3RzLUZvcmNlU2NoZWR1bGVyIiwgIlNj aGVkdWxlciJdLAogICAgICAgICAgICAgInNsYXZlbmFtZSI6IFt3b3JrZXJOYW1lIHx8ICJBQlRl c3QtaVBhZC0wIiwgIldvcmtlciAoZGVwcmVjYXRlZCkiXSwKLSAgICAgICAgICAgICJ3b3JrZXJu YW1lIjogW3dvcmtlck5hbWUgfHwgIkFCVGVzdC1pUGFkLTAiLCAiV29ya2VyIgotICAgICAgICAg ICAgXQorICAgICAgICAgICAgIndvcmtlcm5hbWUiOiBbd29ya2VyTmFtZSB8fCAiQUJUZXN0LWlQ YWQtMCIsICJXb3JrZXIiXQogICAgICAgICB9CiAgICAgfTsKIH0KQEAgLTEyODIsNyArMTI4OCw3 IEBAIGRlc2NyaWJlKCdCdWlsZGJvdFN5bmNlcicsICgpID0+IHsKICAgICAgICAgICAgIGNvbnN0 IGVudHJ5ID0gcGVuZGluZ0VudHJpZXNbMF07CiAgICAgICAgICAgICBhc3NlcnQub2soZW50cnkg aW5zdGFuY2VvZiBCdWlsZGJvdEJ1aWxkRW50cnkpOwogICAgICAgICAgICAgYXNzZXJ0Lm9rKCFl bnRyeS5idWlsZE51bWJlcigpKTsKLSAgICAgICAgICAgIGFzc2VydC5vayghZW50cnkud29ya2Vy TmFtZSgpKTsKKyAgICAgICAgICAgIGFzc2VydC5vayhlbnRyeS53b3JrZXJOYW1lKCkpOwogICAg ICAgICAgICAgYXNzZXJ0LmVxdWFsKGVudHJ5LmJ1aWxkUmVxdWVzdElkKCksIDE2NzMzKTsKICAg ICAgICAgICAgIGFzc2VydC5vayhlbnRyeS5pc1BlbmRpbmcoKSk7CiAgICAgICAgICAgICBhc3Nl cnQub2soIWVudHJ5LmlzSW5Qcm9ncmVzcygpKTsK 335468 2018-03-09 14:50:37 -0800 2018-03-09 15:48:26 -0800 Patch for landing buildrequestid_fix_v3.patch text/plain 5754 aakash_jain SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5NDg0KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE4LTAzLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBCdWlsZGJvdEJ1aWxkRW50cnkgZm9yIGJ1aWxkYm90IDAuOSB1c2VzIGlu Y29ycmVjdCBidWlsZHJlcXVlc3RpZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgzMTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdh LgorCisgICAgICAgICogdG9vbHMvanMvYnVpbGRib3Qtc3luY2VyLmpzOgorICAgICAgICAoQnVp bGRib3RCdWlsZEVudHJ5LnByb3RvdHlwZS5pbml0aWFsaXplKTogVXBkYXRlZCBfYnVpbGRSZXF1 ZXN0SWQgdG8gdXNlIGNvcnJlY3QgYnVpbGQtcmVxdWVzdC1pZCwgYXMgc2V0IGluIHN5bmNlci5f YnVpbGRSZXF1ZXN0UHJvcGVydHlOYW1lLgorICAgICAgICAoQnVpbGRib3RTeW5jZXIucHJvdG90 eXBlLnBhdGhGb3JQZW5kaW5nQnVpbGRzKTogVXBkYXRlZCB1cmwgdG8gZmV0Y2ggcHJvcGVydGll cyBmb3IgYnVpbGQtcmVxdWVzdHMuCisgICAgICAgICogdW5pdC10ZXN0cy9idWlsZGJvdC1zeW5j ZXItdGVzdHMuanM6CisgICAgICAgIChzYW1wbGVCdWlsZERhdGEpOiBVcGRhdGVkIHNhbXBsZUJ1 aWxkRGF0YSB3aXRoIGNvcnJlY3QgYnVpbGQtcmVxdWVzdC1pZCBpbiBwcm9wZXJ0aWVzLiBBZGRl ZAorICAgICAgICBwcm9wZXJ0aWVzIHRvIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REYXRhLgor CiAyMDE4LTAyLTI4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZW5hbWUgc2FtcGxlUGVuZGluZ0J1aWxkIHRvIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVl c3QKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy9idWlsZGJvdC1zeW5j ZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2J1 aWxkYm90LXN5bmNlci5qcwkocmV2aXNpb24gMjI5NDg0KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3Rvb2xzL2pzL2J1aWxkYm90LXN5bmNlci5qcwkod29ya2luZyBjb3B5KQpAQCAtMTUs MTIgKzE1LDEzIEBAIGNsYXNzIEJ1aWxkYm90QnVpbGRFbnRyeSB7CiAgICAgICAgIGFzc2VydC5l cXVhbChzeW5jZXIuYnVpbGRlcklEKCksIHJhd0RhdGFbJ2J1aWxkZXJpZCddKTsKIAogICAgICAg ICB0aGlzLl9zeW5jZXIgPSBzeW5jZXI7Ci0gICAgICAgIHRoaXMuX2J1aWxkUmVxdWVzdElkID0g cmF3RGF0YVsnYnVpbGRyZXF1ZXN0aWQnXTsKICAgICAgICAgdGhpcy5faGFzRmluaXNoZWQgPSBy YXdEYXRhWydjb21wbGV0ZSddOwogICAgICAgICB0aGlzLl9pc1BlbmRpbmcgPSAnY2xhaW1lZCcg aW4gcmF3RGF0YSAmJiAhcmF3RGF0YVsnY2xhaW1lZCddOwogICAgICAgICB0aGlzLl9pc0luUHJv Z3Jlc3MgPSAhdGhpcy5faXNQZW5kaW5nICYmICF0aGlzLl9oYXNGaW5pc2hlZDsKICAgICAgICAg dGhpcy5fYnVpbGROdW1iZXIgPSByYXdEYXRhWydudW1iZXInXTsKLSAgICAgICAgdGhpcy5fd29y a2VyTmFtZSA9IHJhd0RhdGFbJ3Byb3BlcnRpZXMnXSAmJiByYXdEYXRhWydwcm9wZXJ0aWVzJ11b J3dvcmtlcm5hbWUnXSA/IHJhd0RhdGFbJ3Byb3BlcnRpZXMnXVsnd29ya2VybmFtZSddWzBdIDog bnVsbAorICAgICAgICB0aGlzLl93b3JrZXJOYW1lID0gcmF3RGF0YVsncHJvcGVydGllcyddICYm IHJhd0RhdGFbJ3Byb3BlcnRpZXMnXVsnd29ya2VybmFtZSddID8gcmF3RGF0YVsncHJvcGVydGll cyddWyd3b3JrZXJuYW1lJ11bMF0gOiBudWxsOworICAgICAgICB0aGlzLl9idWlsZFJlcXVlc3RJ ZCA9IHJhd0RhdGFbJ3Byb3BlcnRpZXMnXSAmJiByYXdEYXRhWydwcm9wZXJ0aWVzJ11bc3luY2Vy Ll9idWlsZFJlcXVlc3RQcm9wZXJ0eU5hbWVdCisgICAgICAgICAgICA/IHJhd0RhdGFbJ3Byb3Bl cnRpZXMnXVtzeW5jZXIuX2J1aWxkUmVxdWVzdFByb3BlcnR5TmFtZV1bMF0gOiBudWxsOwogICAg IH0KIAogICAgIHN5bmNlcigpIHsgcmV0dXJuIHRoaXMuX3N5bmNlcjsgfQpAQCAtMjY1LDcgKzI2 Niw3IEBAIGNsYXNzIEJ1aWxkYm90U3luY2VyIHsKICAgICB9CiAKICAgICBwYXRoRm9yUGVuZGlu Z0J1aWxkc0pTT05EZXByZWNhdGVkKCkgeyByZXR1cm4gYC9qc29uL2J1aWxkZXJzLyR7ZXNjYXBl KHRoaXMuX2J1aWxkZXJOYW1lKX0vcGVuZGluZ0J1aWxkc2A7IH0KLSAgICBwYXRoRm9yUGVuZGlu Z0J1aWxkcygpIHsgcmV0dXJuIGAvYXBpL3YyL2J1aWxkZXJzLyR7dGhpcy5fYnVpbGRlcklEfS9i dWlsZHJlcXVlc3RzP2NvbXBsZXRlPWZhbHNlJmNsYWltZWQ9ZmFsc2VgOyB9CisgICAgcGF0aEZv clBlbmRpbmdCdWlsZHMoKSB7IHJldHVybiBgL2FwaS92Mi9idWlsZGVycy8ke3RoaXMuX2J1aWxk ZXJJRH0vYnVpbGRyZXF1ZXN0cz9jb21wbGV0ZT1mYWxzZSZjbGFpbWVkPWZhbHNlJnByb3BlcnR5 PSpgOyB9CiAgICAgcGF0aEZvckJ1aWxkSlNPTkRlcHJlY2F0ZWQoc2VsZWN0ZWRCdWlsZHMpCiAg ICAgewogICAgICAgICByZXR1cm4gYC9qc29uL2J1aWxkZXJzLyR7ZXNjYXBlKHRoaXMuX2J1aWxk ZXJOYW1lKX0vYnVpbGRzLz9gICsgc2VsZWN0ZWRCdWlsZHMubWFwKChudW1iZXIpID0+ICdzZWxl Y3Q9JyArIG51bWJlcikuam9pbignJicpOwpJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3VuaXQtdGVzdHMvYnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL2J1aWxkYm90LXN5bmNlci10ZXN0cy5qcwko cmV2aXNpb24gMjI5NDg0KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMv YnVpbGRib3Qtc3luY2VyLXRlc3RzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0yOTcsMTEgKzI5Nywx MSBAQCBmdW5jdGlvbiBjcmVhdGVTYW1wbGVCdWlsZFJlcXVlc3RXaXRoT3duCiAgICAgICAgICdj b21taXRTZXQnOiBjb21taXRTZXQsICdzdGF0dXMnOiAncGVuZGluZycsICdwbGF0Zm9ybSc6IHBs YXRmb3JtLCAndGVzdCc6IHRlc3QsICdvcmRlcic6IG9yZGVyfSk7CiB9CiAKLWZ1bmN0aW9uIHNh bXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REYXRhKGJ1aWxkUmVxdWVzdElkLCBidWlsZFRpbWUsIGJ1 aWxkZXJJZCkKK2Z1bmN0aW9uIHNhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REYXRhKGJ1aWxkUmVx dWVzdElkLCBidWlsZFRpbWUsIHdvcmtlck5hbWUsIGJ1aWxkZXJJZCkKIHsKICAgICByZXR1cm4g ewogICAgICAgICAiYnVpbGRlcmlkIjogYnVpbGRlcklkIHx8IDEwMiwKLSAgICAgICAgImJ1aWxk cmVxdWVzdGlkIjogYnVpbGRSZXF1ZXN0SWQgfHwgMTY3MzMsCisgICAgICAgICJidWlsZHJlcXVl c3RpZCI6IDE3LAogICAgICAgICAiYnVpbGRzZXRpZCI6IDg5NDcyMCwKICAgICAgICAgImNsYWlt ZWQiOiBmYWxzZSwKICAgICAgICAgImNsYWltZWRfYXQiOiBudWxsLApAQCAtMzExLDE0ICszMTEs MjAgQEAgZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERhdGEoYgogICAgICAgICAi cHJpb3JpdHkiOiAwLAogICAgICAgICAicmVzdWx0cyI6IC0xLAogICAgICAgICAic3VibWl0dGVk X2F0IjogYnVpbGRUaW1lIHx8IDE0NTg3MDQ5ODMsCi0gICAgICAgICJ3YWl0ZWRfZm9yIjogZmFs c2UKKyAgICAgICAgIndhaXRlZF9mb3IiOiBmYWxzZSwKKyAgICAgICAgInByb3BlcnRpZXMiOiB7 CisgICAgICAgICAgICAiYnVpbGRfcmVxdWVzdF9pZCI6IFtidWlsZFJlcXVlc3RJZCB8fCAxNjcz MywgIkZvcmNlIEJ1aWxkIEZvcm0iXSwKKyAgICAgICAgICAgICJzY2hlZHVsZXIiOiBbIkFCVGVz dC1pUGFkLVJ1bkJlbmNobWFyay1UZXN0cy1Gb3JjZVNjaGVkdWxlciIsICJTY2hlZHVsZXIiXSwK KyAgICAgICAgICAgICJzbGF2ZW5hbWUiOiBbd29ya2VyTmFtZSwgIldvcmtlciAoZGVwcmVjYXRl ZCkiXSwKKyAgICAgICAgICAgICJ3b3JrZXJuYW1lIjogW3dvcmtlck5hbWUsICJXb3JrZXIiXQor ICAgICAgICB9CiAgICAgfTsKIH0KIAotZnVuY3Rpb24gc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVz dHMoYnVpbGRSZXF1ZXN0SWQsIGJ1aWxkVGltZSwgYnVpbGRlck5hbWUpCitmdW5jdGlvbiBzYW1w bGVQZW5kaW5nQnVpbGRSZXF1ZXN0cyhidWlsZFJlcXVlc3RJZCwgYnVpbGRUaW1lLCB3b3JrZXJO YW1lLCBidWlsZGVyTmFtZSkKIHsKICAgICByZXR1cm4gewotICAgICAgICAiYnVpbGRyZXF1ZXN0 cyIgOiBbc2FtcGxlUGVuZGluZ0J1aWxkUmVxdWVzdERhdGEoYnVpbGRSZXF1ZXN0SWQsIGJ1aWxk VGltZSwgYnVpbGRlck5hbWVUb0lETWFwKClbYnVpbGRlck5hbWVdKV0KKyAgICAgICAgImJ1aWxk cmVxdWVzdHMiIDogW3NhbXBsZVBlbmRpbmdCdWlsZFJlcXVlc3REYXRhKGJ1aWxkUmVxdWVzdElk LCBidWlsZFRpbWUsIHdvcmtlck5hbWUsIGJ1aWxkZXJOYW1lVG9JRE1hcCgpW2J1aWxkZXJOYW1l XSldCiAgICAgfTsKIH0KIApAQCAtMzI3LDcgKzMzMyw3IEBAIGZ1bmN0aW9uIHNhbXBsZUJ1aWxk RGF0YSh3b3JrZXJOYW1lLCBpc0MKICAgICByZXR1cm4gewogICAgICAgICAiYnVpbGRlcmlkIjog YnVpbGRlcklkIHx8IDEwMiwKICAgICAgICAgIm51bWJlciI6IGJ1aWxkTnVtYmVyIHx8IDYxNCwK LSAgICAgICAgImJ1aWxkcmVxdWVzdGlkIjogYnVpbGRSZXF1ZXN0SWQgfHwgMTY3MzMsCisgICAg ICAgICJidWlsZHJlcXVlc3RpZCI6IDE3LAogICAgICAgICAiY29tcGxldGUiOiBpc0NvbXBsZXRl LAogICAgICAgICAiY29tcGxldGVfYXQiOiBudWxsLAogICAgICAgICAiYnVpbGRpZCI6IDQxODc0 NCwKQEAgLTMzNywxMSArMzQzLDExIEBAIGZ1bmN0aW9uIHNhbXBsZUJ1aWxkRGF0YSh3b3JrZXJO YW1lLCBpc0MKICAgICAgICAgInN0YXRlX3N0cmluZyI6ICJidWlsZGluZyIsCiAgICAgICAgICJ3 b3JrZXJpZCI6IDQxLAogICAgICAgICAicHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICJidWls ZF9yZXF1ZXN0X2lkIjogW2J1aWxkUmVxdWVzdElkIHx8IDE2NzMzLCAiRm9yY2UgQnVpbGQgRm9y bSJdLAogICAgICAgICAgICAgInBsYXRmb3JtIjogWyJtYWMiLCAiVW5rbm93biJdLAogICAgICAg ICAgICAgInNjaGVkdWxlciI6IFsiQUJUZXN0LWlQYWQtUnVuQmVuY2htYXJrLVRlc3RzLUZvcmNl U2NoZWR1bGVyIiwgIlNjaGVkdWxlciJdLAogICAgICAgICAgICAgInNsYXZlbmFtZSI6IFt3b3Jr ZXJOYW1lIHx8ICJBQlRlc3QtaVBhZC0wIiwgIldvcmtlciAoZGVwcmVjYXRlZCkiXSwKLSAgICAg ICAgICAgICJ3b3JrZXJuYW1lIjogW3dvcmtlck5hbWUgfHwgIkFCVGVzdC1pUGFkLTAiLCAiV29y a2VyIgotICAgICAgICAgICAgXQorICAgICAgICAgICAgIndvcmtlcm5hbWUiOiBbd29ya2VyTmFt ZSB8fCAiQUJUZXN0LWlQYWQtMCIsICJXb3JrZXIiXQogICAgICAgICB9CiAgICAgfTsKIH0K