Diff
Modified: trunk/Tools/CISupport/ews-build/factories.py (274387 => 274388)
--- trunk/Tools/CISupport/ews-build/factories.py 2021-03-13 16:09:52 UTC (rev 274387)
+++ trunk/Tools/CISupport/ews-build/factories.py 2021-03-13 16:20:39 UTC (rev 274388)
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -28,8 +28,8 @@
CheckPatchStatusOnEWSQueues, CheckStyle, CompileJSC, CompileWebKit, ConfigureBuild, CreateLocalGITCommit,
DownloadBuiltProduct, ExtractBuiltProduct, FetchBranches, FindModifiedChangeLogs, InstallGtkDependencies,
InstallWpeDependencies, KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo,
- RunAPITests, RunBindingsTests, RunBuildWebKitOrgUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests,
- RunResultsdbpyTests, RunJavaScriptCoreTests, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
+ RunAPITests, RunBindingsTests, RunBuildWebKitOrgUnitTests, RunBuildbotCheckConfigForBuildWebKit, RunBuildbotCheckConfigForEWS,
+ RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
RunWebKitPyPython3Tests, RunWebKitTests, SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
ValidatePatch, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, WaitForCrashCollection)
@@ -249,8 +249,9 @@
def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, additionalArguments=additionalArguments, checkRelevance=True)
self.addStep(RunBuildWebKitOrgUnitTests())
+ self.addStep(RunBuildbotCheckConfigForBuildWebKit())
self.addStep(RunEWSUnitTests())
- self.addStep(RunEWSBuildbotCheckConfig())
+ self.addStep(RunBuildbotCheckConfigForEWS())
self.addStep(RunResultsdbpyTests())
Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (274387 => 274388)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-03-13 16:09:52 UTC (rev 274387)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-03-13 16:20:39 UTC (rev 274388)
@@ -174,8 +174,9 @@
_BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.RunBuildWebKitOrgUnitTests),
+ _BuildStepFactory(steps.RunBuildbotCheckConfigForBuildWebKit),
_BuildStepFactory(steps.RunEWSUnitTests),
- _BuildStepFactory(steps.RunEWSBuildbotCheckConfig),
+ _BuildStepFactory(steps.RunBuildbotCheckConfigForEWS),
_BuildStepFactory(steps.RunResultsdbpyTests),
])
Modified: trunk/Tools/CISupport/ews-build/steps.py (274387 => 274388)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-03-13 16:09:52 UTC (rev 274387)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-03-13 16:20:39 UTC (rev 274388)
@@ -1252,13 +1252,15 @@
return {'step': 'Failed EWS unit tests'}
-class RunEWSBuildbotCheckConfig(shell.ShellCommand):
+class RunBuildbotCheckConfig(shell.ShellCommand):
name = 'buildbot-check-config'
description = ['buildbot-checkconfig running']
command = ['buildbot', 'checkconfig']
+ directory = 'build/Tools/CISupport/ews-build'
+ timeout = 2 * 60
def __init__(self, **kwargs):
- super(RunEWSBuildbotCheckConfig, self).__init__(workdir='build/Tools/CISupport/ews-build', timeout=2 * 60, logEnviron=False, **kwargs)
+ super(RunBuildbotCheckConfig, self).__init__(workdir=self.directory, timeout=self.timeout, logEnviron=False, **kwargs)
def start(self):
self.workerEnvironment['LC_CTYPE'] = 'en_US.UTF-8'
@@ -1270,6 +1272,16 @@
return {'step': 'Failed buildbot checkconfig'}
+class RunBuildbotCheckConfigForEWS(RunBuildbotCheckConfig):
+ name = 'buildbot-check-config-for-ews'
+ directory = 'build/Tools/CISupport/ews-build'
+
+
+class RunBuildbotCheckConfigForBuildWebKit(RunBuildbotCheckConfig):
+ name = 'buildbot-check-config-for-build-webkit'
+ directory = 'build/Tools/CISupport/build-webkit-org'
+
+
class RunResultsdbpyTests(shell.ShellCommand):
name = 'resultsdbpy-unit-tests'
description = ['resultsdbpy-unit-tests running']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (274387 => 274388)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-03-13 16:09:52 UTC (rev 274387)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-03-13 16:20:39 UTC (rev 274388)
@@ -53,8 +53,8 @@
FetchBranches, FindModifiedChangeLogs, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
- RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests,
- RunJSCTestsWithoutPatch, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
+ RunBuildbotCheckConfigForBuildWebKit, RunBuildbotCheckConfigForEWS, RunEWSUnitTests, RunResultsdbpyTests,
+ RunJavaScriptCoreTests, RunJSCTestsWithoutPatch, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
UploadTestResults, ValidateCommiterAndReviewer, ValidatePatch)
@@ -622,7 +622,7 @@
return self.runStep()
-class TestRunEWSBuildbotCheckConfig(BuildStepMixinAdditions, unittest.TestCase):
+class TestRunBuildbotCheckConfigForEWS(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
return self.setUpBuildStep()
@@ -631,7 +631,7 @@
return self.tearDownBuildStep()
def test_success(self):
- self.setupStep(RunEWSBuildbotCheckConfig())
+ self.setupStep(RunBuildbotCheckConfigForEWS())
self.expectRemoteCommands(
ExpectShell(workdir='build/Tools/CISupport/ews-build',
timeout=120,
@@ -645,7 +645,7 @@
return self.runStep()
def test_failure(self):
- self.setupStep(RunEWSBuildbotCheckConfig())
+ self.setupStep(RunBuildbotCheckConfigForEWS())
self.expectRemoteCommands(
ExpectShell(workdir='build/Tools/CISupport/ews-build',
timeout=120,
@@ -653,7 +653,7 @@
command=['buildbot', 'checkconfig'],
env={'LC_CTYPE': 'en_US.UTF-8'}
)
- + ExpectShell.log('stdio', stdout='Configuration Errors: builder(s) iOS-12-Debug-Build-EWS have no schedulers to drive them')
+ + ExpectShell.log('stdio', stdout='Configuration Errors: builder(s) iOS-14-Debug-Build-EWS have no schedulers to drive them')
+ 2,
)
self.expectOutcome(result=FAILURE, state_string='Failed buildbot checkconfig')
@@ -660,6 +660,44 @@
return self.runStep()
+class TestRunBuildbotCheckConfigForBuildWebKit(BuildStepMixinAdditions, unittest.TestCase):
+ def setUp(self):
+ self.longMessage = True
+ return self.setUpBuildStep()
+
+ def tearDown(self):
+ return self.tearDownBuildStep()
+
+ def test_success(self):
+ self.setupStep(RunBuildbotCheckConfigForBuildWebKit())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
+ timeout=120,
+ logEnviron=False,
+ command=['buildbot', 'checkconfig'],
+ env={'LC_CTYPE': 'en_US.UTF-8'}
+ )
+ + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Passed buildbot checkconfig')
+ return self.runStep()
+
+ def test_failure(self):
+ self.setupStep(RunBuildbotCheckConfigForBuildWebKit())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
+ timeout=120,
+ logEnviron=False,
+ command=['buildbot', 'checkconfig'],
+ env={'LC_CTYPE': 'en_US.UTF-8'}
+ )
+ + ExpectShell.log('stdio', stdout='Configuration Errors: builder(s) Apple-iOS-14-Release-Build have no schedulers to drive them')
+ + 2,
+ )
+ self.expectOutcome(result=FAILURE, state_string='Failed buildbot checkconfig')
+ return self.runStep()
+
+
class TestRunEWSUnitTests(BuildStepMixinAdditions, unittest.TestCase):
def setUp(self):
self.longMessage = True
Modified: trunk/Tools/ChangeLog (274387 => 274388)
--- trunk/Tools/ChangeLog 2021-03-13 16:09:52 UTC (rev 274387)
+++ trunk/Tools/ChangeLog 2021-03-13 16:20:39 UTC (rev 274388)
@@ -1,3 +1,18 @@
+2021-03-13 Aakash Jain <[email protected]>
+
+ [build.webkit.org] run buildbot checkconfig in services ews
+ https://bugs.webkit.org/show_bug.cgi?id=222687
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (RunBuildbotCheckConfigForEWS): Renamed from RunEWSBuildbotCheckConfig.
+ (RunBuildbotCheckConfigForBuildWebKit): Build step to run buildbot checkconfig for build.webkit.org
+ * CISupport/ews-build/factories.py:
+ (ServicesFactory.__init__): Added build step to run buildbot checkconfig for build.webkit.org
+ * CISupport/ews-build/steps_unittest.py: Added and updated unit-tests.
+ * CISupport/ews-build/factories_unittest.py: Updated unit-tests.
+
2021-03-12 Michael Catanzaro <[email protected]>
REGRESSION(r274270): [WPE][GTK] Broke Epiphany test /embed/ephy-web-view/error-pages-not-stored-in-history
