15473 2024-04-25 14:42:21 +0000 Source MIRROR not work for svn when change the host 2026-03-05 16:11:58 +0000 1 1 7 Build System, Metadata & Runtime BitBake bitbake 2.0.3 x86 Multiple RESOLVED FIXED Medium+ major 6.0 M1 1 kari.sivonen richard.purdie kari.sivonen poky.bs.watcher poky.watcher randy.macleod --- --- Don't know oldest_to_newest 98916 0 kari.sivonen 2024-04-25 14:42:21 +0000 When I try to use (PRE)MIRROR for svn SCR_URI it not change only server name, but add tar ball name to mirror URI too. I find out that there is no test for svn mirrors so I created one. I think it is easiest way to explain what is wrong. I tied to use authentic svn repo path. Here what I add to tests git diff diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 85c1f79f..66c93282 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -511,7 +511,8 @@ class MirrorUriTest(FetcherTest): mirrorvar = "http://.*/.* file:///somepath/downloads/ " \ "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \ "https://.*/.* file:///someotherpath/downloads/ " \ - "http://.*/.* file:///someotherpath/downloads/" + "http://.*/.* file:///someotherpath/downloads/ " \ + "svn://svn.server1.com/ svn://svn.server2.com/" def test_urireplace(self): self.d.setVar("FILESPATH", ".") @@ -535,6 +536,13 @@ class MirrorUriTest(FetcherTest): uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) self.assertEqual(uris, ['file:///someotherpath/downloads/bitbake-1.0.tar.gz']) + def test_urilistsvn(self): + # Catch svn:// -> svn:// bug + fetcher = bb.fetch.FetchData("svn://svn.server1.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2", self.d) + mirrors = bb.fetch2.mirror_from_string(self.mirrorvar) + uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) + self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2']) + def test_mirror_of_mirror(self): # Test if mirror of a mirror works mirrorvar = self.mirrorvar + " http://.*/.* http://otherdownloads.yoctoproject.org/downloads/" in short this should change from svn url svn.server1.com to svn-server2.com, but that is not what happens. Here what happens: bin/bitbake-selftest -c bb.tests.fetch.MirrorUriTest ....F. ====================================================================== FAIL: test_urilistsvn (bb.tests.fetch.MirrorUriTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/ephemeral/karisivo/meta-ps-rel/bitbake/lib/bb/tests/fetch.py", line 544, in test_urilistsvn self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2']) AssertionError: Lists differ: ['svn[44 chars]tags/path_in_tagnamefolder_svn.server1.com_.is[93 chars]v=2'] != ['svn[44 chars]tags/tagname;module=path_in_tagnamefolder;prot[13 chars]v=2'] First differing element 0: 'svn:[43 chars]tags/path_in_tagnamefolder_svn.server1.com_.is[92 chars]ev=2' 'svn:[43 chars]tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2' - ['svn://svn.server2.com/isource/svnroot/reponame/tags/path_in_tagnamefolder_svn.server1.com_.isource.svnroot.reponame.tags.tagname_2_1.tar.gz;module=path_in_tagnamefolder;protocol=https;rev=2'] + ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2'] ---------------------------------------------------------------------- Ran 6 tests in 0.078s FAILED (failures=1) I have already a fix for this. I debug this to lib/bb/fetch2/__init__.py line 473. elif ud.localpath and ud.method.supports_checksum(ud): basename = os.path.basename(ud.localpath) This check is true and cause this wrong name in path. This can be fixed by this change: git diff diff --git a/lib/bb/fetch2/svn.py b/lib/bb/fetch2/svn.py index d40e4d29..0852108e 100644 --- a/lib/bb/fetch2/svn.py +++ b/lib/bb/fetch2/svn.py @@ -210,3 +210,6 @@ class Svn(FetchMethod): def _build_revision(self, ud, d): return ud.revision + + def supports_checksum(self, urldata): + return False After this tests arepassed. bin/bitbake-selftest -c bb.tests.fetch.MirrorUriTest ...... ---------------------------------------------------------------------- Ran 6 tests in 0.074s OK 98918 1 kari.sivonen 2024-04-25 14:45:06 +0000 I use bitbake 2.0.0 but I run this test and done modifications to latest bitbake master version bitbake --version BitBake Build Tool Core version 2.9.0 git log -3 commit 97ffe14311407f6e705ec24b70870ab32f0637b9 (HEAD -> master, origin/master, origin/HEAD) Author: Sven Schwermer <sven.schwermer@disruptive-technologies.com> Date: Thu Apr 18 15:41:47 2024 +0200 fetch2/gcp: Add missing runfetchcmd import This adds the missing import. This bug was introduced with 1ab1d36c. Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 98921 2 5042 kari.sivonen 2024-04-25 19:41:53 +0000 Created attachment 5042 SVN mirror fix and test for it 98926 3 richard.purdie 2024-04-26 09:51:39 +0000 Could you send the patch to the bitbake-devel mailing list please? 98935 4 kari.sivonen 2024-04-29 06:46:19 +0000 (In reply to Richard Purdie from comment #3) > Could you send the patch to the bitbake-devel mailing list please? Now send it again. I find out that I have to be registered to openembedded too to send that patch. Should be now send. 98958 5 randy.macleod 2024-05-02 14:37:48 +0000 Patch on list, likely merged soon. 99031 6 kari.sivonen 2024-05-20 05:55:21 +0000 Hi, I find bug from this bug fix. Now it works for svn to svn mirrors but other mirrors now work. E.g svn to https not works anymore. This might be used when tarballs used for svn repos. I am working with fix 99038 7 5047 kari.sivonen 2024-05-21 07:53:56 +0000 Created attachment 5047 Patch of new fix for this There was bug in first fix of svn mirror fix for [YOCTO #15473] svn to svn mirror fixed in first commit but it broke svn to other mirrors This commit fix those other mirrors back to original way of working --- lib/bb/fetch2/__init__.py | 10 ++++++++++ lib/bb/tests/fetch.py | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 5bf2c4b8c..cfe6d5025 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -472,6 +472,16 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): uri_find_decoded[5] = {} elif ud.localpath and ud.method.supports_checksum(ud): basename = os.path.basename(ud.localpath) + elif ud.localpath and uri_decoded[0] == "svn" and uri_replace_decoded[0] != "svn": + #When added svn fetcher that supports_checksum return false + #all mirrors for svn skip all basename sets. That is ok for svn -> svn mirrors + #but other mirrors not work anymore. Example you want use tar balls for svn from https server + #This elif will catch cases where svn mirros gone before svn mirror fix + #This is basically same than first if branch except no mirrortarball set. Can it some how set for svn uris? + basename = os.path.basename(ud.localpath) + # Kill parameters, they make no sense for mirror tarballs + uri_decoded[5] = {} + uri_find_decoded[5] = {} if basename: uri_basename = os.path.basename(uri_decoded[loc]) # Prefix with a slash as a sentinel in case diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index ed7a39a72..934c19e0e 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -512,7 +512,8 @@ class MirrorUriTest(FetcherTest): "git://someserver.org/bitbake git://git.openembedded.org/bitbake " \ "https://.*/.* file:///someotherpath/downloads/ " \ "http://.*/.* file:///someotherpath/downloads/ " \ - "svn://svn.server1.com/ svn://svn.server2.com/" + "svn://svn.server1.com/ svn://svn.server2.com/ " \ + "svn://svn.server1.com/ file:///someotherpath/downloads/ " def test_urireplace(self): self.d.setVar("FILESPATH", ".") @@ -541,7 +542,7 @@ class MirrorUriTest(FetcherTest): fetcher = bb.fetch.FetchData("svn://svn.server1.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2", self.d) mirrors = bb.fetch2.mirror_from_string(self.mirrorvar) uris, uds = bb.fetch2.build_mirroruris(fetcher, mirrors, self.d) - self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2']) + self.assertEqual(uris, ['svn://svn.server2.com/isource/svnroot/reponame/tags/tagname;module=path_in_tagnamefolder;protocol=https;rev=2', 'file:///someotherpath/downloads/isource/svnroot/reponame/tags/path_in_tagnamefolder_svn.server1.com_.isource.svnroot.reponame.tags.tagname_2_1.tar.gz']) def test_mirror_of_mirror(self): # Test if mirror of a mirror works -- 2.40.1 99041 8 randy.macleod 2024-05-21 20:51:32 +0000 Hi Kari, Few people are using svn but if you send the patch to the bitbake list, it may get reviewed and hopefully merged. Can you do that? For tips, see: https://docs.yoctoproject.org/dev/contributor-guide/submit-changes.html or ask here. Randy 99053 9 kari.sivonen 2024-05-23 07:53:26 +0000 (In reply to Randy MacLeod from comment #8) > Hi Kari, > > Few people are using svn but if you send the patch to the bitbake list, it > may get reviewed and hopefully merged. Can you do that? > > For tips, see: > https://docs.yoctoproject.org/dev/contributor-guide/submit-changes.html > or ask here. > Randy I send patch to bitbake-devel@lists.openembedded.org <bitbake-devel@lists.openembedded.org>. Because of some settings on my linux machine it not send it with git command so I copied patch to email and send it from outlook. I tried to add subject and content like it was in email git tried to send but not sure if it is exactly same. Subjetc is "[bitbake-devel] [PATCH] fetch2/svn: Fix mirroring issue with svn" Richard Purdie already reply it. I like to find a way to do get this change in. 104532 10 richard.purdie 2026-03-05 16:11:58 +0000 https://git.openembedded.org/bitbake/commit/?id=21cfc7ae9a19f39ac8904e1c3466e7e499ac523f 5042 2024-04-25 19:41:53 +0000 2024-04-25 19:41:53 +0000 SVN mirror fix and test for it 0001-Fixes-YOCTO-15473.patch text/plain 2468 kari.sivonen RnJvbSBjNTJiYjAyNzAyZGQ5YjAxNDhkNzYxMTU3OTdkNjA5YjFlZjA3ZTYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogS2FyaSBTaXZvbmVuIDxrYXJpLnNpdm9uZW5AbGl2ZS5jb20+ DQpEYXRlOiBUaHUsIDI1IEFwciAyMDI0IDE3OjU0OjIyICswMzAwDQpTdWJqZWN0OiBbUEFUQ0hd IEZpeGVzIFtZT0NUTyAjMTU0NzNdDQoNCkFkZCByZXR1cm4gZmFsc2UgdG8gc3VwcG9ydHNfY2hl Y2tzdW0gZm9yIHN2biBmZXRjaGVyLg0KDQpUaGlzIGZpeGVzIE1JUlJPUiB1c2FnZSBmb3Igc3Zu IHVyaS4NCg0KU2lnbmVkLW9mZi1ieTogS2FyaSBTaXZvbmVuIDxrYXJpLnNpdm9uZW5AbGl2ZS5j b20+DQotLS0NCiBsaWIvYmIvZmV0Y2gyL3N2bi5weSAgfCAgMyArKysNCiBsaWIvYmIvdGVzdHMv ZmV0Y2gucHkgfCAxMCArKysrKysrKystDQogMiBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9uKC0pDQoNCmRpZmYgLS1naXQgYS9saWIvYmIvZmV0Y2gyL3N2bi5weSBi L2xpYi9iYi9mZXRjaDIvc3ZuLnB5DQppbmRleCBkNDBlNGQyOS4uMDg1MjEwOGUgMTAwNjQ0DQot LS0gYS9saWIvYmIvZmV0Y2gyL3N2bi5weQ0KKysrIGIvbGliL2JiL2ZldGNoMi9zdm4ucHkNCkBA IC0yMTAsMyArMjEwLDYgQEAgY2xhc3MgU3ZuKEZldGNoTWV0aG9kKToNCiANCiAgICAgZGVmIF9i dWlsZF9yZXZpc2lvbihzZWxmLCB1ZCwgZCk6DQogICAgICAgICByZXR1cm4gdWQucmV2aXNpb24N CisNCisgICAgZGVmIHN1cHBvcnRzX2NoZWNrc3VtKHNlbGYsIHVybGRhdGEpOg0KKyAgICAgICAg cmV0dXJuIEZhbHNlDQpkaWZmIC0tZ2l0IGEvbGliL2JiL3Rlc3RzL2ZldGNoLnB5IGIvbGliL2Ji L3Rlc3RzL2ZldGNoLnB5DQppbmRleCA4NWMxZjc5Zi4uNjZjOTMyODIgMTAwNjQ0DQotLS0gYS9s aWIvYmIvdGVzdHMvZmV0Y2gucHkNCisrKyBiL2xpYi9iYi90ZXN0cy9mZXRjaC5weQ0KQEAgLTUx MSw3ICs1MTEsOCBAQCBjbGFzcyBNaXJyb3JVcmlUZXN0KEZldGNoZXJUZXN0KToNCiAgICAgbWly cm9ydmFyID0gImh0dHA6Ly8uKi8uKiBmaWxlOi8vL3NvbWVwYXRoL2Rvd25sb2Fkcy8gIiBcDQog ICAgICAgICAgICAgICAgICJnaXQ6Ly9zb21lc2VydmVyLm9yZy9iaXRiYWtlIGdpdDovL2dpdC5v cGVuZW1iZWRkZWQub3JnL2JpdGJha2UgIiBcDQogICAgICAgICAgICAgICAgICJodHRwczovLy4q Ly4qIGZpbGU6Ly8vc29tZW90aGVycGF0aC9kb3dubG9hZHMvICIgXA0KLSAgICAgICAgICAgICAg ICAiaHR0cDovLy4qLy4qIGZpbGU6Ly8vc29tZW90aGVycGF0aC9kb3dubG9hZHMvIg0KKyAgICAg ICAgICAgICAgICAiaHR0cDovLy4qLy4qIGZpbGU6Ly8vc29tZW90aGVycGF0aC9kb3dubG9hZHMv ICIgXA0KKyAgICAgICAgICAgICAgICAic3ZuOi8vc3ZuLnNlcnZlcjEuY29tLyBzdm46Ly9zdm4u c2VydmVyMi5jb20vIg0KIA0KICAgICBkZWYgdGVzdF91cmlyZXBsYWNlKHNlbGYpOg0KICAgICAg ICAgc2VsZi5kLnNldFZhcigiRklMRVNQQVRIIiwgIi4iKQ0KQEAgLTUzNSw2ICs1MzYsMTMgQEAg Y2xhc3MgTWlycm9yVXJpVGVzdChGZXRjaGVyVGVzdCk6DQogICAgICAgICB1cmlzLCB1ZHMgPSBi Yi5mZXRjaDIuYnVpbGRfbWlycm9ydXJpcyhmZXRjaGVyLCBtaXJyb3JzLCBzZWxmLmQpDQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHVyaXMsIFsnZmlsZTovLy9zb21lb3RoZXJwYXRoL2Rvd25s b2Fkcy9iaXRiYWtlLTEuMC50YXIuZ3onXSkNCiANCisgICAgZGVmIHRlc3RfdXJpbGlzdHN2bihz ZWxmKToNCisgICAgICAgICMgQ2F0Y2ggc3ZuOi8vIC0+IHN2bjovLyBidWcNCisgICAgICAgIGZl dGNoZXIgPSBiYi5mZXRjaC5GZXRjaERhdGEoInN2bjovL3N2bi5zZXJ2ZXIxLmNvbS9pc291cmNl L3N2bnJvb3QvcmVwb25hbWUvdGFncy90YWduYW1lO21vZHVsZT1wYXRoX2luX3RhZ25hbWVmb2xk ZXI7cHJvdG9jb2w9aHR0cHM7cmV2PTIiLCBzZWxmLmQpDQorICAgICAgICBtaXJyb3JzID0gYmIu ZmV0Y2gyLm1pcnJvcl9mcm9tX3N0cmluZyhzZWxmLm1pcnJvcnZhcikNCisgICAgICAgIHVyaXMs IHVkcyA9IGJiLmZldGNoMi5idWlsZF9taXJyb3J1cmlzKGZldGNoZXIsIG1pcnJvcnMsIHNlbGYu ZCkNCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodXJpcywgWydzdm46Ly9zdm4uc2VydmVyMi5j b20vaXNvdXJjZS9zdm5yb290L3JlcG9uYW1lL3RhZ3MvdGFnbmFtZTttb2R1bGU9cGF0aF9pbl90 YWduYW1lZm9sZGVyO3Byb3RvY29sPWh0dHBzO3Jldj0yJ10pDQorDQogICAgIGRlZiB0ZXN0X21p cnJvcl9vZl9taXJyb3Ioc2VsZik6DQogICAgICAgICAjIFRlc3QgaWYgbWlycm9yIG9mIGEgbWly cm9yIHdvcmtzDQogICAgICAgICBtaXJyb3J2YXIgPSBzZWxmLm1pcnJvcnZhciArICIgaHR0cDov Ly4qLy4qIGh0dHA6Ly9vdGhlcmRvd25sb2Fkcy55b2N0b3Byb2plY3Qub3JnL2Rvd25sb2Fkcy8i DQotLSANCjIuMjkuMA0KDQo= 5047 2024-05-21 07:53:56 +0000 2024-05-21 07:53:56 +0000 Patch of new fix for this svn_fix.patch text/plain 3459 kari.sivonen VGhlcmUgd2FzIGJ1ZyBpbiBmaXJzdCBmaXggb2Ygc3ZuIG1pcnJvciBmaXggZm9yIFtZT0NUTyAj MTU0NzNdDQoNCnN2biB0byBzdm4gbWlycm9yIGZpeGVkIGluIGZpcnN0IGNvbW1pdCBidXQgaXQg YnJva2Ugc3ZuIHRvIG90aGVyIG1pcnJvcnMNClRoaXMgY29tbWl0IGZpeCB0aG9zZSBvdGhlciBt aXJyb3JzIGJhY2sgdG8gb3JpZ2luYWwgd2F5IG9mIHdvcmtpbmcNCi0tLQ0KIGxpYi9iYi9mZXRj aDIvX19pbml0X18ucHkgfCAxMCArKysrKysrKysrDQogbGliL2JiL3Rlc3RzL2ZldGNoLnB5ICAg ICB8ICA1ICsrKy0tDQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvbGliL2JiL2ZldGNoMi9fX2luaXRfXy5weSBiL2xpYi9i Yi9mZXRjaDIvX19pbml0X18ucHkNCmluZGV4IDViZjJjNGI4Yy4uY2ZlNmQ1MDI1IDEwMDY0NA0K LS0tIGEvbGliL2JiL2ZldGNoMi9fX2luaXRfXy5weQ0KKysrIGIvbGliL2JiL2ZldGNoMi9fX2lu aXRfXy5weQ0KQEAgLTQ3Miw2ICs0NzIsMTYgQEAgZGVmIHVyaV9yZXBsYWNlKHVkLCB1cmlfZmlu ZCwgdXJpX3JlcGxhY2UsIHJlcGxhY2VtZW50cywgZCwgbWlycm9ydGFyYmFsbD1Ob25lKToNCiAg ICAgICAgICAgICAgICAgICAgIHVyaV9maW5kX2RlY29kZWRbNV0gPSB7fQ0KICAgICAgICAgICAg ICAgICBlbGlmIHVkLmxvY2FscGF0aCBhbmQgdWQubWV0aG9kLnN1cHBvcnRzX2NoZWNrc3VtKHVk KToNCiAgICAgICAgICAgICAgICAgICAgIGJhc2VuYW1lID0gb3MucGF0aC5iYXNlbmFtZSh1ZC5s b2NhbHBhdGgpDQorICAgICAgICAgICAgICAgIGVsaWYgdWQubG9jYWxwYXRoIGFuZCB1cmlfZGVj b2RlZFswXSA9PSAic3ZuIiBhbmQgdXJpX3JlcGxhY2VfZGVjb2RlZFswXSAhPSAic3ZuIjoNCisg ICAgICAgICAgICAgICAgICAgICNXaGVuIGFkZGVkIHN2biBmZXRjaGVyIHRoYXQgc3VwcG9ydHNf Y2hlY2tzdW0gcmV0dXJuIGZhbHNlDQorICAgICAgICAgICAgICAgICAgICAjYWxsIG1pcnJvcnMg Zm9yIHN2biBza2lwIGFsbCBiYXNlbmFtZSBzZXRzLiBUaGF0IGlzIG9rIGZvciBzdm4gLT4gc3Zu ICBtaXJyb3JzDQorICAgICAgICAgICAgICAgICAgICAjYnV0IG90aGVyIG1pcnJvcnMgbm90IHdv cmsgYW55bW9yZS4gRXhhbXBsZSB5b3Ugd2FudCB1c2UgdGFyIGJhbGxzIGZvciBzdm4gZnJvbSBo dHRwcyBzZXJ2ZXINCisgICAgICAgICAgICAgICAgICAgICNUaGlzIGVsaWYgd2lsbCBjYXRjaCBj YXNlcyB3aGVyZSBzdm4gbWlycm9zIGdvbmUgYmVmb3JlIHN2biBtaXJyb3IgZml4DQorICAgICAg ICAgICAgICAgICAgICAjVGhpcyBpcyBiYXNpY2FsbHkgc2FtZSB0aGFuIGZpcnN0IGlmIGJyYW5j aCBleGNlcHQgbm8gbWlycm9ydGFyYmFsbCBzZXQuIENhbiBpdCBzb21lIGhvdyBzZXQgZm9yIHN2 biB1cmlzPw0KKyAgICAgICAgICAgICAgICAgICAgYmFzZW5hbWUgPSBvcy5wYXRoLmJhc2VuYW1l KHVkLmxvY2FscGF0aCkNCisgICAgICAgICAgICAgICAgICAgICMgS2lsbCBwYXJhbWV0ZXJzLCB0 aGV5IG1ha2Ugbm8gc2Vuc2UgZm9yIG1pcnJvciB0YXJiYWxscw0KKyAgICAgICAgICAgICAgICAg ICAgdXJpX2RlY29kZWRbNV0gPSB7fQ0KKyAgICAgICAgICAgICAgICAgICAgdXJpX2ZpbmRfZGVj b2RlZFs1XSA9IHt9DQogICAgICAgICAgICAgICAgIGlmIGJhc2VuYW1lOg0KICAgICAgICAgICAg ICAgICAgICAgdXJpX2Jhc2VuYW1lID0gb3MucGF0aC5iYXNlbmFtZSh1cmlfZGVjb2RlZFtsb2Nd KQ0KICAgICAgICAgICAgICAgICAgICAgIyBQcmVmaXggd2l0aCBhIHNsYXNoIGFzIGEgc2VudGlu ZWwgaW4gY2FzZQ0KZGlmZiAtLWdpdCBhL2xpYi9iYi90ZXN0cy9mZXRjaC5weSBiL2xpYi9iYi90 ZXN0cy9mZXRjaC5weQ0KaW5kZXggZWQ3YTM5YTcyLi45MzRjMTllMGUgMTAwNjQ0DQotLS0gYS9s aWIvYmIvdGVzdHMvZmV0Y2gucHkNCisrKyBiL2xpYi9iYi90ZXN0cy9mZXRjaC5weQ0KQEAgLTUx Miw3ICs1MTIsOCBAQCBjbGFzcyBNaXJyb3JVcmlUZXN0KEZldGNoZXJUZXN0KToNCiAgICAgICAg ICAgICAgICAgImdpdDovL3NvbWVzZXJ2ZXIub3JnL2JpdGJha2UgZ2l0Oi8vZ2l0Lm9wZW5lbWJl ZGRlZC5vcmcvYml0YmFrZSAiIFwNCiAgICAgICAgICAgICAgICAgImh0dHBzOi8vLiovLiogZmls ZTovLy9zb21lb3RoZXJwYXRoL2Rvd25sb2Fkcy8gIiBcDQogICAgICAgICAgICAgICAgICJodHRw Oi8vLiovLiogZmlsZTovLy9zb21lb3RoZXJwYXRoL2Rvd25sb2Fkcy8gIiBcDQotICAgICAgICAg ICAgICAgICJzdm46Ly9zdm4uc2VydmVyMS5jb20vIHN2bjovL3N2bi5zZXJ2ZXIyLmNvbS8iDQor ICAgICAgICAgICAgICAgICJzdm46Ly9zdm4uc2VydmVyMS5jb20vIHN2bjovL3N2bi5zZXJ2ZXIy LmNvbS8gIiBcDQorICAgICAgICAgICAgICAgICJzdm46Ly9zdm4uc2VydmVyMS5jb20vIGZpbGU6 Ly8vc29tZW90aGVycGF0aC9kb3dubG9hZHMvICINCg0KICAgICBkZWYgdGVzdF91cmlyZXBsYWNl KHNlbGYpOg0KICAgICAgICAgc2VsZi5kLnNldFZhcigiRklMRVNQQVRIIiwgIi4iKQ0KQEAgLTU0 MSw3ICs1NDIsNyBAQCBjbGFzcyBNaXJyb3JVcmlUZXN0KEZldGNoZXJUZXN0KToNCiAgICAgICAg IGZldGNoZXIgPSBiYi5mZXRjaC5GZXRjaERhdGEoInN2bjovL3N2bi5zZXJ2ZXIxLmNvbS9pc291 cmNlL3N2bnJvb3QvcmVwb25hbWUvdGFncy90YWduYW1lO21vZHVsZT1wYXRoX2luX3RhZ25hbWVm b2xkZXI7cHJvdG9jb2w9aHR0cHM7cmV2PTIiLCBzZWxmLmQpDQogICAgICAgICBtaXJyb3JzID0g YmIuZmV0Y2gyLm1pcnJvcl9mcm9tX3N0cmluZyhzZWxmLm1pcnJvcnZhcikNCiAgICAgICAgIHVy aXMsIHVkcyA9IGJiLmZldGNoMi5idWlsZF9taXJyb3J1cmlzKGZldGNoZXIsIG1pcnJvcnMsIHNl bGYuZCkNCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodXJpcywgWydzdm46Ly9zdm4uc2VydmVy Mi5jb20vaXNvdXJjZS9zdm5yb290L3JlcG9uYW1lL3RhZ3MvdGFnbmFtZTttb2R1bGU9cGF0aF9p bl90YWduYW1lZm9sZGVyO3Byb3RvY29sPWh0dHBzO3Jldj0yJ10pDQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHVyaXMsIFsnc3ZuOi8vc3ZuLnNlcnZlcjIuY29tL2lzb3VyY2Uvc3Zucm9vdC9y ZXBvbmFtZS90YWdzL3RhZ25hbWU7bW9kdWxlPXBhdGhfaW5fdGFnbmFtZWZvbGRlcjtwcm90b2Nv bD1odHRwcztyZXY9MicsICdmaWxlOi8vL3NvbWVvdGhlcnBhdGgvZG93bmxvYWRzL2lzb3VyY2Uv c3Zucm9vdC9yZXBvbmFtZS90YWdzL3BhdGhfaW5fdGFnbmFtZWZvbGRlcl9zdm4uc2VydmVyMS5j b21fLmlzb3VyY2Uuc3Zucm9vdC5yZXBvbmFtZS50YWdzLnRhZ25hbWVfMl8xLnRhci5neiddKQ0K DQogICAgIGRlZiB0ZXN0X21pcnJvcl9vZl9taXJyb3Ioc2VsZik6DQogICAgICAgICAjIFRlc3Qg aWYgbWlycm9yIG9mIGEgbWlycm9yIHdvcmtzDQotLQ0KMi40MC4x