| Index: scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___s390___sim.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___s390___sim.json b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___s390___sim.json
|
| index 1b5e6210e91c460ed6a1c657fb3863f2efdd2eec..066190d62deedb4d3ac970b1538343c77e261089 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___s390___sim.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___s390___sim.json
|
| @@ -9,7 +9,7 @@
|
| "--patch_root",
|
| "v8",
|
| "--revision_mapping_file",
|
| - "{\"v8\": \"got_revision\"}",
|
| + "{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
|
| "--git-cache-dir",
|
| "[GIT_CACHE]",
|
| "--output_json",
|
| @@ -34,20 +34,41 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"v8\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/v8.git\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"v8/tools/swarming_client\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/v8/tools/swarming_client.git\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"e4fee0b18f8163be6097c9c571640038896debc4\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"v8\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#50110}\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#50110}\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"e4fee0b18f8163be6097c9c571640038896debc4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#108913}\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"root\": \"v8\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| "@@@SET_BUILD_PROPERTY@got_revision@\"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#50110}\"@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#50110}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#108913}\"@@@",
|
| + "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"e4fee0b18f8163be6097c9c571640038896debc4\"@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| + "--version"
|
| + ],
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.8.6@@@"
|
| ]
|
| },
|
| {
|
| @@ -119,7 +140,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_target_arch=s390",
|
| + "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=s390",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -423,7 +444,85 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/v8/tools/run-tests.py",
|
| + "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client",
|
| + "batcharchive",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| + "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json"
|
| + ],
|
| + "name": "isolate tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"bot_default\": \"[dummy hash for bot_default]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
|
| + "trigger",
|
| + "--swarming",
|
| + "https://chromium-swarm.appspot.com",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--priority",
|
| + "35",
|
| + "--shards",
|
| + "2",
|
| + "--task-name",
|
| + "Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--expiration",
|
| + "7200",
|
| + "--io-timeout",
|
| + "1200",
|
| + "--hard-timeout",
|
| + "3600",
|
| + "--dimension",
|
| + "cpu",
|
| + "x86-64",
|
| + "--dimension",
|
| + "gpu",
|
| + "none",
|
| + "--dimension",
|
| + "os",
|
| + "Ubuntu-14.04",
|
| + "--dimension",
|
| + "pool",
|
| + "Chrome",
|
| + "--tag",
|
| + "buildername:V8 Linux - s390 - sim",
|
| + "--tag",
|
| + "buildnumber:571",
|
| + "--tag",
|
| + "data:[dummy hash for bot_default]",
|
| + "--tag",
|
| + "master:client.v8.ports",
|
| + "--tag",
|
| + "name:Check",
|
| + "--tag",
|
| + "os:Ubuntu-14.04",
|
| + "--tag",
|
| + "project:v8",
|
| + "--tag",
|
| + "purpose:CI",
|
| + "--tag",
|
| + "purpose:post-commit",
|
| + "--tag",
|
| + "slavename:TestSlavename",
|
| + "--tag",
|
| + "stepname:Check on Ubuntu-14.04",
|
| + "--idempotent",
|
| + "[dummy hash for bot_default]",
|
| + "--",
|
| "--progress=verbose",
|
| "--mode",
|
| "Release",
|
| @@ -433,14 +532,57 @@
|
| "out",
|
| "--buildbot",
|
| "--timeout=200",
|
| - "--random-seed=-358114921",
|
| + "--random-seed=-976563914",
|
| "bot_default",
|
| "--exhaustive-variants",
|
| "--rerun-failures-count=2",
|
| + "--swarming",
|
| "--json-test-results",
|
| - "/path/to/tmp/json"
|
| + "${ISOLATED_OUTDIR}/output.json"
|
| + ],
|
| + "name": "[trigger] Check on Ubuntu-14.04",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571:2:0\": {@@@",
|
| + "@@@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@ \"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571:2:1\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 1, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"@@@",
|
| + "@@@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_LINK@shard #1@https://chromium-swarm.appspot.com/user/task/10100@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| + "--swarming-client-dir",
|
| + "[SLAVE_BUILD]/v8/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",
|
| + "--json",
|
| + "{\"base_task_name\": \"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571\", \"tasks\": {\"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}, \"Check/Ubuntu-14.04/[dummy has/V8 Linux - s390 - sim/571:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"}}}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
|
|