Changeset 229618 in webkit


Ignore:
Timestamp:
Mar 14, 2018 8:17:37 PM (6 years ago)
Author:
aakash_jain@apple.com
Message:

Add support for boolean properties in BuildbotSyncer while submitting build request to Buildbot 0.9 server
https://bugs.webkit.org/show_bug.cgi?id=183638

Reviewed by Ryosuke Niwa.

  • tools/js/buildbot-syncer.js:

(BuildbotSyncer._parseRepositoryGroupPropertyTemplate): Allow boolean properties.

  • server-tests/tools-sync-buildbot-integration-tests.js: Tests for boolean properties.
  • unit-tests/buildbot-syncer-tests.js: Ditto.
Location:
trunk/Websites/perf.webkit.org
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Websites/perf.webkit.org/ChangeLog

    r229501 r229618  
     12018-03-14  Aakash Jain  <aakash_jain@apple.com>
     2
     3        Add support for boolean properties in BuildbotSyncer while submitting build request to Buildbot 0.9 server
     4        https://bugs.webkit.org/show_bug.cgi?id=183638
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * tools/js/buildbot-syncer.js:
     9        (BuildbotSyncer._parseRepositoryGroupPropertyTemplate): Allow boolean properties.
     10        * server-tests/tools-sync-buildbot-integration-tests.js: Tests for boolean properties.
     11        * unit-tests/buildbot-syncer-tests.js: Ditto.
     12
    1132018-03-04  Dewei Zhu  <dewei_zhu@apple.com>
    214
  • trunk/Websites/perf.webkit.org/server-tests/tools-sync-buildbot-integration-tests.js

    r227184 r229618  
    2626            buildProperties: {'wk': {'revision': 'WebKit'}, 'wk-patch': {'patch': 'WebKit'},
    2727                'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-wk'},
     28                'build-wk': {'ifRepositorySet': ['WebKit'], 'value': true},
    2829                'owned-commits': {'ownedRevisions': 'WebKit'}},
    2930            acceptsRoots: true,
     
    7172            buildProperties: {'wk': {'revision': 'WebKit'}, 'wk-patch': {'patch': 'WebKit'},
    7273                'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-wk'},
     74                'build-wk': {'ifRepositorySet': ['WebKit'], 'value': true},
    7375                'owned-commits': {'ownedRevisions': 'WebKit'}},
    7476            acceptsRoots: true,
     
    115117            buildProperties: {'wk': {'revision': 'WebKit'}, 'wk-patch': {'patch': 'WebKit'},
    116118                'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-wk'},
     119                'build-wk': {'ifRepositorySet': ['WebKit'], 'value': true},
    117120                'owned-commits': {'ownedRevisions': 'WebKit'}},
    118121            acceptsRoots: true,
     
    383386            assertAndResolveRequest(requests[6], 'POST', '/builders/some%20builder/force', 'OK');
    384387            assert.deepEqual(requests[6].data, {'wk': '191622', 'wk-patch': RemoteAPI.url('/api/uploaded-file/1.dat'),
    385                 'build-request-id': '1', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk'});
     388                'build-request-id': '1', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'build-wk': true});
    386389            return MockRemoteAPI.waitForRequest();
    387390        }).then(() => {
     
    497500            assert.equal(requests.length, 7);
    498501            assertAndResolveRequest(requests[6], 'POST', '/builders/some%20builder/force', 'OK');
    499             assert.deepEqual(requests[6].data, {'wk': '191622', 'build-request-id': '2', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk'});
     502            assert.deepEqual(requests[6].data, {'wk': '191622', 'build-request-id': '2', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'build-wk': true});
    500503            return MockRemoteAPI.waitForRequest();
    501504        }).then(() => {
     
    656659            assertAndResolveRequest(requests[6], 'POST', '/builders/some%20builder/force', 'OK');
    657660            assert.deepEqual(requests[6].data, {'wk': '191622', 'wk-patch': RemoteAPI.url('/api/uploaded-file/1.dat'),
    658                 'build-request-id': '1', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'platform-name': 'some platform'});
     661                'build-request-id': '1', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'build-wk': true, 'platform-name': 'some platform'});
    659662            return MockRemoteAPI.waitForRequest();
    660663        }).then(() => {
     
    770773            assert.equal(requests.length, 7);
    771774            assertAndResolveRequest(requests[6], 'POST', '/builders/some%20builder/force', 'OK');
    772             assert.deepEqual(requests[6].data, {'wk': '191622', 'build-request-id': '2', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'platform-name': 'some platform'});
     775            assert.deepEqual(requests[6].data, {'wk': '191622', 'build-request-id': '2', 'forcescheduler': 'force-ab-builds', 'checkbox': 'build-wk', 'build-wk': true, 'platform-name': 'some platform'});
    773776            return MockRemoteAPI.waitForRequest();
    774777        }).then(() => {
  • trunk/Websites/perf.webkit.org/tools/js/buildbot-syncer.js

    r229489 r229618  
    577577            let value = properties[propertyName];
    578578            const isDictionary = typeof(value) == 'object';
    579             assert(isDictionary || typeof(value) == 'string',
     579            assert(isDictionary || typeof(value) == 'string' || typeof(value) == 'boolean',
    580580                `Repository group "${groupName}" uses an invalid value "${value}" in property "${propertyName}"`);
    581581
  • trunk/Websites/perf.webkit.org/unit-tests/buildbot-syncer-tests.js

    r229489 r229618  
    11031103                    'webkit-patch': {'patch': 'WebKit'},
    11041104                    'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-webkit'},
     1105                    'build-webkit': {'ifRepositorySet': ['WebKit'], 'value': true},
    11051106                    'shared': {'revision': 'Shared'},
    11061107                },
     
    11131114            assert.equal(properties['webkit-patch'], 'http://build.webkit.org/api/uploaded-file/453.dat');
    11141115            assert.equal(properties['checkbox'], 'build-webkit');
     1116            assert.equal(properties['build-webkit'], true);
    11151117        });
    11161118
     
    11631165                    'shared': {'revision': 'Shared'},
    11641166                    'roots': {'roots': {}},
    1165                     'checkbox': {'ifBuilt': ['WebKit'], 'value': 'test-webkit'}
     1167                    'checkbox': {'ifBuilt': ['WebKit'], 'value': 'test-webkit'},
     1168                    'test-webkit': {'ifBuilt': ['WebKit'], 'value': true}
    11661169                },
    11671170                'buildProperties': {
     
    11691172                    'webkit-patch': {'patch': 'WebKit'},
    11701173                    'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-webkit'},
     1174                    'build-webkit': {'ifRepositorySet': ['WebKit'], 'value': true},
    11711175                    'shared': {'revision': 'Shared'},
    11721176                },
     
    11801184            assert.equal(properties['roots'], '[{"url":"http://build.webkit.org/api/uploaded-file/456.dat"}]');
    11811185            assert.equal(properties['checkbox'], 'test-webkit');
     1186            assert.equal(properties['test-webkit'], true);
    11821187        });
    11831188
     
    11911196                    'owner-repo': {'revision': 'Owner Repository'},
    11921197                    'roots': {'roots': {}},
    1193                     'checkbox': {'ifBuilt': ['WebKit'], 'value': 'test-webkit'}
     1198                    'checkbox': {'ifBuilt': ['WebKit'], 'value': 'test-webkit'},
     1199                    'test-webkit': {'ifBuilt': ['WebKit'], 'value': true}
    11941200                },
    11951201                'buildProperties': {
     
    11981204                    'owner-repo': {'revision': 'Owner Repository'},
    11991205                    'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-webkit'},
     1206                    'build-webkit': {'ifRepositorySet': ['WebKit'], 'value': true},
    12001207                    'owned-commits': {'ownedRevisions': 'Owner Repository'}
    12011208                },
     
    12101217            assert.equal(properties['roots'], '[{"url":"http://build.webkit.org/api/uploaded-file/456.dat"}]');
    12111218            assert.equal(properties['checkbox'], undefined);
     1219            assert.equal(properties['test-webkit'], undefined);
    12121220        });
    12131221
     
    12271235                    'owner-repo': {'revision': 'Owner Repository'},
    12281236                    'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-webkit'},
     1237                    'build-webkit': {'ifRepositorySet': ['WebKit'], 'value': true},
    12291238                    'owned-commits': {'ownedRevisions': 'Owner Repository'}
    12301239                },
     
    12371246            assert.equal(properties['owner-repo'], 'owner-001');
    12381247            assert.equal(properties['checkbox'], undefined);
     1248            assert.equal(properties['build-webkit'], undefined);
    12391249            assert.deepEqual(JSON.parse(properties['owned-commits']), {'Owner Repository': [{revision: 'owned-002', repository: 'Owned Repository', ownerRevision: 'owner-001'}]});
    12401250        });
     
    12561266                    'owner-repo': {'revision': 'Owner Repository'},
    12571267                    'checkbox': {'ifRepositorySet': ['WebKit'], 'value': 'build-webkit'},
     1268                    'build-webkit': {'ifRepositorySet': ['WebKit'], 'value': true},
    12581269                    'owned-commits': {'ownedRevisions': 'Owner Repository'}
    12591270                },
     
    12661277            assert.equal(properties['owner-repo'], 'owner-001');
    12671278            assert.equal(properties['checkbox'], 'build-webkit');
     1279            assert.equal(properties['build-webkit'], true);
    12681280            assert.equal(properties['webkit-patch'], 'http://build.webkit.org/api/uploaded-file/453.dat');
    12691281            assert.deepEqual(JSON.parse(properties['owned-commits']), {'Owner Repository': [{revision: 'owned-002', repository: 'Owned Repository', ownerRevision: 'owner-001'}]});
Note: See TracChangeset for help on using the changeset viewer.