| Index: scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Mac10_9.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Mac10_9.json b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Mac10_9.json
|
| index ff802bd64337b265818b2ba5d84b73121171fd6b..b5cadd9fe6e00cf2145d550bb54782787c2a332f 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Mac10_9.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_webkit_WebKit_Mac10_9.json
|
| @@ -21,7 +21,7 @@
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@1111111",
|
| + "src@HEAD",
|
| "--revision",
|
| "src/third_party/WebKit@HEAD",
|
| "--force",
|
| @@ -37,7 +37,7 @@
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"src/third_party/WebKit\": \"HEAD\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| @@ -163,18 +163,7 @@
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webkit.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"WebKit Mac10.9\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -194,144 +183,101 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/src/out/Release"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "rmtree build directory",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--build-archive-url",
|
| - "gs://test-domain/test-archive.zip",
|
| - "--master-name",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "gen",
|
| + "-m",
|
| "chromium.webkit",
|
| - "--build-number",
|
| - "571"
|
| + "-b",
|
| + "WebKit Mac10.9",
|
| + "--config-file",
|
| + "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| + "//out/Release"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "extract build"
|
| + "name": "generate_build_files"
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| + "--src-dir",
|
| + "[SLAVE_BUILD]/src",
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "find isolated tests",
|
| + "name": "clang_revision",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| - "trigger",
|
| - "--swarming",
|
| - "https://chromium-swarm.appspot.com",
|
| - "--isolate-server",
|
| - "https://isolateserver.appspot.com",
|
| - "--priority",
|
| - "25",
|
| - "--shards",
|
| - "1",
|
| - "--task-name",
|
| - "browser_tests/Mac-10.9/ffffffffff/WebKit Mac10.9/571",
|
| - "--dump-json",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| + "--show-path",
|
| + "python",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| + "--ninja-path",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| + "--target",
|
| + "Release",
|
| + "--src-dir",
|
| + "[SLAVE_BUILD]/src",
|
| + "--goma-cache-dir",
|
| + "[GOMA_CACHE]",
|
| + "--build-tool",
|
| + "ninja",
|
| + "--compiler",
|
| + "goma-clang",
|
| + "--goma-jsonstatus",
|
| "/path/to/tmp/json",
|
| - "--expiration",
|
| - "3600",
|
| - "--io-timeout",
|
| - "1200",
|
| - "--hard-timeout",
|
| - "3600",
|
| - "--dimension",
|
| - "cpu",
|
| - "x86-64",
|
| - "--dimension",
|
| - "gpu",
|
| - "none",
|
| - "--dimension",
|
| - "os",
|
| - "Mac-10.9",
|
| - "--dimension",
|
| - "pool",
|
| - "Chrome",
|
| - "--tag",
|
| - "buildername:WebKit Mac10.9",
|
| - "--tag",
|
| - "buildnumber:571",
|
| - "--tag",
|
| - "data:ffffffffffffffffffffffffffffffffffffffff",
|
| - "--tag",
|
| - "master:chromium.webkit",
|
| - "--tag",
|
| - "name:browser_tests",
|
| - "--tag",
|
| - "os:Mac-10.9",
|
| - "--tag",
|
| - "project:chromium",
|
| - "--tag",
|
| - "purpose:CI",
|
| - "--tag",
|
| - "purpose:post-commit",
|
| - "--tag",
|
| - "slavename:TestSlavename",
|
| - "--tag",
|
| - "stepname:browser_tests on Mac-10.9",
|
| - "--idempotent",
|
| - "ffffffffffffffffffffffffffffffffffffffff",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| "--",
|
| - "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| + "blink_tests"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "[trigger] browser_tests on Mac-10.9",
|
| + "name": "compile",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Mac-10.9/ffffffffff/WebKit Mac10.9/571\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Mac-10.9/ffffffffff/WebKit Mac10.9/571\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
|
| + "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| + "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| ]
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| + "--show-path",
|
| + "python",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| + "--target",
|
| + "Release",
|
| + "--build-url",
|
| + "gs://chromium-webkit-archive/chromium.webkit/WebKit Mac10.9",
|
| + "--build_revision",
|
| + "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| + "--gs-acl",
|
| + "public-read",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "package build"
|
| + },
|
| + {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -339,9 +285,9 @@
|
| "--target",
|
| "Release",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"WebKit Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"WebKit Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"browser_tests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"WebKit Mac10.9\", \"buildnumber\": 571, \"gs_acl\": \"public-read\", \"mastername\": \"chromium.webkit\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--step-name=webkit_tests",
|
| "--builder-name=WebKit Mac10.9",
|
| "--slave-name=TestSlavename",
|
| @@ -397,59 +343,6 @@
|
| ]
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "python",
|
| - "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
|
| - "--swarming-client-dir",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client",
|
| - "--temp-root-dir",
|
| - "[TMP_BASE]",
|
| - "--merged-test-output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "collect",
|
| - "--swarming",
|
| - "https://chromium-swarm.appspot.com",
|
| - "--decorate",
|
| - "--print-status-updates",
|
| - "--shards",
|
| - "1",
|
| - "browser_tests/Mac-10.9/ffffffffff/WebKit Mac10.9/571"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "browser_tests on Mac-10.9",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LINK@shard #0 isolated out@blah@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
|
| - "--input-gtest-json",
|
| - "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
|
| - "--master-name",
|
| - "chromium.webkit",
|
| - "--builder-name",
|
| - "WebKit Mac10.9",
|
| - "--build-number",
|
| - "571",
|
| - "--test-type",
|
| - "browser_tests on Mac-10.9",
|
| - "--test-results-server",
|
| - "test-results.appspot.com",
|
| - "--chrome-revision",
|
| - "170242"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "Upload to test-results [browser_tests on Mac-10.9]"
|
| - },
|
| - {
|
| "name": "$result",
|
| "recipe_result": null,
|
| "status_code": 0
|
|
|