| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| index ef0fdf89bdb1abb277e2d2fb019e0864f02b1dd1..43922b9ea305a57432ed2180ce323110825f50d8 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Win.json
|
| @@ -190,6 +190,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\tools\\swarming_client\\swarming.py",
|
| + "--version"
|
| + ],
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.8.6@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
|
| "runhooks"
|
| ],
|
| @@ -197,7 +210,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -234,7 +247,18 @@
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [BUILDER_CACHE]\\Site_Isolation_Win\\src\\testing\\buildbot\\chromium.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Site Isolation Win\": {@@@",
|
| + "@@@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_END@json.output@@@"
|
| ]
|
| },
|
| @@ -253,6 +277,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\out\\Release",
|
| + "--clean-isolated-files"
|
| + ],
|
| + "name": "clean isolated files"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\tools\\mb\\mb.py",
|
| "gen",
|
| "-m",
|
| @@ -263,13 +298,19 @@
|
| "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\tools\\mb\\mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]\\cipd\\goma",
|
| + "--swarming-targets-file",
|
| + "browser_tests\n",
|
| "//out/Release"
|
| ],
|
| "cwd": "[BUILDER_CACHE]\\Site_Isolation_Win\\src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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": [
|
| @@ -309,6 +350,8 @@
|
| "[CACHE]\\cipd\\goma",
|
| "--",
|
| "blink_tests",
|
| + "browser_tests",
|
| + "browser_tests_run",
|
| "content_browsertests",
|
| "content_unittests"
|
| ],
|
| @@ -325,6 +368,83 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\tools\\determinism\\remove_build_metadata.py",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\out\\Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "remove_build_metadata"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\tools\\swarming_client",
|
| + "batcharchive",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| + "[BUILDER_CACHE]\\Site_Isolation_Win\\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]\\Site_Isolation_Win\\src\\out\\Release",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]\\Site_Isolation_Win",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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]\\Site_Isolation_Win",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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",
|
| "[BUILDER_CACHE]\\Site_Isolation_Win\\src\\third_party\\WebKit\\Tools\\Scripts\\run-webkit-tests",
|
| "--target",
|
| "Release",
|
| @@ -391,6 +511,26 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| + "browser_tests"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]\\Site_Isolation_Win",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\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@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\process_dumps.py",
|
| "--target",
|
| "Release"
|
|
|