Changeset 252644 in webkit

Timestamp:

Nov 19, 2019 1:21:41 PM (4 years ago)

Author:

aakash_jain@apple.com

Message:

Disable reporting EWS test failures from clean-tree to results.webkit.org
​https://bugs.webkit.org/show_bug.cgi?id=204369

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(RunWebKitTestsWithoutPatch):
(RunAPITestsWithoutPatch.evaluateCommand):
(RunWebKitTestsWithoutPatch.start): Deleted.
(RunAPITestsWithoutPatch.start): Deleted.

• BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
• BuildSlaveSupport/ews-build/loadConfig.py:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/loadConfig.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps.py (modified) (4 diffs)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (9 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -47 +47 @@
     else:
         passwords = json.load(open(os.path.join(master_prefix_path, 'passwords.json')))
-    results_server_api_key = passwords.get('results-server-api-key')
-    if results_server_api_key:
-        os.environ['RESULTS_SERVER_API_KEY'] = results_server_api_key
 
     checkWorkersAndBuildersForConsistency(config, config['workers'], config['builders'])

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

@@ -32 +32 @@
 
 import json
-import os
 import re
 import requests
@@ -41 +40 @@
 WithProperties = properties.WithProperties
 Interpolate = properties.Interpolate
-RESULTS_WEBKIT_URL = 'https://results.webkit.org'
-RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
 
 
@@ -1343 +1340 @@
     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)
@@ -1670 +1657 @@
     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()
 
 

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

@@ -1505 +1505 @@
         self.setProperty('buildnumber', '123')
         self.setProperty('workername', 'ews126')
-        os.environ['RESULTS_SERVER_API_KEY'] = 'sample-key'
 
     def test_success(self):
@@ -1514 +1513 @@
             ExpectShell(workdir='wkdir',
                         logfiles={'json': self.jsonFileName},
-                        env={'RESULTS_SERVER_API_KEY': 'sample-key'},
                         logEnviron=False,
                         command=['python',
@@ -1525 +1523 @@
                                  '--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'],
@@ -1545 +1538 @@
             ExpectShell(workdir='wkdir',
                         logfiles={'json': self.jsonFileName},
-                        env={'RESULTS_SERVER_API_KEY': 'sample-key'},
                         logEnviron=False,
                         command=['python',
@@ -1556 +1548 @@
                                  '--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'],
@@ -2359 +2346 @@
         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'},
+
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logEnviron=False,
                         command=['python',
                                  'Tools/Scripts/run-api-tests',
@@ -2370 +2355 @@
                                  '--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},
                         )
@@ -2406 +2386 @@
             ExpectShell(workdir='wkdir',
                         logEnviron=False,
-                        env={'RESULTS_SERVER_API_KEY': None},
                         command=['python',
                                  'Tools/Scripts/run-api-tests',
@@ -2412 +2391 @@
                                  '--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},
                         )

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-19  Aakash Jain  <aakash_jain@apple.com>
+
+        Disable reporting EWS test failures from clean-tree to results.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=204369
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (RunWebKitTestsWithoutPatch):
+        (RunAPITestsWithoutPatch.evaluateCommand):
+        (RunWebKitTestsWithoutPatch.start): Deleted.
+        (RunAPITestsWithoutPatch.start): Deleted.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+        * BuildSlaveSupport/ews-build/loadConfig.py:
+
 2019-11-19  Brian Burg  <bburg@apple.com>