Changeset 268429 in webkit
- Timestamp:
- Oct 13, 2020 3:49:41 PM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
r268154 r268429 1 1 { 2 "slaves": [ { "name": "test-slave", "platform": "*" }, 3 2 "workers": [ 4 3 { "name": "bot279", "platform": "mac-bigsur"}, 5 4 … … 111 110 { "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release", 112 111 "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"], 113 " slavenames": ["bot279"]112 "workernames": ["bot279"] 114 113 }, 115 114 { "name": "Apple-Catalina-Debug-Build", "factory": "BuildFactory", "builddir": "catalina-debug", 116 115 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 117 116 "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"] 119 118 }, 120 119 { "name": "Apple-Catalina-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-debug-tests-wk1", 121 120 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 122 121 "additionalArguments": ["--no-retry-failures"], 123 " slavenames": ["bot241", "bot242"]122 "workernames": ["bot241", "bot242"] 124 123 }, 125 124 { "name": "Apple-Catalina-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-debug-tests-wk2", 126 125 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 127 126 "additionalArguments": ["--no-retry-failures"], 128 " slavenames": ["bot243", "bot244"]127 "workernames": ["bot243", "bot244"] 129 128 }, 130 129 … … 132 131 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 133 132 "additionalArguments": ["--no-retry-failures", "--use-gpu-process"], 134 " slavenames": ["bot260"]133 "workernames": ["bot260"] 135 134 }, 136 135 { "name": "Apple-Catalina-Release-Build", "factory": "BuildFactory", "builddir": "catalina-release", 137 136 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 138 137 "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"] 140 139 }, 141 140 { "name": "Apple-Catalina-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-release-tests-wk1", 142 141 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 143 142 "additionalArguments": ["--no-retry-failures"], 144 " slavenames": ["bot245", "bot246"]143 "workernames": ["bot245", "bot246"] 145 144 }, 146 145 { "name": "Apple-Catalina-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2", 147 146 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 148 147 "additionalArguments": ["--no-retry-failures"], 149 " slavenames": ["bot247", "bot248"]148 "workernames": ["bot247", "bot248"] 150 149 }, 151 150 { "name": "Apple-Catalina-Release-WK2-WebGL-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2-webgl", 152 151 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 153 152 "additionalArguments": ["--no-retry-failures", "--webgl-test-suite"], 154 " slavenames": ["bot302"]153 "workernames": ["bot302"] 155 154 }, 156 155 { "name": "Apple-Catalina-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-debug-tests-jsc", 157 156 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 158 " slavenames": ["bot638"]157 "workernames": ["bot638"] 159 158 }, 160 159 { "name": "Apple-Catalina-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-release-tests-jsc", 161 160 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 162 " slavenames": ["bot157"]161 "workernames": ["bot157"] 163 162 }, 164 163 { "name": "Apple-Catalina-LLINT-CLoop-BuildAndTest", "factory": "BuildAndTestLLINTCLoopFactory", "builddir": "catalina-cloop-debug", 165 164 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 166 " slavenames": ["bot187"]165 "workernames": ["bot187"] 167 166 }, 168 167 { "name": "Apple-Catalina-Debug-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-debug-tests-test262", 169 168 "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"], 170 " slavenames": ["bot603"]169 "workernames": ["bot603"] 171 170 }, 172 171 { 173 172 "name": "Apple-Catalina-Release-WK2-Perf", "factory": "DownloadAndPerfTestFactory", "builddir": "catalina-release-perf-tests", 174 173 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 175 " slavenames": ["bot205"]174 "workernames": ["bot205"] 176 175 }, 177 176 { "name": "Apple-Catalina-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-release-tests-test262", 178 177 "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"], 179 " slavenames": ["bot632"]178 "workernames": ["bot632"] 180 179 }, 181 180 { "name": "Apple-Mojave-Debug-Build", "factory": "BuildFactory", "builddir": "mojave-debug", 182 181 "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"], 183 182 "triggers": ["mojave-debug-tests-wk1", "mojave-debug-tests-wk2"], 184 " slavenames": ["bot612", "bot613"]183 "workernames": ["bot612", "bot613"] 185 184 }, 186 185 { "name": "Apple-Mojave-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-debug-tests-wk1", 187 186 "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"], 188 187 "additionalArguments": ["--no-retry-failures"], 189 " slavenames": ["bot183", "bot184"]188 "workernames": ["bot183", "bot184"] 190 189 }, 191 190 { "name": "Apple-Mojave-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "mojave-debug-tests-wk2", 192 191 "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"], 193 192 "additionalArguments": ["--no-retry-failures"], 194 " slavenames": ["bot178", "bot179"]193 "workernames": ["bot178", "bot179"] 195 194 }, 196 195 { "name": "Apple-Mojave-Release-Build", "factory": "BuildFactory", "builddir": "mojave-release", 197 196 "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"], 198 197 "triggers": ["mojave-release-tests-wk1", "mojave-release-tests-wk2"], 199 " slavenames": ["bot610", "bot611"]198 "workernames": ["bot610", "bot611"] 200 199 }, 201 200 { "name": "Apple-Mojave-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-release-tests-wk1", 202 201 "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"], 203 202 "additionalArguments": ["--no-retry-failures"], 204 " slavenames": ["bot132", "bot185"]203 "workernames": ["bot132", "bot185"] 205 204 }, 206 205 { "name": "Apple-Mojave-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "mojave-release-tests-wk2", 207 206 "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"], 208 207 "additionalArguments": ["--no-retry-failures"], 209 " slavenames": ["bot198", "bot210"]208 "workernames": ["bot198", "bot210"] 210 209 }, 211 210 { 212 211 "name": "Apple-iOS-14-Release-Build", "factory": "BuildFactory", "builddir": "ios-14-release", 213 212 "platform": "ios-14", "configuration": "release", "architectures": ["arm64"], 214 " slavenames": ["bot673"]213 "workernames": ["bot673"] 215 214 }, 216 215 { … … 218 217 "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], 219 218 "triggers": ["ios-simulator-14-release-tests-wk2", "ipados-simulator-14-release-tests-wk2"], 220 " slavenames": ["bot641", "bot682"]219 "workernames": ["bot641", "bot682"] 221 220 }, 222 221 { … … 224 223 "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], 225 224 "triggers": ["ios-simulator-14-debug-tests-wk2", "ipados-simulator-14-debug-tests-wk2"], 226 " slavenames": ["bot694", "bot695"]225 "workernames": ["bot694", "bot695"] 227 226 }, 228 227 { … … 230 229 "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "iphone", 231 230 "additionalArguments": ["--no-retry-failures"], 232 " slavenames": ["bot651", "bot652"]231 "workernames": ["bot651", "bot652"] 233 232 }, 234 233 { … … 236 235 "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "iphone", 237 236 "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"], 238 " slavenames": ["bot653", "bot654"]237 "workernames": ["bot653", "bot654"] 239 238 }, 240 239 { … … 242 241 "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "ipad", 243 242 "additionalArguments": ["--no-retry-failures"], 244 " slavenames": ["bot667"]243 "workernames": ["bot667"] 245 244 }, 246 245 { … … 248 247 "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "ipad", 249 248 "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"], 250 " slavenames": ["bot664"]249 "workernames": ["bot664"] 251 250 }, 252 251 { 253 252 "name": "Apple-tvOS-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-14-release", 254 253 "platform": "tvos-14", "configuration": "release", "architectures": ["arm64"], 255 " slavenames": ["bot607"]254 "workernames": ["bot607"] 256 255 }, 257 256 { 258 257 "name": "Apple-tvOS-Simulator-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-simulator-14-release", 259 258 "platform": "tvos-simulator-14", "configuration": "release", "architectures": ["x86_64"], 260 " slavenames": ["bot608"]259 "workernames": ["bot608"] 261 260 }, 262 261 { 263 262 "name": "Apple-watchOS-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-7-release", 264 263 "platform": "watchos-7", "configuration": "release", "architectures": ["arm64_32", "armv7k"], 265 " slavenames": ["bot609"]264 "workernames": ["bot609"] 266 265 }, 267 266 { 268 267 "name": "Apple-watchOS-Simulator-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-simulator-7-release", 269 268 "platform": "watchos-simulator-7", "configuration": "release", "architectures": ["i386"], 270 " slavenames": ["bot672"]269 "workernames": ["bot672"] 271 270 }, 272 271 { … … 274 273 "platform": "win", "configuration": "release", "architectures": ["x86_64"], 275 274 "triggers": ["win10-release-tests"], 276 " slavenames": ["bot548"]275 "workernames": ["bot548"] 277 276 }, 278 277 { … … 280 279 "platform": "win", "configuration": "debug", "architectures": ["x86_64"], 281 280 "triggers": ["win10-debug-tests"], 282 " slavenames": ["bot547"]281 "workernames": ["bot547"] 283 282 }, 284 283 { 285 284 "name": "Apple-Win-10-Release-Tests", "factory": "TestWebKit1Factory", "builddir": "win10-release-tests", 286 285 "platform": "win", "configuration": "release", "architectures": ["x86_64"], 287 " slavenames": ["bot546"]286 "workernames": ["bot546"] 288 287 }, 289 288 { 290 289 "name": "Apple-Win-10-Debug-Tests", "factory": "TestWebKit1Factory", "builddir": "win10-debug-tests", 291 290 "platform": "win", "configuration": "debug", "architectures": ["x86_64"], 292 " slavenames": ["bot545"]291 "workernames": ["bot545"] 293 292 }, 294 293 { … … 297 296 "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-tests-js", "gtk-linux-64-release-tests-webdriver", 298 297 "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"], 299 " slavenames": ["gtk-linux-slave-2"]298 "workernames": ["gtk-linux-slave-2"] 300 299 }, 301 300 { 302 301 "name": "GTK-Linux-64-bit-Release-Tests", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-release-tests", 303 302 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 304 " slavenames": ["gtk-linux-slave-6"]303 "workernames": ["gtk-linux-slave-6"] 305 304 }, 306 305 { 307 306 "name": "GTK-Linux-64-bit-Release-JS-Tests", "factory": "TestJSFactory", "builddir": "gtk-linux-64-release-tests-js", 308 307 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 309 " slavenames": ["gtk-linux-bot-12"]308 "workernames": ["gtk-linux-bot-12"] 310 309 }, 311 310 { 312 311 "name": "GTK-Linux-64-bit-Release-WebDriver-Tests", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-release-tests-webdriver", 313 312 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 314 " slavenames": ["gtk-linux-bot-14"]313 "workernames": ["gtk-linux-bot-14"] 315 314 }, 316 315 { … … 318 317 "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"], 319 318 "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"] 321 320 }, 322 321 { 323 322 "name": "GTK-Linux-64-bit-Debug-Tests", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-debug-tests", 324 323 "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"], 325 " slavenames": ["gtk-linux-slave-7"]324 "workernames": ["gtk-linux-slave-7"] 326 325 }, 327 326 { 328 327 "name": "GTK-Linux-64-bit-Debug-JS-Tests", "factory": "TestJSFactory", "builddir": "gtk-linux-64-debug-tests-js", 329 328 "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"], 330 " slavenames": ["gtk-linux-bot-13"]329 "workernames": ["gtk-linux-bot-13"] 331 330 }, 332 331 { 333 332 "name": "GTK-Linux-64-bit-Debug-WebDriver-Tests", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-debug-tests-webdriver", 334 333 "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"], 335 " slavenames": ["gtk-linux-bot-15"]334 "workernames": ["gtk-linux-bot-15"] 336 335 }, 337 336 { … … 339 338 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 340 339 "additionalArguments": ["--display-server=xorg"], 341 " slavenames": ["gtk-linux-slave-8"]340 "workernames": ["gtk-linux-slave-8"] 342 341 }, 343 342 { … … 345 344 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 346 345 "additionalArguments": ["--display-server=wayland"], 347 " slavenames": ["gtk-linux-slave-9"]346 "workernames": ["gtk-linux-slave-9"] 348 347 }, 349 348 { … … 351 350 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 352 351 "additionalArguments": ["--no-experimental-features", "--no-media-source"], 353 " slavenames": ["gtk-linux-slave-10"]352 "workernames": ["gtk-linux-slave-10"] 354 353 }, 355 354 { … … 357 356 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 358 357 "additionalArguments": ["--no-experimental-features", "--no-media-source"], 359 " slavenames": ["gtk-linux-slave-11"]358 "workernames": ["gtk-linux-slave-11"] 360 359 }, 361 360 { … … 363 362 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 364 363 "additionalArguments": ["--no-bubblewrap-sandbox"], 365 " slavenames": ["gtk-linux-bot-16"]364 "workernames": ["gtk-linux-bot-16"] 366 365 }, 367 366 { … … 369 368 "platform": "gtk", "configuration": "release", "architectures": ["x86_64"], 370 369 "additionalArguments": ["--no-bubblewrap-sandbox"], 371 " slavenames": ["gtk-linux-bot-17"]370 "workernames": ["gtk-linux-bot-17"] 372 371 }, 373 372 { … … 375 374 "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"], 376 375 "triggers": ["wincairo-wkl-release-tests", "wincairo-jsc-release-tests"], 377 " slavenames": ["wincairo-wkl-release-build-01"]376 "workernames": ["wincairo-wkl-release-build-01"] 378 377 }, 379 378 { 380 379 "name": "WinCairo-64-bit-WKL-Release-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-release-tests", 381 380 "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"] 383 382 }, 384 383 { 385 384 "name": "WinCairo-64-bit-JSC-Release-Tests", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-release-tests", 386 385 "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"], 387 " slavenames": ["wincairo-jsc-release-tests-01"]386 "workernames": ["wincairo-jsc-release-tests-01"] 388 387 }, 389 388 { … … 391 390 "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"], 392 391 "triggers": ["wincairo-wkl-debug-tests", "wincairo-jsc-debug-tests"], 393 " slavenames": ["wincairo-wkl-debug-build-01"]392 "workernames": ["wincairo-wkl-debug-build-01"] 394 393 }, 395 394 { 396 395 "name": "WinCairo-64-bit-WKL-Debug-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-debug-tests", 397 396 "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"] 399 398 }, 400 399 { 401 400 "name": "WinCairo-64-bit-JSC-Debug-Tests", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-debug-tests", 402 401 "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"], 403 " slavenames": ["wincairo-jsc-debug-tests-01"]402 "workernames": ["wincairo-jsc-debug-tests-01"] 404 403 }, 405 404 { 406 405 "name": "PlayStation-Debug-Build", "factory": "BuildFactory", "builddir": "playstation-debug", 407 406 "platform": "playstation", "configuration": "debug", "architectures": ["x86_64"], 408 " slavenames": ["playstation-debug-build-01"]407 "workernames": ["playstation-debug-build-01"] 409 408 }, 410 409 { 411 410 "name": "PlayStation-Release-Build", "factory": "BuildFactory", "builddir": "playstation-release", 412 411 "platform": "playstation", "configuration": "release", "architectures": ["x86_64"], 413 " slavenames": ["playstation-release-build-01"]412 "workernames": ["playstation-release-build-01"] 414 413 }, 415 414 { 416 415 "name": "JSCOnly-Linux-AArch64-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-aarch64-release", 417 416 "platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"], 418 " slavenames": ["jsconly-linux-igalia-bot-2"]417 "workernames": ["jsconly-linux-igalia-bot-2"] 419 418 }, 420 419 { 421 420 "name": "JSCOnly-Linux-ARMv7-Thumb2-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-release", 422 421 "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"], 423 " slavenames": ["jsconly-linux-igalia-bot-3"]422 "workernames": ["jsconly-linux-igalia-bot-3"] 424 423 }, 425 424 { 426 425 "name": "JSCOnly-Linux-ARMv7-Thumb2-SoftFP-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-softfp-release", 427 426 "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"], 428 " slavenames": ["jsconly-linux-igalia-bot-5"]427 "workernames": ["jsconly-linux-igalia-bot-5"] 429 428 }, 430 429 { 431 430 "name": "JSCOnly-Linux-MIPS32el-Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-mips32el-release", 432 431 "platform": "jsc-only", "configuration": "release", "architectures": ["mips"], 433 " slavenames": ["jsconly-linux-igalia-bot-1"]432 "workernames": ["jsconly-linux-igalia-bot-1"] 434 433 }, 435 434 { … … 437 436 "platform": "wpe", "configuration": "release", "architectures": ["x86_64"], 438 437 "triggers": ["wpe-linux-64-release-tests", "wpe-linux-64-release-tests-js"], 439 " slavenames": ["wpe-linux-bot-1"]438 "workernames": ["wpe-linux-bot-1"] 440 439 }, 441 440 { 442 441 "name": "WPE-Linux-64-bit-Release-Tests", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-release-tests", 443 442 "platform": "wpe", "configuration": "release", "architectures": ["x86_64"], 444 " slavenames": ["wpe-linux-bot-2"]443 "workernames": ["wpe-linux-bot-2"] 445 444 }, 446 445 { 447 446 "name": "WPE-Linux-64-bit-Release-JS-Tests", "factory": "TestJSFactory", "builddir": "wpe-linux-64-release-tests-js", 448 447 "platform": "wpe", "configuration": "release", "architectures": ["x86_64"], 449 " slavenames": ["wpe-linux-bot-5"]448 "workernames": ["wpe-linux-bot-5"] 450 449 }, 451 450 { … … 453 452 "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"], 454 453 "triggers": ["wpe-linux-64-debug-tests", "wpe-linux-64-debug-tests-js"], 455 " slavenames": ["wpe-linux-bot-3"]454 "workernames": ["wpe-linux-bot-3"] 456 455 }, 457 456 { 458 457 "name": "WPE-Linux-64-bit-Debug-Tests", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-debug-tests", 459 458 "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"], 460 " slavenames": ["wpe-linux-bot-4"]459 "workernames": ["wpe-linux-bot-4"] 461 460 }, 462 461 { 463 462 "name": "WPE-Linux-64-bit-Debug-JS-Tests", "factory": "TestJSFactory", "builddir": "wpe-linux-64-debug-tests-js", 464 463 "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"], 465 " slavenames": ["wpe-linux-bot-6"]464 "workernames": ["wpe-linux-bot-6"] 466 465 }, 467 466 { … … 469 468 "platform": "wpe", "configuration": "release", "architectures": ["x86_64"], 470 469 "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"], 471 " slavenames": ["wpe-linux-bot-7"]470 "workernames": ["wpe-linux-bot-7"] 472 471 }, 473 472 { … … 475 474 "platform": "wpe", "configuration": "release", "architectures": ["x86_64"], 476 475 "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"], 477 " slavenames": ["wpe-linux-bot-8"]476 "workernames": ["wpe-linux-bot-8"] 478 477 } 479 478 ], -
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. 2 2 # 3 3 # Redistribution and use in source and binary forms, with or without … … 51 51 # FIXME: These file handles are leaked. 52 52 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() 54 54 else: 55 55 passwords = json.load(open('passwords.json')) … … 59 59 60 60 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']] 62 62 63 63 c['schedulers'] = [] … … 91 91 c['builders'] = [] 92 92 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'] == '*': 96 96 continue 97 97 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'])) 101 100 break 102 101 102 builder['slavenames'] = builder.pop('workernames') # Workaround for old buildbot to allow using workernames in config.json instead of slavenames 103 103 platform = builder['platform'] 104 104 -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py
r267851 r268429 38 38 valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description', 39 39 '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'] 41 41 for builder in config.get('builders', []): 42 42 for key in builder: -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/make_passwords_json.py
r250966 r268429 1 1 #!/usr/bin/env python 2 2 3 # Copyright (C) 2011 Apple Inc. All rights reserved.3 # Copyright (C) 2011-2020 Apple Inc. All rights reserved. 4 4 # Copyright (C) 2014 University of Szeged. All rights reserved. 5 5 # … … 29 29 30 30 31 def create_mock_ slave_passwords_dict():31 def create_mock_worker_passwords_dict(): 32 32 with open('config.json', 'r') as config_json: 33 33 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']]) 35 35 result['results-server-api-key'] = 'api-key' 36 36 return result … … 38 38 if __name__ == '__main__': 39 39 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)) 41 41 42 42 with open('auth.json', 'w') as auth_json_file: -
trunk/Tools/ChangeLog
r268428 r268429 1 2020-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 1 15 2020-10-13 Ellie Epskamp-Hunt <eepskamphunt@apple.com> 2 16
Note: See TracChangeset
for help on using the changeset viewer.