Changeset 244532 in webkit

Timestamp:

Apr 22, 2019 5:16:48 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Trigger queues only after uploading the archive
​https://bugs.webkit.org/show_bug.cgi?id=197180

Reviewed by Lucas Forschler.

• BuildSlaveSupport/ews-build/factories.py:

(Factory.init):
(BuildFactory.init): Remove trigger step from factories.
(BuildFactory.propertiesToPassToTriggers): Deleted.

• BuildSlaveSupport/ews-build/steps.py:

(ConfigureBuild.init): Confiure triggers property.
(Trigger): Step to trigger other queues.
(Trigger.propertiesToPassToTriggers): Method to construct properties to pass to triggerred builds.
(UploadBuiltProduct.finished): Trigger builds after upload is successful.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/factories.py (modified) (2 diffs)
• BuildSlaveSupport/ews-build/steps.py (modified) (6 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/factories.py

@@ -22 +22 @@
 
 
-from buildbot.process import factory, properties
+from buildbot.process import factory
 from buildbot.steps import trigger
 
 from steps import *
 
-Property = properties.Property
-
 
 class Factory(factory.BuildFactory):
-    def __init__(self, platform, configuration=None, architectures=None, buildOnly=True, additionalArguments=None, checkRelevance=False, **kwargs):
+    def __init__(self, platform, configuration=None, architectures=None, buildOnly=True, triggers=None, additionalArguments=None, checkRelevance=False, **kwargs):
         factory.BuildFactory.__init__(self)
-        self.addStep(ConfigureBuild(platform, configuration, architectures, buildOnly, additionalArguments))
+        self.addStep(ConfigureBuild(platform, configuration, architectures, buildOnly, triggers, additionalArguments))
         if checkRelevance:
             self.addStep(CheckPatchRelevance())
@@ -67 +65 @@
 
 class BuildFactory(Factory):
-    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, triggers=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
+    def __init__(self, platform, configuration=None, architectures=None, triggers=None, additionalArguments=None, **kwargs):
+        Factory.__init__(self, platform, configuration, architectures, False, triggers, additionalArguments)
         self.addStep(KillOldProcesses())
         self.addStep(CompileWebKit())
-        if triggers:
-            self.addStep(trigger.Trigger(schedulerNames=triggers, set_properties=self.propertiesToPassToTriggers() or {}))
-
-    def propertiesToPassToTriggers(self):
-        return {
-            "patch_id": Property("patch_id"),
-            "bug_id": Property("bug_id"),
-            "configuration": Property("configuration"),
-            "platform": Property("platform"),
-            "fullPlatform": Property("fullPlatform"),
-            "architecture": Property("architecture"),
-            "owner": Property("owner"),
-        }
 
 

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -24 +24 @@
 from buildbot.process import buildstep, logobserver, properties
 from buildbot.process.results import Results, SUCCESS, FAILURE, WARNINGS, SKIPPED, EXCEPTION, RETRY
-from buildbot.steps import master, shell, transfer
+from buildbot.steps import master, shell, transfer, trigger
 from buildbot.steps.source import git
 from buildbot.steps.worker import CompositeStepMixin
@@ -44 +44 @@
     descriptionDone = ["Configured build"]
 
-    def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments):
+    def __init__(self, platform, configuration, architectures, buildOnly, triggers, additionalArguments):
         super(ConfigureBuild, self).__init__()
         self.platform = platform
@@ -53 +53 @@
         self.architecture = " ".join(architectures) if architectures else None
         self.buildOnly = buildOnly
+        self.triggers = triggers
         self.additionalArguments = additionalArguments
 
@@ -66 +67 @@
         if self.buildOnly:
             self.setProperty("buildOnly", self.buildOnly, 'config.json')
+        if self.triggers:
+            self.setProperty('triggers', self.triggers, 'config.json')
         if self.additionalArguments:
             self.setProperty("additionalArguments", self.additionalArguments, 'config.json')
@@ -384 +387 @@
 
 
+class Trigger(trigger.Trigger):
+    def __init__(self, schedulerNames, **kwargs):
+        set_properties = self.propertiesToPassToTriggers() or {}
+        super(Trigger, self).__init__(schedulerNames=schedulerNames, set_properties=set_properties, **kwargs)
+
+    def propertiesToPassToTriggers(self):
+        return {
+            'patch_id': properties.Property('patch_id'),
+            'bug_id': properties.Property('bug_id'),
+            'configuration': properties.Property('configuration'),
+            'platform': properties.Property('platform'),
+            'fullPlatform': properties.Property('fullPlatform'),
+            'architecture': properties.Property('architecture'),
+            'owner': properties.Property('owner'),
+        }
+
+
 class TestWithFailureCount(shell.Test):
     failedTestsFormatString = "%d test%s failed"
@@ -674 +694 @@
         kwargs['blocksize'] = 1024 * 256
         transfer.FileUpload.__init__(self, **kwargs)
+
+    def finished(self, results):
+        if results == SUCCESS:
+            triggers = self.getProperty('triggers', None)
+            if triggers:
+                self.build.addStepsAfterCurrentStep([Trigger(schedulerNames=triggers)])
+
+        return super(UploadBuiltProduct, self).finished(results)
 
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-22  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Trigger queues only after uploading the archive
+        https://bugs.webkit.org/show_bug.cgi?id=197180
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/factories.py:
+        (Factory.__init__):
+        (BuildFactory.__init__): Remove trigger step from factories.
+        (BuildFactory.propertiesToPassToTriggers): Deleted.
+        * BuildSlaveSupport/ews-build/steps.py:
+        (ConfigureBuild.__init__): Confiure triggers property.
+        (Trigger): Step to trigger other queues.
+        (Trigger.propertiesToPassToTriggers): Method to construct properties to pass to triggerred builds.
+        (UploadBuiltProduct.finished): Trigger builds after upload is successful.
+
 2019-04-22  Alex Christensen  <achristensen@webkit.org>