Diff
Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (273266 => 273267)
--- trunk/Tools/CISupport/ews-build/loadConfig.py 2021-02-22 19:55:45 UTC (rev 273266)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py 2021-02-22 19:58:25 UTC (rev 273267)
@@ -50,6 +50,11 @@
checkWorkersAndBuildersForConsistency(config, config['workers'], config['builders'])
checkValidSchedulers(config, config['schedulers'])
+ for variable in ['GITHUB_COM_USERNAME', 'GITHUB_COM_ACCESS_TOKEN']:
+ value = passwords.get(variable)
+ if value:
+ os.environ[variable] = value
+
c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password'), max_builds=worker.get('max_builds', 1)) for worker in config['workers']]
if use_localhost_worker:
c['workers'].append(Worker('local-worker', 'password', max_builds=1))
Modified: trunk/Tools/CISupport/ews-build/steps.py (273266 => 273267)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-22 19:55:45 UTC (rev 273266)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-22 19:58:25 UTC (rev 273267)
@@ -52,6 +52,8 @@
RESULTS_DB_URL = 'https://results.webkit.org/'
WithProperties = properties.WithProperties
Interpolate = properties.Interpolate
+GITHUB_COM_USERNAME = 'GITHUB_COM_USERNAME'
+GITHUB_COM_ACCESS_TOKEN = 'GITHUB_COM_ACCESS_TOKEN'
class ConfigureBuild(buildstep.BuildStep):
@@ -178,6 +180,9 @@
shell.ShellCommand.__init__(self, timeout=5 * 60, logEnviron=False, **kwargs)
def start(self):
+ self.workerEnvironment[GITHUB_COM_USERNAME] = os.getenv(GITHUB_COM_USERNAME)
+ self.workerEnvironment[GITHUB_COM_ACCESS_TOKEN] = os.getenv(GITHUB_COM_ACCESS_TOKEN)
+
self.log_observer = logobserver.BufferLogObserver()
self.addLogObserver('stdio', self.log_observer)
revision = self.getProperty('ews_revision', self.getProperty('got_revision'))
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (273266 => 273267)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-22 19:55:45 UTC (rev 273266)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-22 19:58:25 UTC (rev 273267)
@@ -3833,6 +3833,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
+ env={'GITHUB_COM_USERNAME': None, 'GITHUB_COM_ACCESS_TOKEN': None},
command=['python', 'Tools/Scripts/git-webkit', '-C', 'https://github.com/WebKit/Webkit', 'find', '51a6aec9f664']) +
ExpectShell.log('stdio', stdout='Identifier: 233175@main') +
0,
@@ -3848,6 +3849,7 @@
ExpectShell(workdir='wkdir',
timeout=300,
logEnviron=False,
+ env={'GITHUB_COM_USERNAME': None, 'GITHUB_COM_ACCESS_TOKEN': None},
command=['python', 'Tools/Scripts/git-webkit', '-C', 'https://github.com/WebKit/Webkit', 'find', 'HEAD']) +
ExpectShell.log('stdio', stdout='Unexpected failure') +
2,
Modified: trunk/Tools/ChangeLog (273266 => 273267)
--- trunk/Tools/ChangeLog 2021-02-22 19:55:45 UTC (rev 273266)
+++ trunk/Tools/ChangeLog 2021-02-22 19:58:25 UTC (rev 273267)
@@ -1,3 +1,17 @@
+2021-02-22 Jonathan Bedard <[email protected]>
+
+ [git-webkit] Failure to retrieve commit in EWS
+ https://bugs.webkit.org/show_bug.cgi?id=222050
+ <rdar://problem/74439957>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/loadConfig.py:
+ (loadBuilderConfig): Load GitHub credentials.
+ * CISupport/ews-build/steps.py:
+ (ShowIdentifier.start): Pass GitHub credentials to worker.
+ * CISupport/ews-build/steps_unittest.py:
+
2021-02-22 Alex Christensen <[email protected]>
Disable RangeResponseGenerator.
