| Index: scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug_builder.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug_builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug_builder.json
|
| index 4a69a63f6877144d852c4996beaacbc7096403f0..bd7ca9e06fa587e27c599ac1e0f009410ff558b2 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug_builder.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug_builder.json
|
| @@ -15,7 +15,7 @@
|
| "--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",
|
| @@ -40,20 +40,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.4.10@@@"
|
| ]
|
| },
|
| {
|
| @@ -121,7 +142,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_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x87 v8_use_snapshot=false",
|
| + "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x87 v8_use_snapshot=false",
|
| "GYP_GENERATORS": "ninja",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -168,6 +189,7 @@
|
| "@@@STEP_LOG_LINE@diff@+ cool_flag: a=1@@@",
|
| "@@@STEP_LOG_LINE@diff@- gomadir: '[CACHE]/cipd/goma'@@@",
|
| "@@@STEP_LOG_LINE@diff@- target_arch: ia32@@@",
|
| + "@@@STEP_LOG_LINE@diff@- test_isolation_mode: prepare@@@",
|
| "@@@STEP_LOG_LINE@diff@- use_goma: 1@@@",
|
| "@@@STEP_LOG_LINE@diff@- v8_enable_slow_dchecks: 1@@@",
|
| "@@@STEP_LOG_LINE@diff@- v8_optimized_debug: 1@@@",
|
| @@ -278,6 +300,47 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "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/Debug/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",
|
| + "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| + "--",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "----",
|
| + "cp",
|
| + "-a",
|
| + "public-read",
|
| + "{\"bot_default\": \"[dummy hash for bot_default]\"}",
|
| + "gs://chromium-v8/v8-linux-x87-nosnap-dbg/full-build-linux_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json"
|
| + ],
|
| + "name": "gsutil upload",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8/v8-linux-x87-nosnap-dbg/full-build-linux_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json@@@"
|
| + ]
|
| + },
|
| + {
|
| "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| @@ -311,12 +374,16 @@
|
| "builder_name": "V8 Linux - x87 - nosnap - debug",
|
| "properties": {
|
| "parent_build_environment": {
|
| - "GYP_DEFINES": "target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x87 v8_use_snapshot=false",
|
| + "GYP_DEFINES": "target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x87 v8_use_snapshot=false",
|
| "GYP_GENERATORS": "ninja"
|
| },
|
| "parent_got_revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| "parent_got_revision_cp": "refs/heads/master@{#50110}",
|
| - "revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c"
|
| + "parent_got_swarming_client_revision": "e4fee0b18f8163be6097c9c571640038896debc4",
|
| + "revision": "f2cbea7e89a45f46819777bb78a1f5bd0241f64c",
|
| + "swarm_hashes": {
|
| + "bot_default": "[dummy hash for bot_default]"
|
| + }
|
| }
|
| }
|
| ],
|
|
|