Changeset 268429 in webkit


Ignore:
Timestamp:
Oct 13, 2020 3:49:41 PM (3 years ago)
Author:
aakash_jain@apple.com
Message:

[build.webkit.org] Rename slave to worker in config.json
https://bugs.webkit.org/show_bug.cgi?id=217672

Reviewed by Dewei Zhu.

  • BuildSlaveSupport/build.webkit.org-config/config.json: Renamed slaves to workers and slavenames to workernames.

Also deleted unused entry for test-slave.

  • BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Renamed slave to worker.
  • BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py: Ditto.
  • BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py: Ditto.

(create_mock_worker_passwords_dict):

Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json

    r268154 r268429  
    11{
    2     "slaves":     [ { "name": "test-slave", "platform": "*" },
    3 
     2    "workers":     [
    43                    { "name": "bot279", "platform": "mac-bigsur"},
    54
     
    111110                    { "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release",
    112111                      "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
    113                       "slavenames": ["bot279"]
     112                      "workernames": ["bot279"]
    114113                    },
    115114                    { "name": "Apple-Catalina-Debug-Build", "factory": "BuildFactory", "builddir": "catalina-debug",
    116115                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    117116                      "triggers": ["catalina-debug-tests-jsc", "catalina-debug-tests-test262", "catalina-debug-tests-wk1", "catalina-debug-tests-wk2", "catalina-debug-tests-wk2-gpuprocess"],
    118                       "slavenames": ["bot687", "bot688"]
     117                      "workernames": ["bot687", "bot688"]
    119118                    },
    120119                    { "name": "Apple-Catalina-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-debug-tests-wk1",
    121120                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    122121                      "additionalArguments": ["--no-retry-failures"],
    123                       "slavenames": ["bot241", "bot242"]
     122                      "workernames": ["bot241", "bot242"]
    124123                    },
    125124                    { "name": "Apple-Catalina-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-debug-tests-wk2",
    126125                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    127126                      "additionalArguments": ["--no-retry-failures"],
    128                       "slavenames": ["bot243", "bot244"]
     127                      "workernames": ["bot243", "bot244"]
    129128                    },
    130129
     
    132131                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    133132                      "additionalArguments": ["--no-retry-failures", "--use-gpu-process"],
    134                       "slavenames": ["bot260"]
     133                      "workernames": ["bot260"]
    135134                    },
    136135                    { "name": "Apple-Catalina-Release-Build", "factory": "BuildFactory", "builddir": "catalina-release",
    137136                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    138137                      "triggers": ["catalina-release-tests-test262", "catalina-release-tests-jsc", "catalina-release-perf-tests", "catalina-release-tests-wk1", "catalina-release-tests-wk2", "catalina-release-tests-wk2-webgl"],
    139                       "slavenames": ["bot683", "bot674"]
     138                      "workernames": ["bot683", "bot674"]
    140139                    },
    141140                    { "name": "Apple-Catalina-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-release-tests-wk1",
    142141                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    143142                      "additionalArguments": ["--no-retry-failures"],
    144                       "slavenames": ["bot245", "bot246"]
     143                      "workernames": ["bot245", "bot246"]
    145144                    },
    146145                    { "name": "Apple-Catalina-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2",
    147146                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    148147                      "additionalArguments": ["--no-retry-failures"],
    149                       "slavenames": ["bot247", "bot248"]
     148                      "workernames": ["bot247", "bot248"]
    150149                    },
    151150                    { "name": "Apple-Catalina-Release-WK2-WebGL-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2-webgl",
    152151                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    153152                      "additionalArguments": ["--no-retry-failures", "--webgl-test-suite"],
    154                       "slavenames": ["bot302"]
     153                      "workernames": ["bot302"]
    155154                    },
    156155                    { "name": "Apple-Catalina-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-debug-tests-jsc",
    157156                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    158                       "slavenames": ["bot638"]
     157                      "workernames": ["bot638"]
    159158                    },
    160159                    { "name": "Apple-Catalina-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-release-tests-jsc",
    161160                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    162                       "slavenames": ["bot157"]
     161                      "workernames": ["bot157"]
    163162                    },
    164163                    { "name": "Apple-Catalina-LLINT-CLoop-BuildAndTest", "factory": "BuildAndTestLLINTCLoopFactory", "builddir": "catalina-cloop-debug",
    165164                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    166                       "slavenames": ["bot187"]
     165                      "workernames": ["bot187"]
    167166                    },
    168167                    { "name": "Apple-Catalina-Debug-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-debug-tests-test262",
    169168                      "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
    170                       "slavenames": ["bot603"]
     169                      "workernames": ["bot603"]
    171170                    },
    172171                    {
    173172                      "name": "Apple-Catalina-Release-WK2-Perf", "factory": "DownloadAndPerfTestFactory", "builddir": "catalina-release-perf-tests",
    174173                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    175                       "slavenames": ["bot205"]
     174                      "workernames": ["bot205"]
    176175                    },
    177176                    { "name": "Apple-Catalina-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-release-tests-test262",
    178177                      "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
    179                       "slavenames": ["bot632"]
     178                      "workernames": ["bot632"]
    180179                    },
    181180                    { "name": "Apple-Mojave-Debug-Build", "factory": "BuildFactory", "builddir": "mojave-debug",
    182181                      "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
    183182                      "triggers": ["mojave-debug-tests-wk1", "mojave-debug-tests-wk2"],
    184                       "slavenames": ["bot612", "bot613"]
     183                      "workernames": ["bot612", "bot613"]
    185184                    },
    186185                    { "name": "Apple-Mojave-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-debug-tests-wk1",
    187186                      "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
    188187                      "additionalArguments": ["--no-retry-failures"],
    189                       "slavenames": ["bot183", "bot184"]
     188                      "workernames": ["bot183", "bot184"]
    190189                    },
    191190                    { "name": "Apple-Mojave-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "mojave-debug-tests-wk2",
    192191                      "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
    193192                      "additionalArguments": ["--no-retry-failures"],
    194                       "slavenames": ["bot178", "bot179"]
     193                      "workernames": ["bot178", "bot179"]
    195194                    },
    196195                    { "name": "Apple-Mojave-Release-Build", "factory": "BuildFactory", "builddir": "mojave-release",
    197196                      "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
    198197                      "triggers": ["mojave-release-tests-wk1", "mojave-release-tests-wk2"],
    199                       "slavenames": ["bot610", "bot611"]
     198                      "workernames": ["bot610", "bot611"]
    200199                    },
    201200                    { "name": "Apple-Mojave-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-release-tests-wk1",
    202201                      "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
    203202                      "additionalArguments": ["--no-retry-failures"],
    204                       "slavenames": ["bot132", "bot185"]
     203                      "workernames": ["bot132", "bot185"]
    205204                    },
    206205                    { "name": "Apple-Mojave-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "mojave-release-tests-wk2",
    207206                      "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
    208207                      "additionalArguments": ["--no-retry-failures"],
    209                       "slavenames": ["bot198", "bot210"]
     208                      "workernames": ["bot198", "bot210"]
    210209                    },
    211210                    {
    212211                      "name": "Apple-iOS-14-Release-Build", "factory": "BuildFactory", "builddir": "ios-14-release",
    213212                      "platform": "ios-14", "configuration": "release", "architectures": ["arm64"],
    214                       "slavenames": ["bot673"]
     213                      "workernames": ["bot673"]
    215214                    },
    216215                    {
     
    218217                      "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"],
    219218                      "triggers": ["ios-simulator-14-release-tests-wk2", "ipados-simulator-14-release-tests-wk2"],
    220                       "slavenames": ["bot641", "bot682"]
     219                      "workernames": ["bot641", "bot682"]
    221220                    },
    222221                    {
     
    224223                      "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"],
    225224                      "triggers": ["ios-simulator-14-debug-tests-wk2", "ipados-simulator-14-debug-tests-wk2"],
    226                       "slavenames": ["bot694", "bot695"]
     225                      "workernames": ["bot694", "bot695"]
    227226                    },
    228227                    {
     
    230229                      "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "iphone",
    231230                      "additionalArguments": ["--no-retry-failures"],
    232                       "slavenames": ["bot651", "bot652"]
     231                      "workernames": ["bot651", "bot652"]
    233232                    },
    234233                    {
     
    236235                      "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "iphone",
    237236                      "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
    238                       "slavenames": ["bot653", "bot654"]
     237                      "workernames": ["bot653", "bot654"]
    239238                    },
    240239                    {
     
    242241                      "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "ipad",
    243242                      "additionalArguments": ["--no-retry-failures"],
    244                       "slavenames": ["bot667"]
     243                      "workernames": ["bot667"]
    245244                    },
    246245                    {
     
    248247                      "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "ipad",
    249248                      "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
    250                       "slavenames": ["bot664"]
     249                      "workernames": ["bot664"]
    251250                    },
    252251                    {
    253252                      "name": "Apple-tvOS-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-14-release",
    254253                      "platform": "tvos-14", "configuration": "release", "architectures": ["arm64"],
    255                       "slavenames": ["bot607"]
     254                      "workernames": ["bot607"]
    256255                    },
    257256                    {
    258257                      "name": "Apple-tvOS-Simulator-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-simulator-14-release",
    259258                      "platform": "tvos-simulator-14", "configuration": "release", "architectures": ["x86_64"],
    260                       "slavenames": ["bot608"]
     259                      "workernames": ["bot608"]
    261260                    },
    262261                    {
    263262                      "name": "Apple-watchOS-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-7-release",
    264263                      "platform": "watchos-7", "configuration": "release", "architectures": ["arm64_32", "armv7k"],
    265                       "slavenames": ["bot609"]
     264                      "workernames": ["bot609"]
    266265                    },
    267266                    {
    268267                      "name": "Apple-watchOS-Simulator-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-simulator-7-release",
    269268                      "platform": "watchos-simulator-7", "configuration": "release", "architectures": ["i386"],
    270                       "slavenames": ["bot672"]
     269                      "workernames": ["bot672"]
    271270                    },
    272271                    {
     
    274273                      "platform": "win", "configuration": "release", "architectures": ["x86_64"],
    275274                      "triggers": ["win10-release-tests"],
    276                       "slavenames": ["bot548"]
     275                      "workernames": ["bot548"]
    277276                    },
    278277                    {
     
    280279                      "platform": "win", "configuration": "debug", "architectures": ["x86_64"],
    281280                      "triggers": ["win10-debug-tests"],
    282                       "slavenames": ["bot547"]
     281                      "workernames": ["bot547"]
    283282                    },
    284283                    {
    285284                      "name": "Apple-Win-10-Release-Tests", "factory": "TestWebKit1Factory", "builddir": "win10-release-tests",
    286285                      "platform": "win", "configuration": "release", "architectures": ["x86_64"],
    287                       "slavenames": ["bot546"]
     286                      "workernames": ["bot546"]
    288287                    },
    289288                    {
    290289                      "name": "Apple-Win-10-Debug-Tests", "factory": "TestWebKit1Factory", "builddir": "win10-debug-tests",
    291290                      "platform": "win", "configuration": "debug", "architectures": ["x86_64"],
    292                       "slavenames": ["bot545"]
     291                      "workernames": ["bot545"]
    293292                    },
    294293                    {
     
    297296                      "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-tests-js", "gtk-linux-64-release-tests-webdriver",
    298297                                   "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
    299                       "slavenames": ["gtk-linux-slave-2"]
     298                      "workernames": ["gtk-linux-slave-2"]
    300299                    },
    301300                    {
    302301                      "name": "GTK-Linux-64-bit-Release-Tests", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-release-tests",
    303302                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    304                       "slavenames": ["gtk-linux-slave-6"]
     303                      "workernames": ["gtk-linux-slave-6"]
    305304                    },
    306305                    {
    307306                      "name": "GTK-Linux-64-bit-Release-JS-Tests", "factory": "TestJSFactory", "builddir": "gtk-linux-64-release-tests-js",
    308307                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    309                       "slavenames": ["gtk-linux-bot-12"]
     308                      "workernames": ["gtk-linux-bot-12"]
    310309                    },
    311310                    {
    312311                      "name": "GTK-Linux-64-bit-Release-WebDriver-Tests", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-release-tests-webdriver",
    313312                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    314                       "slavenames": ["gtk-linux-bot-14"]
     313                      "workernames": ["gtk-linux-bot-14"]
    315314                    },
    316315                    {
     
    318317                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
    319318                      "triggers": ["gtk-linux-64-debug-tests", "gtk-linux-64-debug-tests-js", "gtk-linux-64-debug-tests-webdriver"],
    320                       "slavenames": ["gtk-linux-slave-3"]
     319                      "workernames": ["gtk-linux-slave-3"]
    321320                    },
    322321                    {
    323322                      "name": "GTK-Linux-64-bit-Debug-Tests", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-debug-tests",
    324323                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
    325                       "slavenames": ["gtk-linux-slave-7"]
     324                      "workernames": ["gtk-linux-slave-7"]
    326325                    },
    327326                    {
    328327                      "name": "GTK-Linux-64-bit-Debug-JS-Tests", "factory": "TestJSFactory", "builddir": "gtk-linux-64-debug-tests-js",
    329328                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
    330                       "slavenames": ["gtk-linux-bot-13"]
     329                      "workernames": ["gtk-linux-bot-13"]
    331330                    },
    332331                    {
    333332                      "name": "GTK-Linux-64-bit-Debug-WebDriver-Tests", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-debug-tests-webdriver",
    334333                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
    335                       "slavenames": ["gtk-linux-bot-15"]
     334                      "workernames": ["gtk-linux-bot-15"]
    336335                    },
    337336                    {
     
    339338                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    340339                      "additionalArguments": ["--display-server=xorg"],
    341                       "slavenames": ["gtk-linux-slave-8"]
     340                      "workernames": ["gtk-linux-slave-8"]
    342341                    },
    343342                    {
     
    345344                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    346345                      "additionalArguments": ["--display-server=wayland"],
    347                       "slavenames": ["gtk-linux-slave-9"]
     346                      "workernames": ["gtk-linux-slave-9"]
    348347                    },
    349348                    {
     
    351350                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    352351                      "additionalArguments": ["--no-experimental-features", "--no-media-source"],
    353                       "slavenames": ["gtk-linux-slave-10"]
     352                      "workernames": ["gtk-linux-slave-10"]
    354353                    },
    355354                    {
     
    357356                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    358357                      "additionalArguments": ["--no-experimental-features", "--no-media-source"],
    359                       "slavenames": ["gtk-linux-slave-11"]
     358                      "workernames": ["gtk-linux-slave-11"]
    360359                    },
    361360                    {
     
    363362                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    364363                      "additionalArguments": ["--no-bubblewrap-sandbox"],
    365                       "slavenames": ["gtk-linux-bot-16"]
     364                      "workernames": ["gtk-linux-bot-16"]
    366365                    },
    367366                    {
     
    369368                      "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
    370369                      "additionalArguments": ["--no-bubblewrap-sandbox"],
    371                       "slavenames": ["gtk-linux-bot-17"]
     370                      "workernames": ["gtk-linux-bot-17"]
    372371                    },
    373372                    {
     
    375374                      "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
    376375                      "triggers": ["wincairo-wkl-release-tests", "wincairo-jsc-release-tests"],
    377                       "slavenames": ["wincairo-wkl-release-build-01"]
     376                      "workernames": ["wincairo-wkl-release-build-01"]
    378377                    },
    379378                    {
    380379                      "name": "WinCairo-64-bit-WKL-Release-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-release-tests",
    381380                      "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
    382                       "slavenames": ["wincairo-wkl-release-tests-01", "wincairo-wkl-release-tests-02"]
     381                      "workernames": ["wincairo-wkl-release-tests-01", "wincairo-wkl-release-tests-02"]
    383382                    },
    384383                    {
    385384                      "name": "WinCairo-64-bit-JSC-Release-Tests", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-release-tests",
    386385                      "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
    387                       "slavenames": ["wincairo-jsc-release-tests-01"]
     386                      "workernames": ["wincairo-jsc-release-tests-01"]
    388387                    },
    389388                    {
     
    391390                      "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
    392391                      "triggers": ["wincairo-wkl-debug-tests", "wincairo-jsc-debug-tests"],
    393                       "slavenames": ["wincairo-wkl-debug-build-01"]
     392                      "workernames": ["wincairo-wkl-debug-build-01"]
    394393                    },
    395394                    {
    396395                      "name": "WinCairo-64-bit-WKL-Debug-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-debug-tests",
    397396                      "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
    398                       "slavenames": ["wincairo-wkl-debug-tests-01", "wincairo-wkl-debug-tests-02"]
     397                      "workernames": ["wincairo-wkl-debug-tests-01", "wincairo-wkl-debug-tests-02"]
    399398                    },
    400399                    {
    401400                      "name": "WinCairo-64-bit-JSC-Debug-Tests", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-debug-tests",
    402401                      "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
    403                       "slavenames": ["wincairo-jsc-debug-tests-01"]
     402                      "workernames": ["wincairo-jsc-debug-tests-01"]
    404403                    },
    405404                    {
    406405                      "name": "PlayStation-Debug-Build", "factory": "BuildFactory", "builddir": "playstation-debug",
    407406                      "platform": "playstation", "configuration": "debug", "architectures": ["x86_64"],
    408                       "slavenames": ["playstation-debug-build-01"]
     407                      "workernames": ["playstation-debug-build-01"]
    409408                    },
    410409                    {
    411410                      "name": "PlayStation-Release-Build", "factory": "BuildFactory", "builddir": "playstation-release",
    412411                      "platform": "playstation", "configuration": "release", "architectures": ["x86_64"],
    413                       "slavenames": ["playstation-release-build-01"]
     412                      "workernames": ["playstation-release-build-01"]
    414413                    },
    415414                    {
    416415                      "name": "JSCOnly-Linux-AArch64-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-aarch64-release",
    417416                      "platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"],
    418                       "slavenames": ["jsconly-linux-igalia-bot-2"]
     417                      "workernames": ["jsconly-linux-igalia-bot-2"]
    419418                    },
    420419                    {
    421420                      "name": "JSCOnly-Linux-ARMv7-Thumb2-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-release",
    422421                      "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
    423                       "slavenames": ["jsconly-linux-igalia-bot-3"]
     422                      "workernames": ["jsconly-linux-igalia-bot-3"]
    424423                    },
    425424                    {
    426425                      "name": "JSCOnly-Linux-ARMv7-Thumb2-SoftFP-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-softfp-release",
    427426                      "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
    428                       "slavenames": ["jsconly-linux-igalia-bot-5"]
     427                      "workernames": ["jsconly-linux-igalia-bot-5"]
    429428                    },
    430429                    {
    431430                      "name": "JSCOnly-Linux-MIPS32el-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-mips32el-release",
    432431                      "platform": "jsc-only", "configuration": "release", "architectures": ["mips"],
    433                       "slavenames": ["jsconly-linux-igalia-bot-1"]
     432                      "workernames": ["jsconly-linux-igalia-bot-1"]
    434433                    },
    435434                    {
     
    437436                      "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
    438437                      "triggers": ["wpe-linux-64-release-tests", "wpe-linux-64-release-tests-js"],
    439                       "slavenames": ["wpe-linux-bot-1"]
     438                      "workernames": ["wpe-linux-bot-1"]
    440439                    },
    441440                    {
    442441                      "name": "WPE-Linux-64-bit-Release-Tests", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-release-tests",
    443442                      "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
    444                       "slavenames": ["wpe-linux-bot-2"]
     443                      "workernames": ["wpe-linux-bot-2"]
    445444                    },
    446445                    {
    447446                      "name": "WPE-Linux-64-bit-Release-JS-Tests", "factory": "TestJSFactory", "builddir": "wpe-linux-64-release-tests-js",
    448447                      "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
    449                       "slavenames": ["wpe-linux-bot-5"]
     448                      "workernames": ["wpe-linux-bot-5"]
    450449                    },
    451450                    {
     
    453452                      "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
    454453                      "triggers": ["wpe-linux-64-debug-tests", "wpe-linux-64-debug-tests-js"],
    455                       "slavenames": ["wpe-linux-bot-3"]
     454                      "workernames": ["wpe-linux-bot-3"]
    456455                    },
    457456                    {
    458457                      "name": "WPE-Linux-64-bit-Debug-Tests", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-debug-tests",
    459458                      "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
    460                       "slavenames": ["wpe-linux-bot-4"]
     459                      "workernames": ["wpe-linux-bot-4"]
    461460                    },
    462461                    {
    463462                      "name": "WPE-Linux-64-bit-Debug-JS-Tests", "factory": "TestJSFactory", "builddir": "wpe-linux-64-debug-tests-js",
    464463                      "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
    465                       "slavenames": ["wpe-linux-bot-6"]
     464                      "workernames": ["wpe-linux-bot-6"]
    466465                    },
    467466                    {
     
    469468                      "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
    470469                      "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
    471                       "slavenames": ["wpe-linux-bot-7"]
     470                      "workernames": ["wpe-linux-bot-7"]
    472471                    },
    473472                    {
     
    475474                      "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
    476475                      "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
    477                       "slavenames": ["wpe-linux-bot-8"]
     476                      "workernames": ["wpe-linux-bot-8"]
    478477                    }
    479478                  ],
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py

    r268154 r268429  
    1 # Copyright (C) 2017 Apple Inc. All rights reserved.
     1# Copyright (C) 2017-2020 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
     
    5151    # FIXME: These file handles are leaked.
    5252    if test_mode_is_enabled:
    53         passwords = make_passwords_json.create_mock_slave_passwords_dict()
     53        passwords = make_passwords_json.create_mock_worker_passwords_dict()
    5454    else:
    5555        passwords = json.load(open('passwords.json'))
     
    5959
    6060    config = json.load(open('config.json'))
    61     c['slaves'] = [BuildSlave(slave['name'], passwords[slave['name']], max_builds=1) for slave in config['slaves']]
     61    c['slaves'] = [BuildSlave(worker['name'], passwords[worker['name']], max_builds=1) for worker in config['workers']]
    6262
    6363    c['schedulers'] = []
     
    9191    c['builders'] = []
    9292    for builder in config['builders']:
    93         for slaveName in builder['slavenames']:
    94             for slave in config['slaves']:
    95                 if slave['name'] != slaveName or slave['platform'] == '*':
     93        for workerName in builder['workernames']:
     94            for worker in config['workers']:
     95                if worker['name'] != workerName or worker['platform'] == '*':
    9696                    continue
    9797
    98                 if slave['platform'] != builder['platform']:
    99                     raise Exception, "Builder %r is for platform %r but has slave %r for platform %r!" % (builder['name'], builder['platform'], slave['name'], slave['platform'])
    100 
     98                if worker['platform'] != builder['platform']:
     99                    raise Exception('Builder {} is for platform {} but has worker {} for platform {}!'.format(builder['name'], builder['platform'], worker['name'], worker['platform']))
    101100                break
    102101
     102        builder['slavenames'] = builder.pop('workernames')  # Workaround for old buildbot to allow using workernames in config.json instead of slavenames
    103103        platform = builder['platform']
    104104
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py

    r267851 r268429  
    3838        valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
    3939                              'defaultProperties', 'device_model', 'env', 'factory', 'icon', 'locks', 'name', 'platform', 'properties',
    40                               'remotes', 'runTests', 'shortname', 'tags', 'triggers', 'workernames', 'slavenames', 'workerbuilddir']
     40                              'remotes', 'runTests', 'shortname', 'tags', 'triggers', 'workernames', 'workerbuilddir']
    4141        for builder in config.get('builders', []):
    4242            for key in builder:
  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py

    r250966 r268429  
    11#!/usr/bin/env python
    22
    3 # Copyright (C) 2011 Apple Inc. All rights reserved.
     3# Copyright (C) 2011-2020 Apple Inc. All rights reserved.
    44# Copyright (C) 2014 University of Szeged. All rights reserved.
    55#
     
    2929
    3030
    31 def create_mock_slave_passwords_dict():
     31def create_mock_worker_passwords_dict():
    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']])
     34    result = dict([(worker['name'], '1234') for worker in config_dict['workers']])
    3535    result['results-server-api-key'] = 'api-key'
    3636    return result
     
    3838if __name__ == '__main__':
    3939    with open('passwords.json', 'w') as passwords_file:
    40         passwords_file.write(json.dumps(create_mock_slave_passwords_dict(), indent=4, sort_keys=True))
     40        passwords_file.write(json.dumps(create_mock_worker_passwords_dict(), indent=4, sort_keys=True))
    4141
    4242    with open('auth.json', 'w') as auth_json_file:
  • trunk/Tools/ChangeLog

    r268428 r268429  
     12020-10-13  Aakash Jain  <aakash_jain@apple.com>
     2
     3        [build.webkit.org] Rename slave to worker in config.json
     4        https://bugs.webkit.org/show_bug.cgi?id=217672
     5
     6        Reviewed by Dewei Zhu.
     7
     8        * BuildSlaveSupport/build.webkit.org-config/config.json: Renamed slaves to workers and slavenames to workernames.
     9        Also deleted unused entry for test-slave.
     10        * BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Renamed slave to worker.
     11        * BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py: Ditto.
     12        * BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py: Ditto.
     13        (create_mock_worker_passwords_dict):
     14
    1152020-10-13  Ellie Epskamp-Hunt  <eepskamphunt@apple.com>
    216
Note: See TracChangeset for help on using the changeset viewer.