Changeset 92191 in webkit

Timestamp:

Aug 2, 2011 8:25:33 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

CSS Regions build bot should archive and upload output files
​https://bugs.webkit.org/show_bug.cgi?id=65200

Until now the buildbots would only upload the result archive if the 'trigger' parameters was specified. The
upload was needed, because the testbots needed to download and use the archive. For CSS Regions we don't have
a testbot yet, but we want to save the archive on the server for manual testing. Added new parameter
in config.json, called "upload" that when set to "true" will force the upload to the buildmaster server.

The "features" argument is now taken into account when determining the name of the archive on the server. That
was needed in order to avoid the CSS Regions Mac buildbot overwrite the SnowLeopard Mac build.

Patch by Alexandru Chiculita <Alexandru Chiculita> on 2011-08-02
Reviewed by Adam Roben.

• BuildSlaveSupport/build.webkit.org-config/config.json:
• BuildSlaveSupport/build.webkit.org-config/master.cfg:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/config.json (modified) (1 diff)
• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (4 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

@@ -260 +260 @@
                     { "name": "CSSRegions SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "cssregions-snowleopard-intel-release",
                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"], "features": ["css-regions", "css-exclusions"],
+                      "upload": true,
                       "slavenames": ["adobe-mac-slave1"]
                     }

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -132 +132 @@
 class UploadBuiltProduct(transfer.FileUpload):
     slavesrc = WithProperties("WebKitBuild/%(configuration)s.zip")
-    masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(got_revision)s.zip")
+    masterdest = WithProperties("archives/%(fullPlatform)s-%(architecture)s-%(configuration)s%(extraFeatures)s/%(got_revision)s.zip",
+                                extraFeatures=lambda properties: UploadBuiltProduct.determineExtraFeatures(properties))
     haltOnFailure = True
 
     def __init__(self):
         transfer.FileUpload.__init__(self, self.slavesrc, self.masterdest, mode=0644)
+
+    @staticmethod
+    def determineExtraFeatures(properties):
+        if not properties.hasProperty("features"):
+            return ''
+        features = properties.getProperty("features")
+        if not len(features):
+            return ''
+        result = '-with-' + '-and-'.join(features)
+        # Just to make sure no feature will add invalid chars, we allow only letters here.
+        result = re.sub('[^a-zA-Z]', '-', result)
+        return result
 
 
@@ -592 +605 @@
 
 class Factory(factory.BuildFactory):
-    def __init__(self, platform, configuration, architectures, buildOnly, features=None):
+    def __init__(self, platform, configuration, architectures, buildOnly, features=None, **kwargs):
         factory.BuildFactory.__init__(self)
         self.addStep(ConfigureBuild, platform=platform, configuration=configuration, architecture=" ".join(architectures), buildOnly=buildOnly, features=features)
@@ -604 +617 @@
 
 class BuildFactory(Factory):
-    def __init__(self, platform, configuration, architectures, triggers=None, **kwargs):
+    def __init__(self, platform, configuration, architectures, triggers=None, upload=False, **kwargs):
         Factory.__init__(self, platform, configuration, architectures, True, **kwargs)
         self.addStep(CompileWebKit)
-        if triggers:
+        if triggers or upload:
             self.addStep(ArchiveBuiltProduct)
             self.addStep(UploadBuiltProduct)
+        if triggers:
             self.addStep(trigger.Trigger, schedulerNames=triggers)
 
@@ -726 +740 @@
 
         factoryKwArgs = {
-            "features": builder.pop("features", [])
+            "features": builder.pop("features", []),
+            "upload": builder.pop("upload", False)
         }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-02  Alexandru Chiculita  <achicu@adobe.com>
+
+        CSS Regions build bot should archive and upload output files
+        https://bugs.webkit.org/show_bug.cgi?id=65200
+
+        Until now the buildbots would only upload the result archive if the 'trigger' parameters was specified. The
+        upload was needed, because the testbots needed to download and use the archive. For CSS Regions we don't have
+        a testbot yet, but we want to save the archive on the server for manual testing. Added new parameter
+        in config.json, called "upload" that when set to "true" will force the upload to the buildmaster server.
+
+        The "features" argument is now taken into account when determining the name of the archive on the server. That
+        was needed in order to avoid the CSS Regions Mac buildbot overwrite the SnowLeopard Mac build.
+
+        Reviewed by Adam Roben.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
 2011-08-02  Patrick Gansterer  <paroga@webkit.org>