From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: =?utf-8?b?T25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+?= To: git-commits@fedoraproject.org Subject: [rpms/fedpkg] 1.48-1: Patch: Fix unittest for bodhi based on its version Date: Mon, 10 Aug 2026 21:45:53 GMT Message-ID: <178639835379.1.5995713204389709936.rpms-fedpkg-aaa434fc637f@fedoraproject.org> List-ID: X-Git-Repo: rpms/fedpkg X-Git-Branch: 1.48-1 X-Git-Rev: aaa434fc637f9bec434492aaddb4614970fc120b ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZmVkcGtnCiAgICAgICAgICAgIEJyYW5jaCA6IDEuNDgtMQogICAgICAgICAg ICBDb21taXQgOiBhYWE0MzRmYzYzN2Y5YmVjNDM0NDkyYWFkZGI0NjE0OTcwZmMxMjBiCiAgICAg ICAgICAgIEF1dGhvciA6IE9uZMWZZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgogICAgICAg ICAgICBEYXRlICAgOiAyMDIwLTA1LTE4VDE0OjAyOjIxKzAwOjAwCiAgICAgICAgICAgIFN0YXRz ICA6ICs1Mi8tMTk0IGluIDMgZmlsZShzKQogICAgICAgICAgICBVUkwgICAgOiBodHRwczovL3Ny Yy5mZWRvcmFwcm9qZWN0Lm9yZy9ycG1zL2ZlZHBrZy9jL2FhYTQzNGZjNjM3ZjliZWM0MzQ0OTJh YWRkYjQ2MTQ5NzBmYzEyMGI/YnJhbmNoPTEuNDgtMQoKICAgICAgICAgICAgTG9nOgogICAgICAg ICAgICBQYXRjaDogRml4IHVuaXR0ZXN0IGZvciBib2RoaSBiYXNlZCBvbiBpdHMgdmVyc2lvbgoK U2lnbmVkLW9mZi1ieTogT25kxZllaiBOb3NlayA8b25vc2VrQHJlZGhhdC5jb20+CgotLS0KZGlm ZiAtLWdpdCBhLzAwMDEtZmVkcGtnLXJlcXVlc3QtdXNlLXBkYy1hY3RpdmUtcmVsZWFzZXMucGF0 Y2ggYi8wMDAxLWZlZHBrZy1yZXF1ZXN0LXVzZS1wZGMtYWN0aXZlLXJlbGVhc2VzLnBhdGNoCmRl bGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAzOWI2ZWZiLi4wMDAwMDAwCi0tLSBhLzAwMDEt ZmVkcGtnLXJlcXVlc3QtdXNlLXBkYy1hY3RpdmUtcmVsZWFzZXMucGF0Y2gKKysrIC9kZXYvbnVs bApAQCAtMSwxODkgKzAsMCBAQAotRnJvbSAwMGFlZDUyOWNmMjI3OTZmZGFlMGQyM2Y4NDQyMjFk ZjY0MGNjN2MyIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQotRnJvbTogbXByYWhsIDxtcHJhaGxA cmVkaGF0LmNvbT4KLURhdGU6IEZlYiAyMyAyMDE4IDAzOjAxOjM1ICswMDAwCi1TdWJqZWN0OiBV c2UgUERDIGluc3RlYWQgb2YgQm9kaGkgdG8gZ2V0IHRoZSBhY3RpdmUgcmVsZWFzZSBicmFuY2hl cwotCi0KLUZpeGVzICMxODcKLQotU2lnbmVkLW9mZi1ieTogbXByYWhsIDxtcHJhaGxAcmVkaGF0 LmNvbT4KLQotLS0tCi0KLWRpZmYgLS1naXQgYS9mZWRwa2cvY2xpLnB5IGIvZmVkcGtnL2NsaS5w eQotaW5kZXggYTIwM2I5MS4uZThmZjZiZSAxMDA2NDQKLS0tLSBhL2ZlZHBrZy9jbGkucHkKLSsr KyBiL2ZlZHBrZy9jbGkucHkKLUBAIC00NjIsNyArNDYyLDcgQEAgc3VnZ2VzdF9yZWJvb3Q9RmFs c2UKLSAgICAgICAgICAgICAgICAgcmFpc2UgcnBrZ0Vycm9yKCdZb3UgbXVzdCBzcGVjaWZ5IGEg YnJhbmNoIGlmIHlvdSBhcmUgbm90IGluICcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdhIGdpdCByZXBvc2l0b3J5JykKLSAKLS0gICAgICAgIGJvZGhpX3VybCA9IGNvbmZpZy5n ZXQoJ3swfS5ib2RoaScuZm9ybWF0KG5hbWUpLCAndXJsJykKLSsgICAgICAgIHBkY191cmwgPSBj b25maWcuZ2V0KCd7MH0ucGRjJy5mb3JtYXQobmFtZSksICd1cmwnKQotICAgICAgICAgaWYgYnJh bmNoOgotICAgICAgICAgICAgIGlmIGlzX2VwZWwoYnJhbmNoKToKLSAgICAgICAgICAgICAgICAg YXNzZXJ0X3ZhbGlkX2VwZWxfcGFja2FnZShtb2R1bGVfbmFtZSwgYnJhbmNoKQotQEAgLTQ3NCw3 ICs0NzQsNyBAQCBzdWdnZXN0X3JlYm9vdD1GYWxzZQotICAgICAgICAgICAgICAgICAgICAgICAg ICdPbmx5IGNoYXJhY3RlcnMsIG51bWJlcnMsIHBlcmlvZHMsIGRhc2hlcywgJwotICAgICAgICAg ICAgICAgICAgICAgICAgICd1bmRlcnNjb3JlcywgYW5kIHBsdXNlcyBhcmUgYWxsb3dlZCBpbiBt b2R1bGUgYnJhbmNoICcKLSAgICAgICAgICAgICAgICAgICAgICAgICAnbmFtZXMnKQotLSAgICAg ICAgICAgIHJlbGVhc2VfYnJhbmNoZXMgPSBnZXRfcmVsZWFzZV9icmFuY2hlcyhib2RoaV91cmwp Ci0rICAgICAgICAgICAgcmVsZWFzZV9icmFuY2hlcyA9IGdldF9yZWxlYXNlX2JyYW5jaGVzKHBk Y191cmwpCi0gICAgICAgICAgICAgaWYgYnJhbmNoIGluIHJlbGVhc2VfYnJhbmNoZXM6Ci0gICAg ICAgICAgICAgICAgIGlmIHNlcnZpY2VfbGV2ZWxzOgotICAgICAgICAgICAgICAgICAgICAgcmFp c2UgcnBrZ0Vycm9yKAotQEAgLTQ4OSwxNCArNDg5LDEzIEBAIHN1Z2dlc3RfcmVib290PUZhbHNl Ci0gCi0gICAgICAgICAjIElmIHNlcnZpY2UgbGV2ZWxzIHdlcmUgcHJvdmlkZWQsIHZlcmlmeSB0 aGVtCi0gICAgICAgICBpZiBzZXJ2aWNlX2xldmVsczoKLS0gICAgICAgICAgICBwZGNfdXJsID0g Y29uZmlnLmdldCgnezB9LnBkYycuZm9ybWF0KG5hbWUpLCAndXJsJykKLSAgICAgICAgICAgICBz bF9kaWN0ID0gc2xfbGlzdF90b19kaWN0KHNlcnZpY2VfbGV2ZWxzKQotICAgICAgICAgICAgIHZl cmlmeV9zbHMocGRjX3VybCwgc2xfZGljdCkKLSAKLSAgICAgICAgIHBhZ3VyZV91cmwgPSBjb25m aWcuZ2V0KCd7MH0ucGFndXJlJy5mb3JtYXQobmFtZSksICd1cmwnKQotICAgICAgICAgcGFndXJl X3Rva2VuID0gZ2V0X3BhZ3VyZV90b2tlbihjb25maWcsIG5hbWUpCi0gICAgICAgICBpZiBhbGxf cmVsZWFzZXM6Ci0tICAgICAgICAgICAgcmVsZWFzZV9icmFuY2hlcyA9IGdldF9yZWxlYXNlX2Jy YW5jaGVzKGJvZGhpX3VybCkKLSsgICAgICAgICAgICByZWxlYXNlX2JyYW5jaGVzID0gZ2V0X3Jl bGVhc2VfYnJhbmNoZXMocGRjX3VybCkKLSAgICAgICAgICAgICBicmFuY2hlcyA9IFtiIGZvciBi IGluIHJlbGVhc2VfYnJhbmNoZXMKLSAgICAgICAgICAgICAgICAgICAgICAgICBpZiByZS5tYXRj aChyJ14oZlxkKykkJywgYildCi0gICAgICAgICBlbHNlOgotZGlmZiAtLWdpdCBhL2ZlZHBrZy91 dGlscy5weSBiL2ZlZHBrZy91dGlscy5weQotaW5kZXggZDI0MTMwOC4uYjNkNzA0YyAxMDA2NDQK LS0tLSBhL2ZlZHBrZy91dGlscy5weQotKysrIGIvZmVkcGtnL3V0aWxzLnB5Ci1AQCAtMTgsNyAr MTgsNiBAQCBmcm9tIHNpeC5tb3Zlcy51cmxsaWIucGFyc2UgaW1wb3J0IHVybGVuY29kZQotIGZy b20gc2l4Lm1vdmVzLmNvbmZpZ3BhcnNlciBpbXBvcnQgTm9TZWN0aW9uRXJyb3IsIE5vT3B0aW9u RXJyb3IKLSBpbXBvcnQgcmVxdWVzdHMKLSBmcm9tIHJlcXVlc3RzLmV4Y2VwdGlvbnMgaW1wb3J0 IENvbm5lY3Rpb25FcnJvcgotLWZyb20gZmVkb3JhLmNsaWVudC5ib2RoaSBpbXBvcnQgQm9kaGky Q2xpZW50Ci0gZnJvbSBweXJwa2cgaW1wb3J0IHJwa2dFcnJvcgotIAotIAotQEAgLTk3LDI2ICs5 Niw1NSBAQCBkZWYgbmV3X3BhZ3VyZV9pc3N1ZSh1cmwsIHRva2VuLCB0aXRsZSwgYm9keSk6Ci0g ICAgICAgICB1cmwucnN0cmlwKCcvJyksIHJ2Lmpzb24oKVsnaXNzdWUnXVsnaWQnXSkKLSAKLSAK LS1kZWYgZ2V0X3JlbGVhc2VfYnJhbmNoZXMoYm9kaGlfdXJsKToKLStkZWYgZ2V0X3JlbGVhc2Vf YnJhbmNoZXModXJsKToKLSAgICAgIiIiCi0tICAgIEdldCB0aGUgYWN0aXZlIEZlZG9yYSByZWxl YXNlIGJyYW5jaGVzIGZyb20gQm9kaGkKLS0gICAgOnBhcmFtIGJvZGhpX3VybDogYSBzdHJpbmcg b2YgdGhlIFVSTCB0byBCb2RoaQotKyAgICBHZXQgdGhlIGFjdGl2ZSBGZWRvcmEgcmVsZWFzZSBi cmFuY2hlcyBmcm9tIFBEQwotKyAgICA6cGFyYW0gdXJsOiBhIHN0cmluZyBvZiB0aGUgVVJMIHRv IFBEQwotICAgICA6cmV0dXJuOiBhIHNldCBjb250YWluaW5nIHRoZSBhY3RpdmUgRmVkb3JhIHJl bGVhc2UgYnJhbmNoZXMKLSAgICAgIiIiCi0tICAgIGJvZGhpID0gQm9kaGkyQ2xpZW50KGJvZGhp X3VybCkKLSAgICAgYnJhbmNoZXMgPSBzZXQoKQotLSAgICBwYWdlID0gMQotKyAgICBhcGlfdXJs ID0gJ3swfS9yZXN0X2FwaS92MS9wcm9kdWN0LXZlcnNpb25zLycuZm9ybWF0KHVybC5yc3RyaXAo Jy8nKSkKLSsgICAgcXVlcnlfYXJncyA9IHsKLSsgICAgICAgICdmaWVsZHMnOiBbJ3Nob3J0Jywg J3ZlcnNpb24nXSwKLSsgICAgICAgICdhY3RpdmUnOiBUcnVlCi0rICAgIH0KLSAgICAgd2hpbGUg VHJ1ZToKLS0gICAgICAgIHJ2ID0gYm9kaGkuc2VuZF9yZXF1ZXN0KCdyZWxlYXNlcycsIGF1dGg9 RmFsc2UsIHBhcmFtcz17J3BhZ2UnOiBwYWdlfSkKLS0gICAgICAgIGZvciByZWxlYXNlIGluIHJ2 WydyZWxlYXNlcyddOgotLSAgICAgICAgICAgIGlmIHJlbGVhc2VbJ3N0YXRlJ10gPT0gJ2N1cnJl bnQnOgotLSAgICAgICAgICAgICAgICBicmFuY2hlcy5hZGQocmVsZWFzZVsnYnJhbmNoJ10pCi0t ICAgICAgICBpZiBwYWdlIDwgcnZbJ3BhZ2VzJ106Ci0tICAgICAgICAgICAgcGFnZSArPSAxCi0t ICAgICAgICBlbHNlOgotLSAgICAgICAgICAgIGJyZWFrCi0rICAgICAgICB0cnk6Ci0rICAgICAg ICAgICAgcnYgPSByZXF1ZXN0cy5nZXQoYXBpX3VybCwgcGFyYW1zPXF1ZXJ5X2FyZ3MsIHRpbWVv dXQ9NjApCi0rICAgICAgICBleGNlcHQgQ29ubmVjdGlvbkVycm9yIGFzIGVycm9yOgotKyAgICAg ICAgICAgIGVycm9yX21zZyA9ICgnVGhlIGNvbm5lY3Rpb24gdG8gUERDIGZhaWxlZCB3aGlsZSB0 cnlpbmcgdG8gZ2V0ICcKLSsgICAgICAgICAgICAgICAgICAgICAgICAgJ3RoZSBhY3RpdmUgcmVs ZWFzZSBicmFuY2hlcy4gVGhlIGVycm9yIHdhczogezB9JwotKyAgICAgICAgICAgICAgICAgICAg ICAgICAuZm9ybWF0KHN0cihlcnJvcikpKQotKyAgICAgICAgICAgIHJhaXNlIHJwa2dFcnJvcihl cnJvcl9tc2cpCi0gCi0tICAgIHJldHVybiBicmFuY2hlcwotKyAgICAgICAgaWYgbm90IHJ2Lm9r OgotKyAgICAgICAgICAgIGJhc2VfZXJyb3JfbXNnID0gKCdUaGUgZm9sbG93aW5nIGVycm9yIG9j Y3VycmVkIHdoaWxlIHRyeWluZyB0byAnCi0rICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J2dldCB0aGUgYWN0aXZlIHJlbGVhc2UgYnJhbmNoZXMgaW4gUERDOiB7MH0nKQotKyAgICAgICAg ICAgIHJhaXNlIHJwa2dFcnJvcihiYXNlX2Vycm9yX21zZy5mb3JtYXQocnYudGV4dCkpCi0rCi0r ICAgICAgICBydl9qc29uID0gcnYuanNvbigpCi0rICAgICAgICBmb3IgcHJvZHVjdF92ZXJzaW9u IGluIHJ2X2pzb25bJ3Jlc3VsdHMnXToKLSsgICAgICAgICAgICAjIElmIHRoZSB2ZXJzaW9uIGlz IG5vdCBhIGRpZ2l0IHdlIGNhbiBpZ25vcmUgaXQgKGUuZy4gcmF3aGlkZSkKLSsgICAgICAgICAg ICBpZiBub3QgcHJvZHVjdF92ZXJzaW9uWyd2ZXJzaW9uJ10uaXNkaWdpdCgpOgotKyAgICAgICAg ICAgICAgICBjb250aW51ZQotKwotKyAgICAgICAgICAgIGlmIHByb2R1Y3RfdmVyc2lvblsnc2hv cnQnXSA9PSAnZXBlbCc6Ci0rICAgICAgICAgICAgICAgIHByZWZpeCA9ICdlcGVsJwotKyAgICAg ICAgICAgICAgICBpZiBwcm9kdWN0X3ZlcnNpb25bJ3ZlcnNpb24nXSA9PSAnNic6Ci0rICAgICAg ICAgICAgICAgICAgICBwcmVmaXggPSAnZWwnCi0rICAgICAgICAgICAgICAgIGJyYW5jaGVzLmFk ZCgnezB9ezF9Jy5mb3JtYXQoCi0rICAgICAgICAgICAgICAgICAgICBwcmVmaXgsIHByb2R1Y3Rf dmVyc2lvblsndmVyc2lvbiddKSkKLSsgICAgICAgICAgICBlbGlmIHByb2R1Y3RfdmVyc2lvblsn c2hvcnQnXSA9PSAnZmVkb3JhJzoKLSsgICAgICAgICAgICAgICAgYnJhbmNoZXMuYWRkKCdmezB9 Jy5mb3JtYXQocHJvZHVjdF92ZXJzaW9uWyd2ZXJzaW9uJ10pKQotKwotKyAgICAgICAgaWYgcnZf anNvblsnbmV4dCddOgotKyAgICAgICAgICAgICMgQ2xlYXIgdGhlIHF1ZXJ5X2FyZ3MgYmVjYXVz ZSB0aGV5IGFyZSBiYWtlZCBpbnRvIHRoZSAibmV4dCIgVVJMCi0rICAgICAgICAgICAgcXVlcnlf YXJncyA9IHt9Ci0rICAgICAgICAgICAgYXBpX3VybCA9IHJ2X2pzb25bJ25leHQnXQotKyAgICAg ICAgZWxzZToKLSsgICAgICAgICAgICAjIFdlJ3ZlIGdvbmUgdGhyb3VnaCBldmVyeSBwYWdlLCBz byB3ZSBjYW4gcmV0dXJuIHRoZSBmb3VuZAotKyAgICAgICAgICAgICMgYnJhbmNoZXMKLSsgICAg ICAgICAgICByZXR1cm4gYnJhbmNoZXMKLSAKLSAKLSBkZWYgc2xfbGlzdF90b19kaWN0KHNscyk6 Ci1kaWZmIC0tZ2l0IGEvdGVzdC90ZXN0X3V0aWxzLnB5IGIvdGVzdC90ZXN0X3V0aWxzLnB5Ci1p bmRleCBjZmYyMmJkLi43Y2EzOTVmIDEwMDY0NAotLS0tIGEvdGVzdC90ZXN0X3V0aWxzLnB5Ci0r KysgYi90ZXN0L3Rlc3RfdXRpbHMucHkKLUBAIC0xMTUsMjkgKzExNSwyOSBAQCBjbGFzcyBUZXN0 VXRpbHMoQ2xpVGVzdENhc2UpOgotICAgICAgICAgICAgICAgICBhc3NlcnQgc3RyKGUpID09ICgn VGhlIFNMICJ7MH0iIG11c3QgZXhwaXJlIG9uIEp1bmUgMXN0IG9yICcKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ0RlY2VtYmVyIDFzdCcuZm9ybWF0KGVvbCkpCi0gCi0tICAg IEBwYXRjaCgnZmVkcGtnLnV0aWxzLkJvZGhpMkNsaWVudCcpCi0tICAgIGRlZiB0ZXN0X2dldF9y ZWxlYXNlX2JyYW5jaGVzKHNlbGYsIG1vY2tfYm9kaGkpOgotKyAgICBAcGF0Y2goJ3JlcXVlc3Rz LmdldCcpCi0rICAgIGRlZiB0ZXN0X2dldF9yZWxlYXNlX2JyYW5jaGVzKHNlbGYsIG1vY2tfcmVx dWVzdF9nZXQpOgotICAgICAgICAgIiIiVGVzdCB0aGF0IGdldF9yZWxlYXNlX2JyYW5jaGVzIHJl dHVybnMgYWxsIHRoZSBhY3RpdmUgRmVkb3JhIHJlbGVhc2UKLSAgICAgICAgIGJyYW5jaGVzLgot ICAgICAgICAgIiIiCi0tICAgICAgICBtb2NrX2JvZGhpX2NsaWVudCA9IE1vY2soKQotLSAgICAg ICAgbW9ja19ib2RoaV9jbGllbnQuc2VuZF9yZXF1ZXN0LnJldHVybl92YWx1ZSA9IHsKLS0gICAg ICAgICAgICB1J3BhZ2UnOiAxLAotLSAgICAgICAgICAgIHUncGFnZXMnOiAxLAotLSAgICAgICAg ICAgIHUncmVsZWFzZXMnOiBbCi0tICAgICAgICAgICAgICAgIHsnc3RhdGUnOiAnY3VycmVudCcs ICdicmFuY2gnOiAnZWw2J30sCi0tICAgICAgICAgICAgICAgIHsnc3RhdGUnOiAnYXJjaGl2ZWQn LCAnYnJhbmNoJzogJ2YyNCd9LAotLSAgICAgICAgICAgICAgICB7J3N0YXRlJzogJ2N1cnJlbnQn LCAnYnJhbmNoJzogJ2VwZWw3J30sCi0tICAgICAgICAgICAgICAgIHsnc3RhdGUnOiAnY3VycmVu dCcsICdicmFuY2gnOiAnZjI1J30sCi0tICAgICAgICAgICAgICAgIHsnc3RhdGUnOiAnYXJjaGl2 ZWQnLCAnYnJhbmNoJzogJ2VsNSd9LAotLSAgICAgICAgICAgICAgICB7J3N0YXRlJzogJ2FyY2hp dmVkJywgJ2JyYW5jaCc6ICdmMjMnfSwKLS0gICAgICAgICAgICAgICAgeydzdGF0ZSc6ICdjdXJy ZW50JywgJ2JyYW5jaCc6ICdmMjYnfSwKLS0gICAgICAgICAgICAgICAgeydzdGF0ZSc6ICdwZW5k aW5nJywgJ2JyYW5jaCc6ICdmMjdtJ30sCi0tICAgICAgICAgICAgICAgIHsnc3RhdGUnOiAnY3Vy cmVudCcsICdicmFuY2gnOiAnZjI3J30KLS0gICAgICAgICAgICBdLAotLSAgICAgICAgICAgIHUn cm93c19wZXJfcGFnZSc6IDIwLAotLSAgICAgICAgICAgIHUndG90YWwnOiAxMX0KLS0gICAgICAg IG1vY2tfYm9kaGkucmV0dXJuX3ZhbHVlID0gbW9ja19ib2RoaV9jbGllbnQKLS0gICAgICAgIGV4 cGVjdGVkID0gc2V0KFsnZWw2JywgJ2VwZWw3JywgJ2YyNScsICdmMjYnLCAnZjI3J10pCi0tICAg ICAgICBhY3R1YWwgPSB1dGlscy5nZXRfcmVsZWFzZV9icmFuY2hlcygnaHR0cDovL2JvZGhpLmxv Y2FsJykKLSsgICAgICAgIG1vY2tfcnYgPSBNb2NrKCkKLSsgICAgICAgIG1vY2tfcnYub2sgPSBU cnVlCi0rICAgICAgICAjIFRoaXMgYWJicmV2aWF0ZWQgZGF0YSByZXR1cm5lZCBmcm9tIHRoZSBw cm9kdWN0LXZlcnNpb25zIFBEQyBBUEkKLSsgICAgICAgIG1vY2tfcnYuanNvbi5yZXR1cm5fdmFs dWUgPSB7Ci0rICAgICAgICAgICAgJ2NvdW50JzogNywKLSsgICAgICAgICAgICAnbmV4dCc6IE5v bmUsCi0rICAgICAgICAgICAgJ3ByZXZpb3VzJzogTm9uZSwKLSsgICAgICAgICAgICAncmVzdWx0 cyc6IFsKLSsgICAgICAgICAgICAgICAgeydzaG9ydCc6ICdlcGVsJywgJ3ZlcnNpb24nOiAnNid9 LAotKyAgICAgICAgICAgICAgICB7J3Nob3J0JzogJ2VwZWwnLCAndmVyc2lvbic6ICc3J30sCi0r ICAgICAgICAgICAgICAgIHsnc2hvcnQnOiAnZmVkb3JhJywgJ3ZlcnNpb24nOiAnMjUnfSwKLSsg ICAgICAgICAgICAgICAgeydzaG9ydCc6ICdmZWRvcmEnLCAndmVyc2lvbic6ICcyNid9LAotKyAg ICAgICAgICAgICAgICB7J3Nob3J0JzogJ2ZlZG9yYScsICd2ZXJzaW9uJzogJzI3J30sCi0rICAg ICAgICAgICAgICAgIHsnc2hvcnQnOiAnZmVkb3JhJywgJ3ZlcnNpb24nOiAnMjgnfSwKLSsgICAg ICAgICAgICAgICAgeydzaG9ydCc6ICdmZWRvcmEnLCAndmVyc2lvbic6ICdyYXdoaWRlJ30KLSsg ICAgICAgICAgICBdCi0rICAgICAgICB9Ci0rICAgICAgICBtb2NrX3JlcXVlc3RfZ2V0LnJldHVy bl92YWx1ZSA9IG1vY2tfcnYKLSsgICAgICAgIGV4cGVjdGVkID0gc2V0KFsnZWw2JywgJ2VwZWw3 JywgJ2YyNScsICdmMjYnLCAnZjI3JywgJ2YyOCddKQotKyAgICAgICAgYWN0dWFsID0gdXRpbHMu Z2V0X3JlbGVhc2VfYnJhbmNoZXMoJ2h0dHA6Ly9wZGMubG9jYWwnKQotICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChleHBlY3RlZCwgYWN0dWFsKQotCgpkaWZmIC0tZ2l0IGEvMDAxMS1GaXgtdW5p dHRlc3QtZm9yLWJvZGhpLWJhc2VkLW9uLWl0cy12ZXJzaW9uLnBhdGNoIGIvMDAxMS1GaXgtdW5p dHRlc3QtZm9yLWJvZGhpLWJhc2VkLW9uLWl0cy12ZXJzaW9uLnBhdGNoCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNjMzZlODIKLS0tIC9kZXYvbnVsbAorKysgYi8wMDExLUZp eC11bml0dGVzdC1mb3ItYm9kaGktYmFzZWQtb24taXRzLXZlcnNpb24ucGF0Y2gKQEAgLTAsMCAr MSw0MyBAQAorRnJvbSBlMzMwODdjNzhjMjBhYTQ2NzY4MzI4MTgxOTczYmZjZjZhNWM4ZDRlIE1v biBTZXAgMTcgMDA6MDA6MDAgMjAwMQorRnJvbTogT25kcmVqIE5vc2VrIDxvbm9zZWtAcmVkaGF0 LmNvbT4KK0RhdGU6IE1vbiwgMTggTWF5IDIwMjAgMTQ6MTc6MTkgKzAyMDAKK1N1YmplY3Q6IFtQ QVRDSF0gRml4IHVuaXR0ZXN0IGZvciBib2RoaSBiYXNlZCBvbiBpdHMgdmVyc2lvbgorCitTaWdu ZWQtb2ZmLWJ5OiBPbmRyZWogTm9zZWsgPG9ub3Nla0ByZWRoYXQuY29tPgorLS0tCisgdGVzdC90 ZXN0X2NsaS5weSB8IDEyICsrKysrKysrKysrKworIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRp b25zKCspCisKK2RpZmYgLS1naXQgYS90ZXN0L3Rlc3RfY2xpLnB5IGIvdGVzdC90ZXN0X2NsaS5w eQoraW5kZXggMDM3NmRlZC4uMTI1ODgxMCAxMDA2NDQKKy0tLSBhL3Rlc3QvdGVzdF9jbGkucHkK KysrKyBiL3Rlc3QvdGVzdF9jbGkucHkKK0BAIC0xMjgsNiArMTI4LDE2IEBAIGNsYXNzIFRlc3RV cGRhdGUoQ2xpVGVzdENhc2UpOgorICAgICAgICAgd2l0aCBpby5vcGVuKGNsb2dfZmlsZSwgJ3cn LCBlbmNvZGluZz0ndXRmLTgnKSBhcyBmOgorICAgICAgICAgICAgIGYud3JpdGUob3MubGluZXNl cC5qb2luKHNlbGYuZmFrZV9jbG9nKSkKKyAKKysgICAgICAgICMgR2V0ICdib2RoaV9jbGllbnQn IHZlcnNpb24uIFBhcnRpY3VsYXIgdmVyc2lvbnMgaGF2ZSBkaWZmZXJlbmNlcworKyAgICAgICAg IyBhY3Jvc3MgZGlzdHJpYnV0aW9ucy4KKysgICAgICAgIHNlbGYuYm9kaGlfdmVyc2lvbiA9IE5v bmUKKysgICAgICAgIHRyeToKKysgICAgICAgICAgICB2ZXJzaW9uX29iamVjdCA9IHBrZ19yZXNv dXJjZXMuZ2V0X2Rpc3RyaWJ1dGlvbignYm9kaGlfY2xpZW50JykKKysgICAgICAgICAgICBpZiB2 ZXJzaW9uX29iamVjdC5oYXNfdmVyc2lvbigpOgorKyAgICAgICAgICAgICAgICBzZWxmLmJvZGhp X3ZlcnNpb24gPSBpbnQodmVyc2lvbl9vYmplY3QudmVyc2lvbi5zcGxpdCgnLicpWzBdKQorKyAg ICAgICAgZXhjZXB0IHBrZ19yZXNvdXJjZXMuRGlzdHJpYnV0aW9uTm90Rm91bmQ6CisrICAgICAg ICAgICAgcGFzcworKworICAgICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgICBpZiBvcy5w YXRoLmV4aXN0cygnYm9kaGkudGVtcGxhdGUnKToKKyAgICAgICAgICAgICBvcy51bmxpbmsoJ2Jv ZGhpLnRlbXBsYXRlJykKK0BAIC0xOTUsNiArMjA1LDggQEAgY2xhc3MgVGVzdFVwZGF0ZShDbGlU ZXN0Q2FzZSk6CisgICAgICAgICAgICAgZXhwZWN0ZWRfZGF0YVsnbm90ZXMnXSA9IG5vdGVzCisg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgIGV4cGVjdGVkX2RhdGFbJ25vdGVzJ10gPSBzZWxm LmZha2VfY2xvZ1swXQorKyAgICAgICAgaWYgc2VsZi5ib2RoaV92ZXJzaW9uIDw9IDQ6CisrICAg ICAgICAgICAgZGVsIGV4cGVjdGVkX2RhdGFbImRpc3BsYXlfbmFtZSJdCisgCisgICAgICAgICB3 aXRoIHBhdGNoKCdvcy51bmxpbmsnKSBhcyB1bmxpbms6CisgICAgICAgICAgICAgY2xpLnVwZGF0 ZSgpCistLSAKKzIuMjEuMworCgpkaWZmIC0tZ2l0IGEvZmVkcGtnLnNwZWMgYi9mZWRwa2cuc3Bl YwppbmRleCA2Y2Y0MmQ5Li45MTU0ZGM3IDEwMDY0NAotLS0gYS9mZWRwa2cuc3BlYworKysgYi9m ZWRwa2cuc3BlYwpAQCAtNSw3ICs1LDcgQEAKIAogTmFtZTogICAgICAgICAgIGZlZHBrZwogVmVy c2lvbjogICAgICAgIDEuMzgKLVJlbGVhc2U6ICAgICAgICAzJXs/ZGlzdH0KK1JlbGVhc2U6ICAg ICAgICA0JXs/ZGlzdH0KIFN1bW1hcnk6ICAgICAgICBGZWRvcmEgdXRpbGl0eSBmb3Igd29ya2lu ZyB3aXRoIGRpc3QtZ2l0CiAKIExpY2Vuc2U6ICAgICAgICBHUEx2MisKQEAgLTE4LDYgKzE4LDcg QEAgUGF0Y2gyOiAgICAgICAgIDAwMDctTW92ZS1ycG0tZGVwZW5kZW5jeS1mb3ItdGVzdC1lbnZp cm9ubWVudC1vbmx5LnBhdGNoCiBQYXRjaDM6ICAgICAgICAgMDAwOC1SZXBhaXItdGVzdC1vZi1y ZXRpcmUtY29tbWFuZC1hZnRlci1ycGtnLXVwZGF0ZS5wYXRjaAogUGF0Y2g0OiAgICAgICAgIDAw MDktQm9keS1jaGFuZ2VzLWZvci1yZXF1ZXN0aW5nLW5ldy10ZXN0LXJlcG8ucGF0Y2gKIFBhdGNo NTogICAgICAgICAwMDEwLUNoZWNrLW1pc3NpbmctY29uZmlnLW9wdGlvbnMtbW9yZS1yZWxpYWJs eS5wYXRjaAorUGF0Y2g2OiAgICAgICAgIDAwMTEtRml4LXVuaXR0ZXN0LWZvci1ib2RoaS1iYXNl ZC1vbi1pdHMtdmVyc2lvbi5wYXRjaAogCiAjIGZlZHBrZyBjb21tYW5kIHN3aXRjaGVkIHRvIHB5 dGhvbjMgb24gRmVkb3JhIDI5IGFuZCBSSEVMID4gNzoKICVpZiAwJXs/ZmVkb3JhfSB8fCAwJXs/ cmhlbH0gPiA3CkBAIC00MCw3ICs0MSw3IEBAIFJlcXVpcmVzOiAgICAgICByZWRoYXQtcnBtLWNv bmZpZwogCiBCdWlsZFJlcXVpcmVzOiAgcHl0aG9uMi1kZXZlbAogIyBXZSBiciB0aGVzZSB0aGlu Z3MgZm9yIG1hbiBwYWdlIGdlbmVyYXRpb24gZHVlIHRvIGltcG9ydHMKLUJ1aWxkUmVxdWlyZXM6 ICBweXRob24yLXJwa2cgPj0gMS41OS01CitCdWlsZFJlcXVpcmVzOiAgcHl0aG9uMi1ycGtnID49 IDEuNjAtMQogQnVpbGRSZXF1aXJlczogIHB5dGhvbjItZGlzdHJvCiAjIFRoaXMgdW50aWwgZmVk b3JhLWNlcnQgZ2V0cyBmaXhlZAogQnVpbGRSZXF1aXJlczogIHB5dGhvbjItZmVkb3JhCkBAIC03 Myw3ICs3NCw3IEBAIEJ1aWxkUmVxdWlyZXM6ICBweXRob24yLWJ1Z3ppbGxhCiBSZXF1aXJlczog ICAgICAgcHl0aG9uMi1idWd6aWxsYQogJWVuZGlmCiAKLVJlcXVpcmVzOiAgICAgICBweXRob24y LXJwa2cgPj0gMS41OS01CitSZXF1aXJlczogICAgICAgcHl0aG9uMi1ycGtnID49IDEuNjAtMQog UmVxdWlyZXM6ICAgICAgIHB5dGhvbjItZGlzdHJvCiBSZXF1aXJlczogICAgICAgcHl0aG9uMi1m ZWRvcmEKIFJlcXVpcmVzOiAgICAgICBweXRob24yLW9wZW5pZGMtY2xpZW50ID49IDAuNi4wCkBA IC04NCw3ICs4NSw3IEBAIFJlcXVpcmVzOiAgICAgICBweXRob24yLW9wZW5pZGMtY2xpZW50ID49 IDAuNi4wCiAlZ2xvYmFsIF9fcHl0aG9uICV7X19weXRob24zfQogCiBCdWlsZFJlcXVpcmVzOiAg cHl0aG9uMy1kZXZlbAotQnVpbGRSZXF1aXJlczogIHB5dGhvbjMtcnBrZyA+PSAxLjU5LTUKK0J1 aWxkUmVxdWlyZXM6ICBweXRob24zLXJwa2cgPj0gMS42MC0xCiBCdWlsZFJlcXVpcmVzOiAgcHl0 aG9uMy1kaXN0cm8KICMgVGhpcyB1bnRpbCBmZWRvcmEtY2VydCBnZXRzIGZpeGVkCiBCdWlsZFJl cXVpcmVzOiAgcHl0aG9uMy1mZWRvcmEKQEAgLTk4LDcgKzk5LDcgQEAgQnVpbGRSZXF1aXJlczog IHB5dGhvbjMtYm9kaGktY2xpZW50CiAKIAogUmVxdWlyZXM6ICAgICAgIHB5dGhvbjMtYnVnemls bGEKLVJlcXVpcmVzOiAgICAgICBweXRob24zLXJwa2cgPj0gMS41OS01CitSZXF1aXJlczogICAg ICAgcHl0aG9uMy1ycGtnID49IDEuNjAtMQogUmVxdWlyZXM6ICAgICAgIHB5dGhvbjMtZGlzdHJv CiBSZXF1aXJlczogICAgICAgcHl0aG9uMy1mZWRvcmEKIFJlcXVpcmVzOiAgICAgICBweXRob24z LW9wZW5pZGMtY2xpZW50ID49IDAuNi4wCkBAIC0xNjgsNiArMTY5LDkgQEAgbm9zZXRlc3RzCiAK IAogJWNoYW5nZWxvZworKiBNb24gTWF5IDE4IDIwMjAgT25kxZllaiBOb3NlayA8b25vc2VrQHJl ZGhhdC5jb20+IC0gMS4zOC00CistIFBhdGNoOiBGaXggdW5pdHRlc3QgZm9yIGJvZGhpIGJhc2Vk IG9uIGl0cyB2ZXJzaW9uCisKICogTW9uIE1hciAzMCAyMDIwIE9uZMWZZWogTm9zZWsgPG9ub3Nl a0ByZWRoYXQuY29tPiAtIDEuMzgtMwogICBQYXRjaGVzOgogICAtIFJlcGFpciB0ZXN0IG9mICJy ZXRpcmUiIGNvbW1hbmQgYWZ0ZXIgcnBrZyB1cGRhdGUK