28400 2009-08-17 11:21:29 -0700 [Chromium] Add compile-only canary-style Chromium slave to the waterfall 2009-08-26 13:29:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov abarth mrowe oldest_to_newest 140773 0 dglazkov 2009-08-17 11:21:29 -0700 Needless to say, having a Chromium slave on build.webkit.org would be pretty useful to WebKit committers. The problem is that we are still quite a ways away from being able a fully functional Chromium WebKit slave on build.webkit.org (see bug 28398 for details). I wonder if we could compromise here by temporarily hooking up an existing pre-configured Chromium slave (http://src.chromium.org/viewvc/chrome/trunk/tools/buildbot/) and modifying WebKit master to feed it Chromiumey commands? Although not a replacement for the proper build slave, this solution allows us to gain immediate benefit of observing the breakage as it happens, right there on the waterfall, rather than having to look at http://tinyurl.com/webkit-canary or worse yet, letting Chromium people put out the fires. What do you think? Patch coming up. 140776 1 34979 dglazkov 2009-08-17 11:24:23 -0700 Created attachment 34979 Add canary-style Chromium build slave, v1. .../build.webkit.org-config/config.json | 9 ++++- .../build.webkit.org-config/master.cfg | 37 +++++++++++++++++++- WebKitTools/ChangeLog | 10 +++++ 3 files changed, 54 insertions(+), 2 deletions(-) 140797 2 34979 mrowe 2009-08-17 12:51:00 -0700 Comment on attachment 34979 Add canary-style Chromium build slave, v1. Has this been tested? 283 if platform == "chromium": 284 self.addStep(UpdateChromiumSource) I don't see how platform can ever be equal to "chromium" here, which would suggest that none of the Chromium-specific bits would ever be executed. Where is the output from this build placed? Does it end up below the WebKit source root? I'm still not particularly fond of adding all this Chromium-specific gunk to what is otherwise a cross-platform setup. What is the ETA for getting Chromium building in the same manner as every other WebKit port? 140824 3 34979 dglazkov 2009-08-17 13:48:40 -0700 Comment on attachment 34979 Add canary-style Chromium build slave, v1. I apologize. I will set up a master and test this. 140825 4 dglazkov 2009-08-17 13:50:32 -0700 (In reply to comment #2) > I'm still not particularly fond of adding all this Chromium-specific gunk to > what is otherwise a cross-platform setup. What is the ETA for getting Chromium > building in the same manner as every other WebKit port? I am trying to lead this effort to completion in the next few months. I don't have a specific date, but it is "as soon as possible" in my book. It's not a good situation for the Chromium folks, either. 141179 5 35064 dglazkov 2009-08-18 13:10:43 -0700 Created attachment 35064 Add canary-style Chromium build slave, v2. .../build.webkit.org-config/config.json | 12 ++++- .../build.webkit.org-config/master.cfg | 48 ++++++++++++++++++++ WebKitTools/ChangeLog | 10 ++++ 3 files changed, 68 insertions(+), 2 deletions(-) 141181 6 35064 dglazkov 2009-08-18 13:12:18 -0700 Comment on attachment 35064 Add canary-style Chromium build slave, v2. I tested this one :). Can you take another look? 141192 7 35064 dglazkov 2009-08-18 13:32:19 -0700 Comment on attachment 35064 Add canary-style Chromium build slave, v2. Will fix issues discussed on #webkit, new patch coming up. 141290 8 35083 dglazkov 2009-08-18 15:28:08 -0700 Created attachment 35083 Add canary-style Chromium build slave, v3. .../build.webkit.org-config/config.json | 12 ++++- .../build.webkit.org-config/master.cfg | 51 ++++++++++++++++++++ WebKitTools/ChangeLog | 10 ++++ 3 files changed, 71 insertions(+), 2 deletions(-) 141291 9 35083 dglazkov 2009-08-18 15:29:47 -0700 Comment on attachment 35083 Add canary-style Chromium build slave, v3. Addressed #webkit comments: * Changed builder to "ChromiumBuild" * Escaped backslash * Added revision-bound gclient sync 141306 10 35083 mrowe 2009-08-18 16:14:00 -0700 Comment on attachment 35083 Add canary-style Chromium build slave, v3. > diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > index 4d92436..6ad9143 100644 > --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > @@ -47,6 +47,48 @@ class CheckOutSource(source.SVN): > source.SVN.__init__(self, baseURL=self.baseURL, defaultBranch="trunk", mode=self.mode, *args, **kwargs) > > > +# FIXME: Remove this step once Chromium WebKit port build system is decoupled from > +# Chromium (https://bugs.webkit.org/show_bug.cgi?id=28396) > +class UpdateChromiumSource(shell.ShellCommand): > + command = ["gclient", "sync"] > + name = "update-chromium" > + description = ["updating chromium source"] > + descriptionDone = ["updated chromium source"] > + haltOnFailure = True The descriptionDone should really include the SVN revision number so that it is clear from the waterfall page which revision was built. The SVN status step uses a descriptionDone of the form ["updated", "rXXXX"] where XXXX is the value of got_revision (the revision that the "svn update" ended up pulling). > + > + def start(self): > + os = self.getProperty("fullPlatform").split('-')[1] > + if os == "win": > + self.command[0] = "gclient.bat" > + revision = self.getProperty("revision") > + if revision: > + self.command.append("--revision=src/third_party/WebKit@" + revision) We should be using ShellCommand.setCommand like is done elsewhere in the file rather than mutating self.command directly. In theory the step should also be setting up got_revision as other source-fetching steps do. It'll be needed for the descriptionDone property as mentioned above. > +# FIXME: Remove this step once Chromium WebKit port build system is decoupled from > +# Chromium (https://bugs.webkit.org/show_bug.cgi?id=28396) > +class CompileChromiumWebKit(shell.ShellCommand): > + command = ["python", "../../../scripts/slave/compile.py"] > + name = "build-chromium" > + description = ["compiling"] > + descriptionDone = ["compiled"] > + haltOnFailure = True > + > + def start(self): > + os = self.getProperty("fullPlatform").split('-')[1] > + command = self.command > + if not self.getProperty("revision"): > + # Buildbot will set revision to None when a build is forced. Use it > + # as a signal to clobber. > + command.append("--clobber") > + if os == "win": > + command.extend(["--solution=webkit.sln", "--build-dir=src\\webkit", "--", "/project", "webcore"]) > + elif os == "mac": > + command.extend(["--solution=__solution__", "--build-dir=src/build", "--", "-project", "../webkit/webkit.xcodeproj", "-target", "webcore"]) Same comment as above about self.command. 141361 11 dglazkov 2009-08-18 19:12:52 -0700 (In reply to comment #10) > The descriptionDone should really include the SVN revision number so that it is > clear from the waterfall page which revision was built. The SVN status step > uses a descriptionDone of the form ["updated", "rXXXX"] where XXXX is the value > of got_revision (the revision that the "svn update" ended up pulling). Let me see how I can figure this out. I don't know if I can, but will try. > > > + > > + def start(self): > > + os = self.getProperty("fullPlatform").split('-')[1] > > + if os == "win": > > + self.command[0] = "gclient.bat" > > + revision = self.getProperty("revision") > > + if revision: > > + self.command.append("--revision=src/third_party/WebKit@" + revision) > > We should be using ShellCommand.setCommand like is done elsewhere in the file > rather than mutating self.command directly. In theory the step should also be > setting up got_revision as other source-fetching steps do. It'll be needed for > the descriptionDone property as mentioned above. > > > +# FIXME: Remove this step once Chromium WebKit port build system is decoupled from > > +# Chromium (https://bugs.webkit.org/show_bug.cgi?id=28396) > > +class CompileChromiumWebKit(shell.ShellCommand): > > + command = ["python", "../../../scripts/slave/compile.py"] > > + name = "build-chromium" > > + description = ["compiling"] > > + descriptionDone = ["compiled"] > > + haltOnFailure = True > > + > > + def start(self): > > + os = self.getProperty("fullPlatform").split('-')[1] > > + command = self.command > > + if not self.getProperty("revision"): > > + # Buildbot will set revision to None when a build is forced. Use it > > + # as a signal to clobber. > > + command.append("--clobber") > > + if os == "win": > > + command.extend(["--solution=webkit.sln", "--build-dir=src\\webkit", "--", "/project", "webcore"]) > > + elif os == "mac": > > + command.extend(["--solution=__solution__", "--build-dir=src/build", "--", "-project", "../webkit/webkit.xcodeproj", "-target", "webcore"]) > > Same comment as above about self.command. Thanks! Will fix. 141362 12 35083 dglazkov 2009-08-18 19:13:50 -0700 Comment on attachment 35083 Add canary-style Chromium build slave, v3. New patch coming up ... 141632 13 35158 dglazkov 2009-08-19 16:39:16 -0700 Created attachment 35158 Add canary-style Chromium build slave, v4. .../build.webkit.org-config/config.json | 12 +++- .../build.webkit.org-config/master.cfg | 63 ++++++++++++++++++++ WebKitTools/ChangeLog | 10 +++ 3 files changed, 83 insertions(+), 2 deletions(-) 141633 14 35158 dglazkov 2009-08-19 16:40:37 -0700 Comment on attachment 35158 Add canary-style Chromium build slave, v4. Comments addressed. Took me a while to get this one right. I also have a variation that doesn't use the super-fugly regex, just startswith and line loop. 141825 15 abarth 2009-08-20 23:07:18 -0700 From the blackout: --- Comment #15 from Eric Seidel <eric@webkit.org> 2009-08-20 10:38:50 PDT --- (From update of attachment 35158) I wonder if the master shouldn't just import some chromium module with these hacks in it, instead of inlining them. Anyway, looks sane enough to me, but you need a review from bdash. Does buildbot really uses non-standard python style? 58 haltOnFailure = True How about here? 63 got_revision = "??" # This matches SVN unknown revision response No way to avoid the ../../..? 83 command = ["python", "../../../scripts/slave/compile.py"] So all force builds should be clobber builds? I thought buildbot had a clobber option? Or maybe that's just chromium's special buildbot. This should be inside some sort of "build-chromium" script instead of in ever thing that wants to call compile.py: if os == "win": 97 command.extend(["--solution=webkit.sln", "--build-dir=src\\webkit", "--", "/project", "webcore"]) 98 elif os == "mac": 99 command.extend(["--solution=__solution__", "--build-dir=src/build", "--", "-project", "../webkit/webkit.xcodeproj", "-target", "webcore"]) I gues it's becasue we're trying to build only WebCore...? Sad: " ".join(architectures) Again, looks OK to me. bdash is your man. 141912 16 dglazkov 2009-08-21 11:14:55 -0700 > Does buildbot really uses non-standard python style? > 58 haltOnFailure = True yup. > How about here? > 63 got_revision = "??" # This matches SVN unknown revision response Well, the naming here is to match the name of the property. But I can rename that. > No way to avoid the ../../..? > 83 command = ["python", "../../../scripts/slave/compile.py"] Not without more angst :) > So all force builds should be clobber builds? I thought buildbot had a clobber > option? Or maybe that's just chromium's special buildbot. Yup. It's something nsylvain bolted on to build.chromium.org. > This should be inside some sort of "build-chromium" script instead of in ever > thing that wants to call compile.py: > if os == "win": > 97 command.extend(["--solution=webkit.sln", > "--build-dir=src\\webkit", "--", "/project", "webcore"]) > 98 elif os == "mac": > 99 command.extend(["--solution=__solution__", > "--build-dir=src/build", "--", "-project", "../webkit/webkit.xcodeproj", > "-target", "webcore"]) > > I gues it's becasue we're trying to build only WebCore...? Yes, and I really want to minimize the customness here. This will be going away in a matter of months. > Sad: > " ".join(architectures) > > Again, looks OK to me. bdash is your man. 142877 17 dglazkov 2009-08-26 10:00:37 -0700 How are we doing here? :) 142924 18 35158 mrowe 2009-08-26 12:40:01 -0700 Comment on attachment 35158 Add canary-style Chromium build slave, v4. > diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > index 4d92436..5af0698 100644 > --- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > +++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg > @@ -14,6 +14,7 @@ from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED > from twisted.internet import defer > > import simplejson > +import re This should be alphabetical. > + def createSummary(self, log): > + scraper = re.compile(r"^________ running '[^\n]+third_party[/\\]WebKit[^\n]+$\n(?:^[UA]\W+[^\n]+$\n)*^(?:Updated to|At) revision (\d+)", re.DOTALL | re.MULTILINE) > + revs = scraper.findall(log.getText()) > + got_revision = "??" # This matches SVN unknown revision response These two variable names don't follow our coding style. "revs" should presumably be "revisions". "got_revision" should be "gotRevision".. > + if len(revs): > + got_revision = ("r%s" % revs[-1]) The parens are unnecessary here. > + def start(self): > + os = self.getProperty("fullPlatform").split('-')[1] > + command = self.command[:] > + if not self.getProperty("revision"): > + # Buildbot will set revision to None when a build is forced. Use it > + # as a signal to clobber. > + command.append("--clobber") This introduces a difference in behavior from the other configurations. While it may make sense to add this behavior, we shouldn't be doing it in such a way that it is specific to a single configuration. r=me 142950 19 dglazkov 2009-08-26 13:06:05 -0700 Landed as http://trac.webkit.org/changeset/47787. 142957 20 dglazkov 2009-08-26 13:29:45 -0700 Clobber option removal landed as http://trac.webkit.org/changeset/47789 34979 2009-08-17 11:24:23 -0700 2009-08-17 13:48:38 -0700 Add canary-style Chromium build slave, v1. Add-canary-style-Chromium-build-slave-v1..patch text/plain 4915 dglazkov MDI5ZTZmMmFkNDg4OTdiYjBlMGVjNmQwMjJjMDMwY2JmM2M1YWM0YQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24gYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9jb25maWcuanNvbgppbmRleCBiNjUwYjRjLi4wYzczMjJkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcu anNvbgorKysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbgpAQCAtMTYsNyArMTYsOSBAQAogCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiZ3RrLWxpbnV4LXNsYXZlLTEiLCAicGxhdGZvcm0iOiAiZ3RrIn0sCiAK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzemVnZWQtbGludXgtMSIsICJwbGF0Zm9y bSI6ICJxdCJ9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3plZ2VkLWxpbnV4LTEi LCAicGxhdGZvcm0iOiAicXQifSwKKworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdv b2dsZS1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImNocm9taXVtLXdpbiIgfQogICAgICAgICAgICAg ICAgICAgXSwKIAogICAgICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJl bGVhc2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwt cmVsZWFzZSIsCkBAIC03NCw2ICs3NiwxMSBAQAogICAgICAgICAgICAgICAgICAgICAgICJuYW1l IjogIlF0IExpbnV4IFJlbGVhc2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIi OiAicXQtbGludXgtcmVsZWFzZSIsCiAgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjog InF0IiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2 Il0sCiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbInN6ZWdlZC1saW51eC0x Il0KKyAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgeworICAgICAg ICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIFdpbiBSZWxlYXNlIiwgInR5cGUiOiAi QnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAorICAgICAgICAgICAg ICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJhdGlvbiI6ICJy ZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAgICAgICAgICAg ICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXNsYXZlLTEiXQogICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICBdLAogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvV2ViS2l0VG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpp bmRleCA0ZDkyNDM2Li5iNTNlNGMyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1dlYktpdFRv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK QEAgLTQ2LDYgKzQ2LDMzIEBAIGNsYXNzIENoZWNrT3V0U291cmNlKHNvdXJjZS5TVk4pOgogICAg IGRlZiBfX2luaXRfXyhzZWxmLCAqYXJncywgKiprd2FyZ3MpOgogICAgICAgICBzb3VyY2UuU1ZO Ll9faW5pdF9fKHNlbGYsIGJhc2VVUkw9c2VsZi5iYXNlVVJMLCBkZWZhdWx0QnJhbmNoPSJ0cnVu ayIsIG1vZGU9c2VsZi5tb2RlLCAqYXJncywgKiprd2FyZ3MpCiAKK2NsYXNzIFVwZGF0ZUNocm9t aXVtU291cmNlKHNoZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgY29tbWFuZCA9IFsiZ2NsaWVudCIs ICJzeW5jIl0KKyAgICBuYW1lID0gInVwZGF0ZS1jaHJvbWl1bSIKKyAgICBkZXNjcmlwdGlvbiA9 IFsidXBkYXRpbmcgY2hyb21pdW0gc291cmNlIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbInVw ZGF0ZWQgY2hyb21pdW0gc291cmNlIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisgICAg ZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBvcyA9IHNlbGYuZ2V0UHJvcGVydHkoImZ1bGxQbGF0 Zm9ybSIpLnNwbGl0KCctJylbMl0KKyAgICAgICAgaWYgb3MgPT0gIndpbiI6CisgICAgICAgICAg ICBzZWxmLnNldENvbW1hbmQoWyJnY2xpZW50LmJhdCIsICJzeW5jIl0pCisKKworY2xhc3MgQ29t cGlsZUNocm9taXVtV2ViS2l0KHNoZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgY29tbWFuZCA9IFsi cHl0aG9uIiwgIi4uLy4uLy4uL3NjcmlwdHMvc2xhdmUvY29tcGlsZS5weSJdCisgICAgbmFtZSA9 ICJidWlsZC1jaHJvbWl1bSIKKyAgICBkZXNjcmlwdGlvbiA9IFsiY29tcGlsaW5nIl0KKyAgICBk ZXNjcmlwdGlvbkRvbmUgPSBbImNvbXBpbGVkIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQor CisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBvcyA9IHNlbGYuZ2V0UHJvcGVydHkoImZ1 bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMl0KKyAgICAgICAgaWYgb3MgPT0gIndpbiI6CisgICAg ICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyItLXNvbHV0aW9uPXdlYmtp dC5zbG4iLCAiLS1idWlsZC1kaXI9c3JjXHdlYmtpdCIsICItLSIsICIvcHJvamVjdCIsICJ0ZXN0 X3NoZWxsIl0pCisgICAgICAgIGVsaWYgb3MgPT0gIm1hYyI6CisgICAgICAgICAgICBzZWxmLnNl dENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyItLXNvbHV0aW9uPV9fc29sdXRpb25fXyIsICItLWJ1 aWxkLWRpcj1zcmMvYnVpbGQiLCAiLS0iLCAiLXByb2plY3QiLCAiLi4vd2Via2l0L3Rvb2xzL3Rl c3Rfc2hlbGwvdGVzdF9zaGVsbC54Y29kZXByb2oiXSkKKwogCiBjbGFzcyBJbnN0YWxsV2luMzJE ZXBlbmRlbmNpZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgZGVzY3JpcHRpb24gPSBbImluc3RhbGxp bmcgZGVwZW5kZW5jaWVzIl0KQEAgLTI1MywxMyArMjgwLDIxIEBAIGNsYXNzIEZhY3RvcnkoZmFj dG9yeS5CdWlsZEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29u ZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYnVpbGRPbmx5KToKICAgICAgICAgZmFjdG9yeS5C dWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3Vy ZUJ1aWxkLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmU9IiAiLmpvaW4oYXJjaGl0ZWN0dXJlcyksIGJ1aWxkT25seT1idWlsZE9ubHkp Ci0gICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091dFNvdXJjZSkKKyAgICAgICAgaWYgcGxhdGZv cm0gPT0gImNocm9taXVtIjoKKyAgICAgICAgICAgIHNlbGYuYWRkU3RlcChVcGRhdGVDaHJvbWl1 bVNvdXJjZSkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHNlbGYuYWRkU3RlcChDaGVja091 dFNvdXJjZSkKICAgICAgICAgaWYgcGxhdGZvcm0gPT0gIndpbiI6CiAgICAgICAgICAgICBzZWxm LmFkZFN0ZXAoSW5zdGFsbFdpbjMyRGVwZW5kZW5jaWVzKQogCiBjbGFzcyBCdWlsZEZhY3Rvcnko RmFjdG9yeSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9u LCBhcmNoaXRlY3R1cmVzLCB0cmlnZ2Vycyk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2Vs ZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIFRydWUpCisgICAgICAg IGlmIHBsYXRmb3JtID09ICJjaHJvbWl1bSI6CisgICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBp bGVDaHJvbWl1bVdlYktpdCkKKyAgICAgICAgICAjIEZJWE1FOiBBZGQgbW9yZSBzdGVwcyBhcyBD aHJvbWl1bSBXZWJLaXQgcG9ydCBtYXR1cmVzLgorICAgICAgICAgIHJldHVybgorCiAgICAgICAg IHNlbGYuYWRkU3RlcChDb21waWxlV2ViS2l0KQogICAgICAgICBzZWxmLmFkZFN0ZXAoQXJjaGl2 ZUJ1aWx0UHJvZHVjdCkKICAgICAgICAgc2VsZi5hZGRTdGVwKFVwbG9hZEJ1aWx0UHJvZHVjdCkK ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiYjFjYzFkLi5jZWI3NDZlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDgt MTcgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY2FuYXJ5LXN0eWxlIENo cm9taXVtIFdlYktpdCBidWlsZCBzbGF2ZSB0byB0aGUgd2F0ZXJmYWxsLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg0MDAKKworICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOiBBZGRl ZCBvbmUgQ2hyb21pdW0vV2luZG93cyBzbGF2ZQorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6IEFkZGVkIHN1cHBvcnQgZm9yIENo cm9taXVtIHNsYXZlIGNvbW1hbmRzLgorCiAyMDA5LTA4LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNA d2Via2l0Lm9yZz4KIAogICAgICAgICBObyByZXZpZXcuICBGaXggNS1zcGFjZSBpbmRlbnQgdG8g YmUgNC1zcGFjZXMuCg== 35064 2009-08-18 13:10:43 -0700 2009-08-18 13:32:19 -0700 Add canary-style Chromium build slave, v2. Add-canary-style-Chromium-build-slave-v2..patch text/plain 6058 dglazkov NmZlMTM5ZTQwNDRmZDExODNkN2QwMjYwZGVlMjdjMzcxMWJmMTg5YgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24gYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9jb25maWcuanNvbgppbmRleCBiNjUwYjRjLi44MDJiMDY0IDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcu anNvbgorKysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbgpAQCAtMTYsNyArMTYsOSBAQAogCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiZ3RrLWxpbnV4LXNsYXZlLTEiLCAicGxhdGZvcm0iOiAiZ3RrIn0sCiAK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzemVnZWQtbGludXgtMSIsICJwbGF0Zm9y bSI6ICJxdCJ9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3plZ2VkLWxpbnV4LTEi LCAicGxhdGZvcm0iOiAicXQifSwKKworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdv b2dsZS1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImNocm9taXVtLXdpbiIgfQogICAgICAgICAgICAg ICAgICAgXSwKIAogICAgICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJl bGVhc2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwt cmVsZWFzZSIsCkBAIC03NCwxMyArNzYsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgICAibmFt ZSI6ICJRdCBMaW51eCBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGRBbmRUZXN0IiwgImJ1aWxkZGly IjogInF0LWxpbnV4LXJlbGVhc2UiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6 ICJxdCIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4 NiJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJzemVnZWQtbGludXgt MSJdCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBlIjog IkJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLXdpbi1yZWxlYXNlIiwKKyAgICAgICAgICAg ICAgICAgICAgICAicGxhdGZvcm0iOiAiY2hyb21pdW0td2luIiwgImNvbmZpZ3VyYXRpb24iOiAi cmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCisgICAgICAgICAgICAgICAgICAg ICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1zbGF2ZS0xIl0KICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgICAgXSwKIAogICAgICJzY2hlZHVsZXJzIjogWyB7ICJ0eXBlIjog IkFueUJyYW5jaFNjaGVkdWxlciIsICJuYW1lIjogInRydW5rIiwgImJyYW5jaGVzIjogWyJ0cnVu ayJdLCAidHJlZVN0YWJsZVRpbWVyIjogNDUuMCwKICAgICAgICAgICAgICAgICAgICAgICAiYnVp bGRlck5hbWVzIjogWyJUaWdlciBJbnRlbCBSZWxlYXNlIiwgIkxlb3BhcmQgSW50ZWwgUmVsZWFz ZSAoQnVpbGQpIiwgIkxlb3BhcmQgSW50ZWwgRGVidWcgKEJ1aWxkKSIsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiV2luZG93cyBSZWxlYXNlIChCdWlsZCkiLCAiV2lu ZG93cyBEZWJ1ZyAoQnVpbGQpIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJHVEsgTGludXggUmVsZWFzZSIsICJRdCBMaW51eCBSZWxlYXNlIl0KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJHVEsgTGludXggUmVsZWFzZSIsICJRdCBMaW51 eCBSZWxlYXNlIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDaHJv bWl1bSBXaW4gUmVsZWFzZSJdCiAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAg ICAgICAgIHsgInR5cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFtZSI6ICJsZW9wYXJkLWludGVsLXJl bGVhc2UtdGVzdHMiLAogICAgICAgICAgICAgICAgICAgICAgICJidWlsZGVyTmFtZXMiOiBbIkxl b3BhcmQgSW50ZWwgUmVsZWFzZSAoVGVzdHMpIl0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcgYi9XZWJL aXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIu Y2ZnCmluZGV4IDRkOTI0MzYuLmUxYWVkOTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKKysrIGIvV2Vi S2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVy LmNmZwpAQCAtNDcsNiArNDcsNDUgQEAgY2xhc3MgQ2hlY2tPdXRTb3VyY2Uoc291cmNlLlNWTik6 CiAgICAgICAgIHNvdXJjZS5TVk4uX19pbml0X18oc2VsZiwgYmFzZVVSTD1zZWxmLmJhc2VVUkws IGRlZmF1bHRCcmFuY2g9InRydW5rIiwgbW9kZT1zZWxmLm1vZGUsICphcmdzLCAqKmt3YXJncykK IAogCisjIEZJWE1FOiBSZW1vdmUgdGhpcyBzdGVwIG9uY2UgQ2hyb21pdW0gV2ViS2l0IHBvcnQg YnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCisjIENocm9taXVtIChodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCitjbGFzcyBVcGRhdGVDaHJvbWl1bVNv dXJjZShzaGVsbC5TaGVsbENvbW1hbmQpOgorICAgIGNvbW1hbmQgPSBbImdjbGllbnQiLCAic3lu YyJdCisgICAgbmFtZSA9ICJ1cGRhdGUtY2hyb21pdW0iCisgICAgZGVzY3JpcHRpb24gPSBbInVw ZGF0aW5nIGNocm9taXVtIHNvdXJjZSJdCisgICAgZGVzY3JpcHRpb25Eb25lID0gWyJ1cGRhdGVk IGNocm9taXVtIHNvdXJjZSJdCisgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKKworICAgIGRlZiBz dGFydChzZWxmKToKKyAgICAgICAgb3MgPSBzZWxmLmdldFByb3BlcnR5KCJmdWxsUGxhdGZvcm0i KS5zcGxpdCgnLScpWzFdCisgICAgICAgIGlmIG9zID09ICJ3aW4iOgorICAgICAgICAgICAgc2Vs Zi5zZXRDb21tYW5kKFsiZ2NsaWVudC5iYXQiLCAic3luYyJdKQorICAgICAgICByZXR1cm4gc2hl bGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCisKKworIyBGSVhNRTogUmVtb3ZlIHRoaXMgc3Rl cCBvbmNlIENocm9taXVtIFdlYktpdCBwb3J0IGJ1aWxkIHN5c3RlbSBpcyBkZWNvdXBsZWQgZnJv bQorIyBDaHJvbWl1bSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4 Mzk2KQorY2xhc3MgQ29tcGlsZUNocm9taXVtV2ViS2l0KHNoZWxsLlNoZWxsQ29tbWFuZCk6Cisg ICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4uLy4uLy4uL3NjcmlwdHMvc2xhdmUvY29tcGlsZS5w eSJdCisgICAgbmFtZSA9ICJidWlsZC1jaHJvbWl1bSIKKyAgICBkZXNjcmlwdGlvbiA9IFsiY29t cGlsaW5nIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImNvbXBpbGVkIl0KKyAgICBoYWx0T25G YWlsdXJlID0gVHJ1ZQorCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBvcyA9IHNlbGYu Z2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KKyAgICAgICAgY29tbWFu ZCA9IHNlbGYuY29tbWFuZAorICAgICAgICBpZiBub3Qgc2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNp b24iKToKKyAgICAgICAgICAgICMgQnVpbGRib3Qgd2lsbCBzZXQgcmV2aXNpb24gdG8gTm9uZSB3 aGVuIGEgYnVpbGQgaXMgZm9yY2VkLiBVc2UgaXQKKyAgICAgICAgICAgICMgYXMgYSBzaWduYWwg dG8gY2xvYmJlci4KKyAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLWNsb2JiZXIiKQorICAg ICAgICBpZiBvcyA9PSAid2luIjoKKyAgICAgICAgICAgIGNvbW1hbmQuZXh0ZW5kKFsiLS1zb2x1 dGlvbj13ZWJraXQuc2xuIiwgIi0tYnVpbGQtZGlyPXNyY1x3ZWJraXQiLCAiLS0iLCAiL3Byb2pl Y3QiLCAid2ViY29yZSJdKQorICAgICAgICBlbGlmIG9zID09ICJtYWMiOgorICAgICAgICAgICAg Y29tbWFuZC5leHRlbmQoWyItLXNvbHV0aW9uPV9fc29sdXRpb25fXyIsICItLWJ1aWxkLWRpcj1z cmMvYnVpbGQiLCAiLS0iLCAiLXByb2plY3QiLCAiLi4vd2Via2l0L3dlYmtpdC54Y29kZXByb2oi LCAiLXRhcmdldCIsICJ3ZWJjb3JlIl0pCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1h bmQuc3RhcnQoc2VsZikKKworCiBjbGFzcyBJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMoc2hlbGwu Q29tcGlsZSk6CiAgICAgZGVzY3JpcHRpb24gPSBbImluc3RhbGxpbmcgZGVwZW5kZW5jaWVzIl0K ICAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImluc3RhbGxlZCBkZXBlbmRlbmNpZXMiXQpAQCAtMjU3 LDYgKzI5NiwxNSBAQCBjbGFzcyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAg ICAgaWYgcGxhdGZvcm0gPT0gIndpbiI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5zdGFs bFdpbjMyRGVwZW5kZW5jaWVzKQogCisjIEZJWE1FOiBSZW1vdmUgdGhpcyBmYWN0b3J5IG9uY2Ug Q2hyb21pdW0gV2ViS2l0IHBvcnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCisjIENo cm9taXVtIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCitj bGFzcyBDaHJvbWl1bUJ1aWxkRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzKToK KyAgICAgICAgZmFjdG9yeS5CdWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKKyAgICAgICAgc2Vs Zi5hZGRTdGVwKENvbmZpZ3VyZUJ1aWxkLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJhdGlv bj1jb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmU9IiAiLmpvaW4oYXJjaGl0ZWN0dXJlcyksIGJ1 aWxkT25seT1UcnVlKQorICAgICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlQ2hyb21pdW1Tb3VyY2Up CisgICAgICAgIHNlbGYuYWRkU3RlcChDb21waWxlQ2hyb21pdW1XZWJLaXQpCisKIGNsYXNzIEJ1 aWxkRmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNv bmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIHRyaWdnZXJzKToKICAgICAgICAgRmFjdG9yeS5f X2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgVHJ1 ZSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5n ZUxvZwppbmRleCBiYjFjYzFkLi5jZWI3NDZlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDkt MDgtMTcgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY2FuYXJ5LXN0eWxl IENocm9taXVtIFdlYktpdCBidWlsZCBzbGF2ZSB0byB0aGUgd2F0ZXJmYWxsLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg0MDAKKworICAgICAgICAq IEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOiBB ZGRlZCBvbmUgQ2hyb21pdW0vV2luZG93cyBzbGF2ZQorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBw b3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6IEFkZGVkIHN1cHBvcnQgZm9y IENocm9taXVtIHNsYXZlIGNvbW1hbmRzLgorCiAyMDA5LTA4LTE0ICBFcmljIFNlaWRlbCAgPGVy aWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBObyByZXZpZXcuICBGaXggNS1zcGFjZSBpbmRlbnQg dG8gYmUgNC1zcGFjZXMuCg== 35083 2009-08-18 15:28:08 -0700 2009-08-18 19:13:50 -0700 Add canary-style Chromium build slave, v3. Add-canary-style-Chromium-build-slave-v3..patch text/plain 6211 dglazkov ODJhMjBkODQ4MjY4ZjFlMWI3OGI2YjRmYmVkZWE4NjRhN2RkMTMwYwpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24gYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9jb25maWcuanNvbgppbmRleCBiNjUwYjRjLi42YjlkZDNkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcu anNvbgorKysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbgpAQCAtMTYsNyArMTYsOSBAQAogCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiZ3RrLWxpbnV4LXNsYXZlLTEiLCAicGxhdGZvcm0iOiAiZ3RrIn0sCiAK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzemVnZWQtbGludXgtMSIsICJwbGF0Zm9y bSI6ICJxdCJ9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3plZ2VkLWxpbnV4LTEi LCAicGxhdGZvcm0iOiAicXQifSwKKworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdv b2dsZS1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImNocm9taXVtLXdpbiIgfQogICAgICAgICAgICAg ICAgICAgXSwKIAogICAgICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJl bGVhc2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwt cmVsZWFzZSIsCkBAIC03NCwxMyArNzYsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgICAibmFt ZSI6ICJRdCBMaW51eCBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGRBbmRUZXN0IiwgImJ1aWxkZGly IjogInF0LWxpbnV4LXJlbGVhc2UiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6 ICJxdCIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4 NiJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJzemVnZWQtbGludXgt MSJdCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBlIjog IkNocm9taXVtQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAorICAg ICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJh dGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAg ICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXNsYXZlLTEiXQogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICBdLAogCiAgICAgInNjaGVkdWxlcnMiOiBbIHsg InR5cGUiOiAiQW55QnJhbmNoU2NoZWR1bGVyIiwgIm5hbWUiOiAidHJ1bmsiLCAiYnJhbmNoZXMi OiBbInRydW5rIl0sICJ0cmVlU3RhYmxlVGltZXIiOiA0NS4wLAogICAgICAgICAgICAgICAgICAg ICAgICJidWlsZGVyTmFtZXMiOiBbIlRpZ2VyIEludGVsIFJlbGVhc2UiLCAiTGVvcGFyZCBJbnRl bCBSZWxlYXNlIChCdWlsZCkiLCAiTGVvcGFyZCBJbnRlbCBEZWJ1ZyAoQnVpbGQpIiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXaW5kb3dzIFJlbGVhc2UgKEJ1aWxk KSIsICJXaW5kb3dzIERlYnVnIChCdWlsZCkiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkdUSyBMaW51eCBSZWxlYXNlIiwgIlF0IExpbnV4IFJlbGVhc2UiXQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkdUSyBMaW51eCBSZWxlYXNlIiwg IlF0IExpbnV4IFJlbGVhc2UiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIl0KICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAidHlwZSI6ICJUcmlnZ2VyYWJsZSIsICJuYW1lIjogImxlb3BhcmQt aW50ZWwtcmVsZWFzZS10ZXN0cyIsCiAgICAgICAgICAgICAgICAgICAgICAgImJ1aWxkZXJOYW1l cyI6IFsiTGVvcGFyZCBJbnRlbCBSZWxlYXNlIChUZXN0cykiXQpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNm ZyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKaW5kZXggNGQ5MjQzNi4uNmFkOTE0MyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwor KysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9tYXN0ZXIuY2ZnCkBAIC00Nyw2ICs0Nyw0OCBAQCBjbGFzcyBDaGVja091dFNvdXJjZShzb3Vy Y2UuU1ZOKToKICAgICAgICAgc291cmNlLlNWTi5fX2luaXRfXyhzZWxmLCBiYXNlVVJMPXNlbGYu YmFzZVVSTCwgZGVmYXVsdEJyYW5jaD0idHJ1bmsiLCBtb2RlPXNlbGYubW9kZSwgKmFyZ3MsICoq a3dhcmdzKQogCiAKKyMgRklYTUU6IFJlbW92ZSB0aGlzIHN0ZXAgb25jZSBDaHJvbWl1bSBXZWJL aXQgcG9ydCBidWlsZCBzeXN0ZW0gaXMgZGVjb3VwbGVkIGZyb20KKyMgQ2hyb21pdW0gKGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODM5NikKK2NsYXNzIFVwZGF0ZUNo cm9taXVtU291cmNlKHNoZWxsLlNoZWxsQ29tbWFuZCk6CisgICAgY29tbWFuZCA9IFsiZ2NsaWVu dCIsICJzeW5jIl0KKyAgICBuYW1lID0gInVwZGF0ZS1jaHJvbWl1bSIKKyAgICBkZXNjcmlwdGlv biA9IFsidXBkYXRpbmcgY2hyb21pdW0gc291cmNlIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBb InVwZGF0ZWQgY2hyb21pdW0gc291cmNlIl0KKyAgICBoYWx0T25GYWlsdXJlID0gVHJ1ZQorCisg ICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBvcyA9IHNlbGYuZ2V0UHJvcGVydHkoImZ1bGxQ bGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KKyAgICAgICAgaWYgb3MgPT0gIndpbiI6CisgICAgICAg ICAgICBzZWxmLmNvbW1hbmRbMF0gPSAiZ2NsaWVudC5iYXQiCisgICAgICAgIHJldmlzaW9uID0g c2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNpb24iKQorICAgICAgICBpZiByZXZpc2lvbjoKKyAgICAg ICAgICAgIHNlbGYuY29tbWFuZC5hcHBlbmQoIi0tcmV2aXNpb249c3JjL3RoaXJkX3BhcnR5L1dl YktpdEAiICsgcmV2aXNpb24pCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3Rh cnQoc2VsZikKKworCisjIEZJWE1FOiBSZW1vdmUgdGhpcyBzdGVwIG9uY2UgQ2hyb21pdW0gV2Vi S2l0IHBvcnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCisjIENocm9taXVtIChodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCitjbGFzcyBDb21waWxl Q2hyb21pdW1XZWJLaXQoc2hlbGwuU2hlbGxDb21tYW5kKToKKyAgICBjb21tYW5kID0gWyJweXRo b24iLCAiLi4vLi4vLi4vc2NyaXB0cy9zbGF2ZS9jb21waWxlLnB5Il0KKyAgICBuYW1lID0gImJ1 aWxkLWNocm9taXVtIgorICAgIGRlc2NyaXB0aW9uID0gWyJjb21waWxpbmciXQorICAgIGRlc2Ny aXB0aW9uRG9uZSA9IFsiY29tcGlsZWQiXQorICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCisKKyAg ICBkZWYgc3RhcnQoc2VsZik6CisgICAgICAgIG9zID0gc2VsZi5nZXRQcm9wZXJ0eSgiZnVsbFBs YXRmb3JtIikuc3BsaXQoJy0nKVsxXQorICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kCisg ICAgICAgIGlmIG5vdCBzZWxmLmdldFByb3BlcnR5KCJyZXZpc2lvbiIpOgorICAgICAgICAgICAg IyBCdWlsZGJvdCB3aWxsIHNldCByZXZpc2lvbiB0byBOb25lIHdoZW4gYSBidWlsZCBpcyBmb3Jj ZWQuIFVzZSBpdAorICAgICAgICAgICAgIyBhcyBhIHNpZ25hbCB0byBjbG9iYmVyLgorICAgICAg ICAgICAgY29tbWFuZC5hcHBlbmQoIi0tY2xvYmJlciIpCisgICAgICAgIGlmIG9zID09ICJ3aW4i OgorICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyItLXNvbHV0aW9uPXdlYmtpdC5zbG4iLCAi LS1idWlsZC1kaXI9c3JjXFx3ZWJraXQiLCAiLS0iLCAiL3Byb2plY3QiLCAid2ViY29yZSJdKQor ICAgICAgICBlbGlmIG9zID09ICJtYWMiOgorICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyIt LXNvbHV0aW9uPV9fc29sdXRpb25fXyIsICItLWJ1aWxkLWRpcj1zcmMvYnVpbGQiLCAiLS0iLCAi LXByb2plY3QiLCAiLi4vd2Via2l0L3dlYmtpdC54Y29kZXByb2oiLCAiLXRhcmdldCIsICJ3ZWJj b3JlIl0pCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKKwor CiBjbGFzcyBJbnN0YWxsV2luMzJEZXBlbmRlbmNpZXMoc2hlbGwuQ29tcGlsZSk6CiAgICAgZGVz Y3JpcHRpb24gPSBbImluc3RhbGxpbmcgZGVwZW5kZW5jaWVzIl0KICAgICBkZXNjcmlwdGlvbkRv bmUgPSBbImluc3RhbGxlZCBkZXBlbmRlbmNpZXMiXQpAQCAtMjU3LDYgKzI5OSwxNSBAQCBjbGFz cyBGYWN0b3J5KGZhY3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgaWYgcGxhdGZvcm0gPT0g IndpbiI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAoSW5zdGFsbFdpbjMyRGVwZW5kZW5jaWVz KQogCisjIEZJWE1FOiBSZW1vdmUgdGhpcyBmYWN0b3J5IG9uY2UgQ2hyb21pdW0gV2ViS2l0IHBv cnQgYnVpbGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCisjIENocm9taXVtIChodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCitjbGFzcyBDaHJvbWl1bUJ1aWxk RmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBs YXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzKToKKyAgICAgICAgZmFjdG9yeS5C dWlsZEZhY3RvcnkuX19pbml0X18oc2VsZikKKyAgICAgICAgc2VsZi5hZGRTdGVwKENvbmZpZ3Vy ZUJ1aWxkLCBwbGF0Zm9ybT1wbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1jb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmU9IiAiLmpvaW4oYXJjaGl0ZWN0dXJlcyksIGJ1aWxkT25seT1UcnVlKQorICAg ICAgICBzZWxmLmFkZFN0ZXAoVXBkYXRlQ2hyb21pdW1Tb3VyY2UpCisgICAgICAgIHNlbGYuYWRk U3RlcChDb21waWxlQ2hyb21pdW1XZWJLaXQpCisKIGNsYXNzIEJ1aWxkRmFjdG9yeShGYWN0b3J5 KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hp dGVjdHVyZXMsIHRyaWdnZXJzKToKICAgICAgICAgRmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0 Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgVHJ1ZSkKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBiYjFjYzFk Li5jZWI3NDZlIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDgtMTcgIERpbWl0cmkgR2xh emtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY2FuYXJ5LXN0eWxlIENocm9taXVtIFdlYktpdCBi dWlsZCBzbGF2ZSB0byB0aGUgd2F0ZXJmYWxsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjg0MDAKKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL2NvbmZpZy5qc29uOiBBZGRlZCBvbmUgQ2hyb21pdW0v V2luZG93cyBzbGF2ZQorICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL21hc3Rlci5jZmc6IEFkZGVkIHN1cHBvcnQgZm9yIENocm9taXVtIHNsYXZlIGNv bW1hbmRzLgorCiAyMDA5LTA4LTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAog ICAgICAgICBObyByZXZpZXcuICBGaXggNS1zcGFjZSBpbmRlbnQgdG8gYmUgNC1zcGFjZXMuCg== 35158 2009-08-19 16:39:16 -0700 2009-08-26 12:40:00 -0700 Add canary-style Chromium build slave, v4. Add-canary-style-Chromium-build-slave-v4..patch text/plain 6977 dglazkov OTYyNzdmMmJlYWYzY2FhOWI0YWUyN2RlY2E2NDc3MmMzOWI0ZWU1ZgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24gYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9jb25maWcuanNvbgppbmRleCBiNjUwYjRjLi42YjlkZDNkIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcu anNvbgorKysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9jb25maWcuanNvbgpAQCAtMTYsNyArMTYsOSBAQAogCiAgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiZ3RrLWxpbnV4LXNsYXZlLTEiLCAicGxhdGZvcm0iOiAiZ3RrIn0sCiAK LSAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzemVnZWQtbGludXgtMSIsICJwbGF0Zm9y bSI6ICJxdCJ9CisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic3plZ2VkLWxpbnV4LTEi LCAicGxhdGZvcm0iOiAicXQifSwKKworICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdv b2dsZS1zbGF2ZS0xIiwgInBsYXRmb3JtIjogImNocm9taXVtLXdpbiIgfQogICAgICAgICAgICAg ICAgICAgXSwKIAogICAgICJidWlsZGVycyI6ICAgWyB7ICJuYW1lIjogIlRpZ2VyIEludGVsIFJl bGVhc2UiLCAidHlwZSI6ICJCdWlsZEFuZFRlc3QiLCAiYnVpbGRkaXIiOiAidGlnZXItaW50ZWwt cmVsZWFzZSIsCkBAIC03NCwxMyArNzYsMTkgQEAKICAgICAgICAgICAgICAgICAgICAgICAibmFt ZSI6ICJRdCBMaW51eCBSZWxlYXNlIiwgInR5cGUiOiAiQnVpbGRBbmRUZXN0IiwgImJ1aWxkZGly IjogInF0LWxpbnV4LXJlbGVhc2UiLAogICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6 ICJxdCIsICJjb25maWd1cmF0aW9uIjogInJlbGVhc2UiLCAiYXJjaGl0ZWN0dXJlcyI6IFsiaTM4 NiJdLAogICAgICAgICAgICAgICAgICAgICAgICJzbGF2ZW5hbWVzIjogWyJzemVnZWQtbGludXgt MSJdCisgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICAgICAgICAibmFtZSI6ICJDaHJvbWl1bSBXaW4gUmVsZWFzZSIsICJ0eXBlIjog IkNocm9taXVtQnVpbGQiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0td2luLXJlbGVhc2UiLAorICAg ICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS13aW4iLCAiY29uZmlndXJh dGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKKyAgICAgICAgICAg ICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLXNsYXZlLTEiXQogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgICBdLAogCiAgICAgInNjaGVkdWxlcnMiOiBbIHsg InR5cGUiOiAiQW55QnJhbmNoU2NoZWR1bGVyIiwgIm5hbWUiOiAidHJ1bmsiLCAiYnJhbmNoZXMi OiBbInRydW5rIl0sICJ0cmVlU3RhYmxlVGltZXIiOiA0NS4wLAogICAgICAgICAgICAgICAgICAg ICAgICJidWlsZGVyTmFtZXMiOiBbIlRpZ2VyIEludGVsIFJlbGVhc2UiLCAiTGVvcGFyZCBJbnRl bCBSZWxlYXNlIChCdWlsZCkiLCAiTGVvcGFyZCBJbnRlbCBEZWJ1ZyAoQnVpbGQpIiwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJXaW5kb3dzIFJlbGVhc2UgKEJ1aWxk KSIsICJXaW5kb3dzIERlYnVnIChCdWlsZCkiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkdUSyBMaW51eCBSZWxlYXNlIiwgIlF0IExpbnV4IFJlbGVhc2UiXQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkdUSyBMaW51eCBSZWxlYXNlIiwg IlF0IExpbnV4IFJlbGVhc2UiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIkNocm9taXVtIFdpbiBSZWxlYXNlIl0KICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAidHlwZSI6ICJUcmlnZ2VyYWJsZSIsICJuYW1lIjogImxlb3BhcmQt aW50ZWwtcmVsZWFzZS10ZXN0cyIsCiAgICAgICAgICAgICAgICAgICAgICAgImJ1aWxkZXJOYW1l cyI6IFsiTGVvcGFyZCBJbnRlbCBSZWxlYXNlIChUZXN0cykiXQpkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNm ZyBiL1dlYktpdFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L21hc3Rlci5jZmcKaW5kZXggNGQ5MjQzNi4uNWFmMDY5OCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwor KysgYi9XZWJLaXRUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZp Zy9tYXN0ZXIuY2ZnCkBAIC0xNCw2ICsxNCw3IEBAIGZyb20gYnVpbGRib3Quc3RhdHVzLmJ1aWxk ZXIgaW1wb3J0IFNVQ0NFU1MsIEZBSUxVUkUsIFdBUk5JTkdTLCBTS0lQUEVECiBmcm9tIHR3aXN0 ZWQuaW50ZXJuZXQgaW1wb3J0IGRlZmVyCiAKIGltcG9ydCBzaW1wbGVqc29uCitpbXBvcnQgcmUK IAogV2l0aFByb3BlcnRpZXMgPSBwcm9wZXJ0aWVzLldpdGhQcm9wZXJ0aWVzCiAKQEAgLTQ3LDYg KzQ4LDU5IEBAIGNsYXNzIENoZWNrT3V0U291cmNlKHNvdXJjZS5TVk4pOgogICAgICAgICBzb3Vy Y2UuU1ZOLl9faW5pdF9fKHNlbGYsIGJhc2VVUkw9c2VsZi5iYXNlVVJMLCBkZWZhdWx0QnJhbmNo PSJ0cnVuayIsIG1vZGU9c2VsZi5tb2RlLCAqYXJncywgKiprd2FyZ3MpCiAKIAorIyBGSVhNRTog UmVtb3ZlIHRoaXMgc3RlcCBvbmNlIENocm9taXVtIFdlYktpdCBwb3J0IGJ1aWxkIHN5c3RlbSBp cyBkZWNvdXBsZWQgZnJvbQorIyBDaHJvbWl1bSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTI4Mzk2KQorY2xhc3MgVXBkYXRlQ2hyb21pdW1Tb3VyY2Uoc2hlbGwuU2hl bGxDb21tYW5kKToKKyAgICBjb21tYW5kID0gWyJnY2xpZW50IiwgInN5bmMiXQorICAgIG5hbWUg PSAidXBkYXRlLWNocm9taXVtIgorICAgIGRlc2NyaXB0aW9uID0gWyJ1cGRhdGluZyBjaHJvbWl1 bSBzb3VyY2UiXQorICAgIGRlc2NyaXB0aW9uRG9uZSA9IFsidXBkYXRlZCJdCisgICAgaGFsdE9u RmFpbHVyZSA9IFRydWUKKworICAgIGRlZiBjcmVhdGVTdW1tYXJ5KHNlbGYsIGxvZyk6CisgICAg ICAgIHNjcmFwZXIgPSByZS5jb21waWxlKHIiXl9fX19fX19fIHJ1bm5pbmcgJ1teXG5dK3RoaXJk X3BhcnR5Wy9cXF1XZWJLaXRbXlxuXSskXG4oPzpeW1VBXVxXK1teXG5dKyRcbikqXig/OlVwZGF0 ZWQgdG98QXQpIHJldmlzaW9uIChcZCspIiwgcmUuRE9UQUxMIHwgcmUuTVVMVElMSU5FKQorICAg ICAgICByZXZzID0gc2NyYXBlci5maW5kYWxsKGxvZy5nZXRUZXh0KCkpCisgICAgICAgIGdvdF9y ZXZpc2lvbiA9ICI/PyIgIyBUaGlzIG1hdGNoZXMgU1ZOIHVua25vd24gcmV2aXNpb24gcmVzcG9u c2UKKyAgICAgICAgaWYgbGVuKHJldnMpOgorICAgICAgICAgICAgZ290X3JldmlzaW9uID0gKCJy JXMiICUgcmV2c1stMV0pCisgICAgICAgIHNlbGYuZGVzY3JpcHRpb25Eb25lID0gWyJ1cGRhdGVk IiwgZ290X3JldmlzaW9uXQorCisgICAgZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBvcyA9IHNl bGYuZ2V0UHJvcGVydHkoImZ1bGxQbGF0Zm9ybSIpLnNwbGl0KCctJylbMV0KKyAgICAgICAgaWYg b3MgPT0gIndpbiI6CisgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoWyJnY2xpZW50LmJhdCIs ICJzeW5jIl0pCisgICAgICAgIHJldmlzaW9uID0gc2VsZi5nZXRQcm9wZXJ0eSgicmV2aXNpb24i KQorICAgICAgICBpZiByZXZpc2lvbjoKKyAgICAgICAgICAgIGNvbW1hbmQgPSBzZWxmLmNvbW1h bmRbOl0KKyAgICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKCItLXJldmlzaW9uPXNyYy90aGlyZF9w YXJ0eS9XZWJLaXRAIiArIHJldmlzaW9uKQorICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKGNv bW1hbmQpCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQuc3RhcnQoc2VsZikKKwor CisjIEZJWE1FOiBSZW1vdmUgdGhpcyBzdGVwIG9uY2UgQ2hyb21pdW0gV2ViS2l0IHBvcnQgYnVp bGQgc3lzdGVtIGlzIGRlY291cGxlZCBmcm9tCisjIENocm9taXVtIChodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgzOTYpCitjbGFzcyBDb21waWxlQ2hyb21pdW1XZWJL aXQoc2hlbGwuU2hlbGxDb21tYW5kKToKKyAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi4vLi4v Li4vc2NyaXB0cy9zbGF2ZS9jb21waWxlLnB5Il0KKyAgICBuYW1lID0gImJ1aWxkLWNocm9taXVt IgorICAgIGRlc2NyaXB0aW9uID0gWyJjb21waWxpbmciXQorICAgIGRlc2NyaXB0aW9uRG9uZSA9 IFsiY29tcGlsZWQiXQorICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCisKKyAgICBkZWYgc3RhcnQo c2VsZik6CisgICAgICAgIG9zID0gc2VsZi5nZXRQcm9wZXJ0eSgiZnVsbFBsYXRmb3JtIikuc3Bs aXQoJy0nKVsxXQorICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kWzpdCisgICAgICAgIGlm IG5vdCBzZWxmLmdldFByb3BlcnR5KCJyZXZpc2lvbiIpOgorICAgICAgICAgICAgIyBCdWlsZGJv dCB3aWxsIHNldCByZXZpc2lvbiB0byBOb25lIHdoZW4gYSBidWlsZCBpcyBmb3JjZWQuIFVzZSBp dAorICAgICAgICAgICAgIyBhcyBhIHNpZ25hbCB0byBjbG9iYmVyLgorICAgICAgICAgICAgY29t bWFuZC5hcHBlbmQoIi0tY2xvYmJlciIpCisgICAgICAgIGlmIG9zID09ICJ3aW4iOgorICAgICAg ICAgICAgY29tbWFuZC5leHRlbmQoWyItLXNvbHV0aW9uPXdlYmtpdC5zbG4iLCAiLS1idWlsZC1k aXI9c3JjXFx3ZWJraXQiLCAiLS0iLCAiL3Byb2plY3QiLCAid2ViY29yZSJdKQorICAgICAgICBl bGlmIG9zID09ICJtYWMiOgorICAgICAgICAgICAgY29tbWFuZC5leHRlbmQoWyItLXNvbHV0aW9u PV9fc29sdXRpb25fXyIsICItLWJ1aWxkLWRpcj1zcmMvYnVpbGQiLCAiLS0iLCAiLXByb2plY3Qi LCAiLi4vd2Via2l0L3dlYmtpdC54Y29kZXByb2oiLCAiLXRhcmdldCIsICJ3ZWJjb3JlIl0pCisg ICAgICAgIHNlbGYuc2V0Q29tbWFuZChjb21tYW5kKQorICAgICAgICByZXR1cm4gc2hlbGwuU2hl bGxDb21tYW5kLnN0YXJ0KHNlbGYpCisKKwogY2xhc3MgSW5zdGFsbFdpbjMyRGVwZW5kZW5jaWVz KHNoZWxsLkNvbXBpbGUpOgogICAgIGRlc2NyaXB0aW9uID0gWyJpbnN0YWxsaW5nIGRlcGVuZGVu Y2llcyJdCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWyJpbnN0YWxsZWQgZGVwZW5kZW5jaWVzIl0K QEAgLTI1Nyw2ICszMTEsMTUgQEAgY2xhc3MgRmFjdG9yeShmYWN0b3J5LkJ1aWxkRmFjdG9yeSk6 CiAgICAgICAgIGlmIHBsYXRmb3JtID09ICJ3aW4iOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVw KEluc3RhbGxXaW4zMkRlcGVuZGVuY2llcykKIAorIyBGSVhNRTogUmVtb3ZlIHRoaXMgZmFjdG9y eSBvbmNlIENocm9taXVtIFdlYktpdCBwb3J0IGJ1aWxkIHN5c3RlbSBpcyBkZWNvdXBsZWQgZnJv bQorIyBDaHJvbWl1bSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4 Mzk2KQorY2xhc3MgQ2hyb21pdW1CdWlsZEZhY3RvcnkoZmFjdG9yeS5CdWlsZEZhY3RvcnkpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0 dXJlcyk6CisgICAgICAgIGZhY3RvcnkuQnVpbGRGYWN0b3J5Ll9faW5pdF9fKHNlbGYpCisgICAg ICAgIHNlbGYuYWRkU3RlcChDb25maWd1cmVCdWlsZCwgcGxhdGZvcm09cGxhdGZvcm0sIGNvbmZp Z3VyYXRpb249Y29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlPSIgIi5qb2luKGFyY2hpdGVjdHVy ZXMpLCBidWlsZE9ubHk9VHJ1ZSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKFVwZGF0ZUNocm9taXVt U291cmNlKQorICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZUNocm9taXVtV2ViS2l0KQorCiBj bGFzcyBCdWlsZEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBsYXRm b3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCB0cmlnZ2Vycyk6CiAgICAgICAgIEZh Y3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVy ZXMsIFRydWUpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKaW5kZXggYmIxY2MxZC4uY2ViNzQ2ZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDA5LTA4LTE3ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGNhbmFy eS1zdHlsZSBDaHJvbWl1bSBXZWJLaXQgYnVpbGQgc2xhdmUgdG8gdGhlIHdhdGVyZmFsbC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4NDAwCisKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcu anNvbjogQWRkZWQgb25lIENocm9taXVtL1dpbmRvd3Mgc2xhdmUKKyAgICAgICAgKiBCdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOiBBZGRlZCBzdXBw b3J0IGZvciBDaHJvbWl1bSBzbGF2ZSBjb21tYW5kcy4KKwogMjAwOS0wOC0xNCAgRXJpYyBTZWlk ZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTm8gcmV2aWV3LiAgRml4IDUtc3BhY2Ug aW5kZW50IHRvIGJlIDQtc3BhY2VzLgo=