Changeset 250851 in webkit


Ignore:
Timestamp:
Oct 8, 2019 12:38:43 PM (5 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r250784.

Broke running layout tests.

Reverted changeset:

"results.webkit.org: Start reporting results"
​https://bugs.webkit.org/show_bug.cgi?id=202639
​https://trac.webkit.org/changeset/250784

Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py

    r250784 r250851  
    5050    else:
    5151        passwords = json.load(open('passwords.json'))
    52     results_server_api_key = passwords.get('results-server-api-key')
    53     if results_server_api_key:
    54         os.environ['RESULTS_SERVER_API_KEY'] = results_server_api_key
     52    config = json.load(open('config.json'))
    5553
    56     config = json.load(open('config.json'))
    5754    c['slaves'] = [BuildSlave(slave['name'], passwords[slave['name']], max_builds=1) for slave in config['slaves']]
    5855

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py

    r250784 r250851  
    3232    with open('config.json', 'r') as config_json:
    3333        config_dict = json.load(config_json)
    34     result = dict([(slave['name'], '1234') for slave in config_dict['slaves']])
    35     result['results-server-api-key'] = 'api-key'
    36     return result
     34    return dict([(slave['name'], '1234') for slave in config_dict['slaves']])
    3735
    3836if __name__ == '__main__':

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

    r250850 r250851  
    3636S3URL = "https://s3-us-west-2.amazonaws.com/"
    3737WithProperties = properties.WithProperties
    38 RESULTS_WEBKIT = 'https://results.webkit.org'
    39 RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
    4038
    4139
    … …  
    419417               "--builder-name", WithProperties("%(buildername)s"),
    420418               "--build-number", WithProperties("%(buildnumber)s"),
    421                "--buildbot-worker", WithProperties("%(slavename)s"),
    422419               "--master-name", "webkit.org",
    423                "--buildbot-master", "build.webkit.org",
    424                "--report", RESULTS_WEBKIT,
    425420               "--test-results-server", "webkit-test-results.webkit.org",
    426421               "--exit-after-n-crashes-or-timeouts", "50",
    … …  
    428423               WithProperties("--%(configuration)s")]
    429424
    430     def __init__(self, *args, **kwargs):
    431         kwargs['logEnviron'] = False
    432         shell.Test.__init__(self, *args, **kwargs)
    433 
    434     def start(self):
    435         self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    436 
     425    def start(self):
    437426        platform = self.getProperty('platform')
    438427        appendCustomTestingFlags(self, platform, self.getProperty('device_model'))
    … …  
    542531    description = ["api tests running"]
    543532    descriptionDone = ["api-tests"]
    544     command = [
    545         "python",
    546         "./Tools/Scripts/run-api-tests",
    547         "--no-build",
    548         WithProperties("--%(configuration)s"),
    549         "--verbose",
    550         "--buildbot-master", "build.webkit.org",
    551         "--builder-name", WithProperties("%(buildername)s"),
    552         "--build-number", WithProperties("%(buildnumber)s"),
    553         "--buildbot-worker", WithProperties("%(slavename)s"),
    554         "--report", RESULTS_WEBKIT,
    555     ]
     533    command = ["python", "./Tools/Scripts/run-api-tests", "--no-build", WithProperties("--%(configuration)s"), "--verbose"]
    556534    failedTestsFormatString = "%d api test%s failed or timed out"
    557535
    558     def __init__(self, *args, **kwargs):
    559         kwargs['logEnviron'] = False
    560         TestWithFailureCount.__init__(self, *args, **kwargs)
    561 
    562     def start(self):
    563         self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
     536    def start(self):
    564537        appendCustomTestingFlags(self, self.getProperty('platform'), self.getProperty('device_model'))
    565538        return shell.Test.start(self)
    … …  
    578551    description = ["python-tests running"]
    579552    descriptionDone = ["python-tests"]
    580     command = [
    581         "python",
    582         "./Tools/Scripts/test-webkitpy",
    583         "--verbose",
    584         WithProperties("--%(configuration)s"),
    585         "--buildbot-master", "build.webkit.org",
    586         "--builder-name", WithProperties("%(buildername)s"),
    587         "--build-number", WithProperties("%(buildnumber)s"),
    588         "--buildbot-worker", WithProperties("%(slavename)s"),
    589         "--report", RESULTS_WEBKIT,
    590     ]
     553    command = ["python", "./Tools/Scripts/test-webkitpy", "--verbose", WithProperties("--%(configuration)s")]
    591554    failedTestsFormatString = "%d python test%s failed"
    592555
    593     def __init__(self, *args, **kwargs):
    594         kwargs['logEnviron'] = False
    595         TestWithFailureCount.__init__(self, *args, **kwargs)
    596 
    597     def start(self):
    598         self.slaveEnvironment[RESULTS_SERVER_API_KEY] = os.getenv(RESULTS_SERVER_API_KEY)
    599 
     556    def start(self):
    600557        platform = self.getProperty('platform')
    601558        # Python tests are flaky on the GTK builders, running them serially

  • trunk/Tools/ChangeLog

    r250850 r250851  
     12019-10-08  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r250784.
     4
     5        Broke running layout tests.
     6
     7        Reverted changeset:
     8
     9        "results.webkit.org: Start reporting results"
     10        https://bugs.webkit.org/show_bug.cgi?id=202639
     11        https://trac.webkit.org/changeset/250784
     12
    1132019-10-08  Matt Lewis  <jlewis3@apple.com>
    214

  • trunk/Tools/Scripts/webkitpy/results/upload.py

    r250784 r250851  
    2323import webkitpy.thirdparty.autoinstalled.requests
    2424
    25 import os
    2625import json
    2726import requests
    … …  
    3332
    3433class Upload(object):
    35     API_KEY = os.getenv('RESULTS_SERVER_API_KEY')
    3634    UPLOAD_ENDPOINT = '/api/upload'
    3735    ARCHIVE_UPLOAD_ENDPOINT = '/api/upload/archive'
    … …  
    172170    def upload(self, hostname, log_line_func=lambda val: sys.stdout.write(val + '\n')):
    173171        try:
    174             data = Upload.Encoder().default(self)
    175             if self.API_KEY:
    176                 data['api_key'] = self.API_KEY
    177             response = requests.post('{}{}'.format(hostname, self.UPLOAD_ENDPOINT), data=json.dumps(data))
     172            response = requests.post('{}{}'.format(hostname, self.UPLOAD_ENDPOINT), data=json.dumps(self, cls=Upload.Encoder))
    178173        except requests.exceptions.ConnectionError:
    179174            log_line_func(' ' * 4 + 'Failed to upload to {}, results server not online'.format(hostname))
    … …  
    201196            if self.timestamp:
    202197                meta_data['timestamp'] = self.timestamp
    203             if self.API_KEY:
    204                 meta_data['api_key'] = self.API_KEY
    205198            response = requests.post(
    206199                '{}{}'.format(hostname, self.ARCHIVE_UPLOAD_ENDPOINT),
Note: See TracChangeset for help on using the changeset viewer.