Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (272203 => 272204)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-02 11:07:25 UTC (rev 272203)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-02 11:12:14 UTC (rev 272204)
@@ -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
@@ -1921,12 +1921,13 @@
command = ['python', 'Tools/CISupport/kill-old-processes', 'buildbot']
def __init__(self, **kwargs):
- super(KillOldProcesses, self).__init__(timeout=60, logEnviron=False, **kwargs)
+ super(KillOldProcesses, self).__init__(timeout=2 * 60, logEnviron=False, **kwargs)
def evaluateCommand(self, cmd):
- if self.results in [FAILURE, EXCEPTION]:
+ rc = shell.Compile.evaluateCommand(self, cmd)
+ if rc in [FAILURE, EXCEPTION]:
self.build.buildFinished(['Failed to kill old processes, retrying build'], RETRY)
- return shell.Compile.evaluateCommand(self, cmd)
+ return rc
def getResultSummary(self):
if self.results in [FAILURE, EXCEPTION]:
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (272203 => 272204)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-02 11:07:25 UTC (rev 272203)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-02 11:12:14 UTC (rev 272204)
@@ -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
@@ -773,7 +773,7 @@
ExpectShell(workdir='wkdir',
command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
logEnviron=False,
- timeout=60,
+ timeout=120,
)
+ 0,
)
@@ -786,7 +786,7 @@
ExpectShell(workdir='wkdir',
command=['python', 'Tools/CISupport/kill-old-processes', 'buildbot'],
logEnviron=False,
- timeout=60,
+ timeout=120,
)
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
Modified: trunk/Tools/ChangeLog (272203 => 272204)
--- trunk/Tools/ChangeLog 2021-02-02 11:07:25 UTC (rev 272203)
+++ trunk/Tools/ChangeLog 2021-02-02 11:12:14 UTC (rev 272204)
@@ -1,3 +1,15 @@
+2021-02-02 Aakash Jain <[email protected]>
+
+ ews isn't retrying builds when kill-old-processes fails
+ https://bugs.webkit.org/show_bug.cgi?id=221235
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (KillOldProcesses.__init__): Increased timeout to 2 minutes.
+ (KillOldProcesses.evaluateCommand): Used rc since self.results is None at this step.
+ * CISupport/ews-build/steps_unittest.py: Updated unit-tests.
+
2021-02-02 Youenn Fablet <[email protected]>
Recover WebRTC codecs in case of GPUProcess crash
