Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (252643 => 252644)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-19 21:00:21 UTC (rev 252643)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-11-19 21:21:41 UTC (rev 252644)
@@ -31,7 +31,6 @@
from layout_test_failures import LayoutTestFailures
import json
-import os
import re
import requests
@@ -40,8 +39,6 @@
EWS_URL = 'https://ews-build.webkit.org/'
WithProperties = properties.WithProperties
Interpolate = properties.Interpolate
-RESULTS_WEBKIT_URL = 'https://results.webkit.org'
-RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
class ConfigureBuild(buildstep.BuildStep):
@@ -1342,16 +1339,6 @@
class RunWebKitTestsWithoutPatch(RunWebKitTests):
name = 'run-layout-tests-without-patch'
- def start(self):
- self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
- self.setCommand(self.command +
- ['--buildbot-master', EWS_URL.replace('https://', '').strip('/'),
- '--builder-name', self.getProperty('buildername'),
- '--build-number', self.getProperty('buildnumber'),
- '--buildbot-worker', self.getProperty('workername'),
- '--report', RESULTS_WEBKIT_URL])
- return super(RunWebKitTestsWithoutPatch, self).start()
-
def evaluateCommand(self, cmd):
rc = shell.Test.evaluateCommand(self, cmd)
self.build.addStepsAfterCurrentStep([ArchiveTestResults(), UploadTestResults(identifier='clean-tree'), ExtractTestResults(identifier='clean-tree'), AnalyzeLayoutTestsResults()])
@@ -1670,17 +1657,7 @@
def evaluateCommand(self, cmd):
return TestWithFailureCount.evaluateCommand(self, cmd)
- def start(self):
- self.workerEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
- self.setCommand(self.command +
- ['--buildbot-master', EWS_URL.replace('https://', '').strip('/'),
- '--builder-name', self.getProperty('buildername'),
- '--build-number', self.getProperty('buildnumber'),
- '--buildbot-worker', self.getProperty('workername'),
- '--report', RESULTS_WEBKIT_URL])
- return super(RunAPITestsWithoutPatch, self).start()
-
class AnalyzeAPITestsResults(buildstep.BuildStep):
name = 'analyze-api-tests-results'
description = ['analyze-api-test-results']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (252643 => 252644)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-19 21:00:21 UTC (rev 252643)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-11-19 21:21:41 UTC (rev 252644)
@@ -1504,7 +1504,6 @@
self.setProperty('buildername', 'iOS-13-Simulator-WK2-Tests-EWS')
self.setProperty('buildnumber', '123')
self.setProperty('workername', 'ews126')
- os.environ['RESULTS_SERVER_API_KEY'] = 'sample-key'
def test_success(self):
self.configureStep()
@@ -1513,7 +1512,6 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
- env={'RESULTS_SERVER_API_KEY': 'sample-key'},
logEnviron=False,
command=['python',
'Tools/Scripts/run-webkit-tests',
@@ -1524,11 +1522,6 @@
'--exit-after-n-failures', '30',
'--skip-failing-tests',
'--release',
- '--buildbot-master', 'ews-build.webkit.org',
- '--builder-name', 'iOS-13-Simulator-WK2-Tests-EWS',
- '--build-number', '123',
- '--buildbot-worker', 'ews126',
- '--report', 'https://results.webkit.org',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging'],
)
@@ -1544,7 +1537,6 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logfiles={'json': self.jsonFileName},
- env={'RESULTS_SERVER_API_KEY': 'sample-key'},
logEnviron=False,
command=['python',
'Tools/Scripts/run-webkit-tests',
@@ -1555,11 +1547,6 @@
'--exit-after-n-failures', '30',
'--skip-failing-tests',
'--release',
- '--buildbot-master', 'ews-build.webkit.org',
- '--builder-name', 'iOS-13-Simulator-WK2-Tests-EWS',
- '--build-number', '123',
- '--buildbot-worker', 'ews126',
- '--report', 'https://results.webkit.org',
'--results-directory', 'layout-test-results',
'--debug-rwt-logging'],
)
@@ -2358,23 +2345,16 @@
self.setProperty('buildername', 'API-Tests-macOS-EWS')
self.setProperty('buildnumber', '11525')
self.setProperty('workername', 'ews155')
- os.environ['RESULTS_SERVER_API_KEY'] = 'sample-key'
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- env={'RESULTS_SERVER_API_KEY': 'sample-key'},
command=['python',
'Tools/Scripts/run-api-tests',
'--no-build',
'--release',
'--verbose',
- '--json-output={0}'.format(self.jsonFileName),
- '--buildbot-master', 'ews-build.webkit.org',
- '--builder-name', 'API-Tests-macOS-EWS',
- '--build-number', '11525',
- '--buildbot-worker', 'ews155',
- '--report', 'https://results.webkit.org'],
+ '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''...
@@ -2405,18 +2385,12 @@
self.expectRemoteCommands(
ExpectShell(workdir='wkdir',
logEnviron=False,
- env={'RESULTS_SERVER_API_KEY': None},
command=['python',
'Tools/Scripts/run-api-tests',
'--no-build',
'--debug',
'--verbose',
- '--json-output={0}'.format(self.jsonFileName),
- '--buildbot-master', 'ews-build.webkit.org',
- '--builder-name', 'API-Tests-iOS-EWS',
- '--build-number', '123',
- '--buildbot-worker', 'ews156',
- '--report', 'https://results.webkit.org'],
+ '--json-output={0}'.format(self.jsonFileName)],
logfiles={'json': self.jsonFileName},
)
+ ExpectShell.log('stdio', stdout='''
