Index: scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json |
diff --git a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json |
index 7723cc3e60bf41566519a040e08d0720b2e0f7e0..122dd8a9484207c7d8ae1396fefb13f48930050e 100644 |
--- a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json |
+++ b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_in_second_sub_range.json |
@@ -97,63 +97,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma" |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[CACHE]/cipd/goma", |
- "--list", |
- "infra_internal/goma/client/linux-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -177,7 +120,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "gclient runhooks" |
@@ -348,66 +291,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r7.ensure_goma", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r7.ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[CACHE]/cipd/goma", |
- "--list", |
- "infra_internal/goma/client/linux-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r7.ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -417,7 +300,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "test r7.gclient runhooks", |
@@ -479,7 +362,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -541,7 +424,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -574,10 +457,8 @@ |
"goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
- "--goma-service-account-json-file", |
- "/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"--ninja-ensure-up-to-date", |
"--", |
"target_name" |
@@ -698,66 +579,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r3.ensure_goma", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r3.ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[CACHE]/cipd/goma", |
- "--list", |
- "infra_internal/goma/client/linux-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r3.ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -767,7 +588,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "test r3.gclient runhooks", |
@@ -829,7 +650,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -891,7 +712,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -924,10 +745,8 @@ |
"goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
- "--goma-service-account-json-file", |
- "/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"--ninja-ensure-up-to-date", |
"--", |
"target_name" |
@@ -1044,66 +863,6 @@ |
] |
}, |
{ |
- "cmd": [], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r4.ensure_goma", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@1@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "python", |
- "-u", |
- "RECIPE_MODULE[build::cipd]/resources/bootstrap.py", |
- "--platform", |
- "linux-amd64", |
- "--dest-directory", |
- "[SLAVE_BUILD]/cipd", |
- "--json-output", |
- "/path/to/tmp/json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r4.ensure_goma.install cipd", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
- "cmd": [ |
- "[SLAVE_BUILD]/cipd/cipd", |
- "ensure", |
- "--root", |
- "[CACHE]/cipd/goma", |
- "--list", |
- "infra_internal/goma/client/linux-amd64 release", |
- "--json-output", |
- "/path/to/tmp/json", |
- "--service-account-json", |
- "/creds/service_accounts/service-account-goma-client.json" |
- ], |
- "cwd": "[SLAVE_BUILD]", |
- "name": "test r4.ensure_goma.ensure_installed", |
- "~followup_annotations": [ |
- "@@@STEP_NEST_LEVEL@2@@@", |
- "@@@STEP_LOG_LINE@json.output@{@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@", |
- "@@@STEP_LOG_LINE@json.output@ {@@@", |
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@", |
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@", |
- "@@@STEP_LOG_LINE@json.output@ }@@@", |
- "@@@STEP_LOG_LINE@json.output@ ]@@@", |
- "@@@STEP_LOG_LINE@json.output@}@@@", |
- "@@@STEP_LOG_END@json.output@@@" |
- ] |
- }, |
- { |
"cmd": [ |
"python", |
"-u", |
@@ -1113,7 +872,7 @@ |
"cwd": "[SLAVE_BUILD]", |
"env": { |
"GYP_CHROMIUM_NO_ACTION": "1", |
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library ffmpeg_branding=Chrome gomadir='[BUILD]/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1", |
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]" |
}, |
"name": "test r4.gclient runhooks", |
@@ -1175,7 +934,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -1237,7 +996,7 @@ |
"--config-file", |
"[SLAVE_BUILD]/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"//out/Release" |
], |
"cwd": "[SLAVE_BUILD]", |
@@ -1270,10 +1029,8 @@ |
"goma", |
"--goma-jsonstatus", |
"/path/to/tmp/json", |
- "--goma-service-account-json-file", |
- "/creds/service_accounts/service-account-goma-client.json", |
"--goma-dir", |
- "[CACHE]/cipd/goma", |
+ "[BUILD]/goma", |
"--ninja-ensure-up-to-date", |
"--", |
"target_name" |