Changeset 206184 in webkit


Ignore:
Timestamp:
Sep 20, 2016 4:11:08 PM (8 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r206180.

Roll r206178 back in as the necessary changes have been made
on the build master.

Reverted changeset:

"Unreviewed, rolling out r206178."
​https://bugs.webkit.org/show_bug.cgi?id=162249
​http://trac.webkit.org/changeset/206180

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r206180 r206184  
    4242                    { "name": "bot419", "platform": "mac-elcapitan" },
    4343
     44                    { "name": "bot118", "platform": "mac-sierra" },
     45                    { "name": "bot122", "platform": "mac-sierra" },
     46                    { "name": "bot137", "platform": "mac-sierra" },
     47                    { "name": "bot140", "platform": "mac-sierra" },
     48                    { "name": "bot141", "platform": "mac-sierra" },
     49                    { "name": "bot160", "platform": "mac-sierra" },
     50                    { "name": "bot164", "platform": "mac-sierra" },
     51                    { "name": "bot199", "platform": "mac-sierra" },
     52                    { "name": "bot439", "platform": "mac-sierra" },
     53                    { "name": "bot443", "platform": "mac-sierra" },
     54                    { "name": "bot600", "platform": "mac-sierra" },
     55                    { "name": "bot698", "platform": "mac-sierra" },
     56                    { "name": "bot699", "platform": "mac-sierra" },
     57
    4458                    { "name": "bot407", "platform": "ios-10" },
    4559                    { "name": "bot197", "platform": "ios-simulator-10" },
    … …  
    8296                  ],
    8397
    84     "builders":   [ { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
     98    "builders":   [ { "name": "Apple Sierra Debug (Build)", "type": "Build", "builddir": "sierra-debug",
     99                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
     100                      "triggers": ["sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
     101                      "slavenames": ["bot439", "bot698"]
     102                    },
     103                    { "name": "Apple Sierra Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-debug-tests-wk1",
     104                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
     105                      "additionalArguments": ["--no-retry-failures"],
     106                      "slavenames": ["bot118", "bot122"]
     107                    },
     108                    { "name": "Apple Sierra Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "sierra-debug-tests-wk2",
     109                      "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
     110                      "additionalArguments": ["--no-retry-failures"],
     111                      "slavenames": ["bot137", "bot140"]
     112                    },
     113                    { "name": "Apple Sierra Release (Build)", "type": "Build", "builddir": "sierra-release",
     114                      "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
     115                      "triggers": ["sierra-release-tests-wk1", "sierra-release-tests-wk2"],
     116                      "slavenames": ["bot443", "bot699"]
     117                    },
     118                    { "name": "Apple Sierra Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-release-tests-wk1",
     119                      "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
     120                      "additionalArguments": ["--no-retry-failures"],
     121                      "slavenames": ["bot141", "bot160"]
     122                    },
     123                    { "name": "Apple Sierra Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "sierra-release-tests-wk2",
     124                      "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
     125                      "additionalArguments": ["--no-retry-failures"],
     126                      "slavenames": ["bot164", "bot199"]
     127                    },
     128                    { "name": "Apple Sierra Release (32-bit Build)", "type": "Build", "builddir": "sierra-32bit-release",
     129                      "platform": "mac-sierra", "configuration": "release", "architectures": ["i386"],
     130                      "slavenames": ["bot600"]
     131                    },
     132                    { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
    85133                      "platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
    86134                      "triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
    … …  
    349397                      "builderNames": ["Apple El Capitan Release (Build)", "Apple El Capitan Debug (Build)", "Apple El Capitan LLINT CLoop (BuildAndTest)", "Apple El Capitan 32-bit JSC (BuildAndTest)", "Apple El Capitan Release (32-bit Build)", "Apple El Capitan CMake Debug (Build)"]
    350398                    },
     399                    { "type": "PlatformSpecificScheduler", "platform": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
     400                      "builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)"]
     401                    },
    351402                    { "type": "PlatformSpecificScheduler", "platform": "ios-10", "branch": "trunk", "treeStableTimer": 45.0,
    352403                      "builderNames": ["Apple iOS 10 Release (Build)"]
    … …  
    357408                    { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
    358409                      "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
     410                    },
     411                    { "type": "Triggerable", "name": "sierra-release-tests-wk1",
     412                      "builderNames": ["Apple Sierra Release WK1 (Tests)"]
     413                    },
     414                    { "type": "Triggerable", "name": "sierra-release-tests-wk2",
     415                      "builderNames": ["Apple Sierra Release WK2 (Tests)"]
     416                    },
     417                    { "type": "Triggerable", "name": "sierra-debug-tests-wk1",
     418                      "builderNames": ["Apple Sierra Debug WK1 (Tests)"]
     419                    },
     420                    { "type": "Triggerable", "name": "sierra-debug-tests-wk2",
     421                      "builderNames": ["Apple Sierra Debug WK2 (Tests)"]
    359422                    },
    360423                    { "type": "Triggerable", "name": "elcapitan-leaks",

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

    r206180 r206184  
    399399    'Apple El Capitan Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
    400400
     401    'Apple Sierra Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
     402    'Apple Sierra Debug WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     403    'Apple Sierra Debug WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     404    'Apple Sierra Release (32-bit Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
     405    'Apple Sierra Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
     406    'Apple Sierra Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     407    'Apple Sierra Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
     408
    401409    'Apple iOS 10 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
    402410    'Apple iOS 10 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js

    r206180 r206184  
    2727{
    2828    const queueInfo = {
     29        "Apple Sierra Debug (Build)": {platform: Dashboard.Platform.macOSSierra, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     30        "Apple Sierra Release (Build)": {platform: Dashboard.Platform.macOSSierra, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
     31        "Apple Sierra Release (32-bit Build)": {platform: Dashboard.Platform.macOSSierra, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
     32        "Apple Sierra Debug WK1 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
     33        "Apple Sierra Debug WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
     34        "Apple Sierra Release WK1 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
     35        "Apple Sierra Release WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
    2936        "Apple El Capitan Debug (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
    3037        "Apple El Capitan Release (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},

  • trunk/Tools/ChangeLog

    r206182 r206184  
     12016-09-20  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, rolling out r206180.
     4
     5        Roll r206178 back in as the necessary changes have been made
     6        on the build master.
     7
     8        Reverted changeset:
     9
     10        "Unreviewed, rolling out r206178."
     11        https://bugs.webkit.org/show_bug.cgi?id=162249
     12        http://trac.webkit.org/changeset/206180
     13
    1142016-09-20  Alexey Proskuryakov  <ap@apple.com>
    215
Note: See TracChangeset for help on using the changeset viewer.