Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json |
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json |
index 7afec2ec6b92413b6828daff9ca350b4687e8bb5..f72fad49b128d68baa29dbe7750d4def06441d80 100644 |
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json |
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json |
@@ -270,6 +270,17 @@ |
"cmd": [ |
"python", |
"-u", |
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py", |
+ "--build-dir", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/out/Release", |
+ "--clean-isolated-files" |
+ ], |
+ "name": "clean isolated files" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
"[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/mb/mb.py", |
"gen", |
"-m", |
@@ -280,13 +291,19 @@ |
"[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/mb/mb_config.pyl", |
"--goma-dir", |
"[CACHE]/cipd/goma", |
+ "--swarming-targets-file", |
+ "browser_tests\n", |
"//out/Release" |
], |
"cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine/src", |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
}, |
- "name": "generate_build_files" |
+ "name": "generate_build_files", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests@@@", |
+ "@@@STEP_LOG_END@swarming-targets-file.txt@@@" |
+ ] |
}, |
{ |
"cmd": [ |
@@ -325,8 +342,8 @@ |
"--goma-dir", |
"[CACHE]/cipd/goma", |
"--", |
- "All", |
- "chromium_builder_tests" |
+ "browser_tests", |
+ "browser_tests_run" |
], |
"env": { |
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
@@ -338,6 +355,103 @@ |
] |
}, |
{ |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/determinism/remove_build_metadata.py", |
+ "--build-dir", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/out/Release" |
+ ], |
+ "cwd": "[SLAVE_BUILD]", |
+ "name": "remove_build_metadata" |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::isolate]/resources/isolate.py", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/swarming_client", |
+ "batcharchive", |
+ "--dump-json", |
+ "/path/to/tmp/json", |
+ "--isolate-server", |
+ "https://isolateserver.appspot.com", |
+ "--verbose", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/out/Release/browser_tests.isolated.gen.json" |
+ ], |
+ "name": "isolate tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@json.output@{@@@", |
+ "@@@STEP_LOG_LINE@json.output@ \"browser_tests\": \"[dummy hash for browser_tests]\"@@@", |
+ "@@@STEP_LOG_LINE@json.output@}@@@", |
+ "@@@STEP_LOG_END@json.output@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py", |
+ "--build-dir", |
+ "[BUILDER_CACHE]/Blimp_Linux_Engine/src/out/Release", |
+ "--output-json", |
+ "/path/to/tmp/json" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
+ }, |
+ "name": "find isolated tests", |
+ "~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@}@@@", |
+ "@@@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]\"}@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n", |
+ "browser_tests" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
+ }, |
+ "name": "[error] browser_tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@print '*.isolated file for target %s is missing' % sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
+ "cmd": [ |
+ "python", |
+ "-u", |
+ "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n", |
+ "browser_tests" |
+ ], |
+ "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine", |
+ "env": { |
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json" |
+ }, |
+ "name": "[collect error] browser_tests", |
+ "~followup_annotations": [ |
+ "@@@STEP_LOG_LINE@python.inline@@@@", |
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@", |
+ "@@@STEP_LOG_LINE@python.inline@print '%s wasn\\'t triggered' % sys.argv[1]@@@", |
+ "@@@STEP_LOG_LINE@python.inline@sys.exit(1)@@@", |
+ "@@@STEP_LOG_END@python.inline@@@" |
+ ] |
+ }, |
+ { |
"name": "$result", |
"recipe_result": null, |
"status_code": 0 |