| Index: scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests.json b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests.json
|
| index fd4ddeb36e28eca3ce66c84ad5d661ffe31785e5..7b90b6a3df651dca8af0fdddf5d22919a56f60ba 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_mac_Mac10_9_Tests.json
|
| @@ -74,24 +74,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
|
| - "--version"
|
| - ],
|
| - "name": "swarming.py --version",
|
| - "stdout": "/path/to/tmp/",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@0.4.10@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "[DEPOT_TOOLS]/gclient.py",
|
| "runhooks"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1"
|
| + "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=ia32 use_goma=1"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -106,18 +93,7 @@
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
|
| - "@@@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@@@"
|
| ]
|
| },
|
| @@ -178,109 +154,10 @@
|
| "--build-archive-url",
|
| "gs://test-domain/test-archive.zip",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.9 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"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\": \"Mac10.9 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Mac10.9 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"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\": \"Mac10.9 Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.mac\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Mac Builder\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "name": "extract build"
|
| - },
|
| - {
|
| - "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.8/ffffffffff/Mac10.9 Tests/571",
|
| - "--dump-json",
|
| - "/path/to/tmp/json",
|
| - "--expiration",
|
| - "3600",
|
| - "--io-timeout",
|
| - "1200",
|
| - "--hard-timeout",
|
| - "3600",
|
| - "--dimension",
|
| - "cpu",
|
| - "x86-64",
|
| - "--dimension",
|
| - "gpu",
|
| - "none",
|
| - "--dimension",
|
| - "os",
|
| - "Mac-10.8",
|
| - "--dimension",
|
| - "pool",
|
| - "Chrome",
|
| - "--tag",
|
| - "buildername:Mac10.9 Tests",
|
| - "--tag",
|
| - "buildnumber:571",
|
| - "--tag",
|
| - "data:ffffffffffffffffffffffffffffffffffffffff",
|
| - "--tag",
|
| - "master:chromium.mac",
|
| - "--tag",
|
| - "name:browser_tests",
|
| - "--tag",
|
| - "os:Mac-10.8",
|
| - "--tag",
|
| - "project:chromium",
|
| - "--tag",
|
| - "purpose:CI",
|
| - "--tag",
|
| - "purpose:post-commit",
|
| - "--idempotent",
|
| - "ffffffffffffffffffffffffffffffffffffffff",
|
| - "--",
|
| - "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
|
| - ],
|
| - "name": "[trigger] browser_tests",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"browser_tests/Mac-10.8/ffffffffff/Mac10.9 Tests/571\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"browser_tests/Mac-10.8/ffffffffff/Mac10.9 Tests/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@@@"
|
| - ]
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/recipe_modules/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.8/ffffffffff/Mac10.9 Tests/571"
|
| - ],
|
| - "name": "browser_tests"
|
| }
|
| ]
|
|
|