| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| index 18ca6f948690f9b7cb05bb1133376fe1587804ae..dbfcac7d7e1e3a89ddc27ddf4c5feafb5792eb31 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| @@ -183,6 +183,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/linux/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"
|
| ],
|
| @@ -190,7 +203,7 @@
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "component=static_library dcheck_always_on=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library dcheck_always_on=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -227,7 +240,18 @@
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Site Isolation Linux\": {@@@",
|
| + "@@@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@@@"
|
| ]
|
| },
|
| @@ -246,6 +270,17 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| + "--clean-isolated-files"
|
| + ],
|
| + "name": "clean isolated files"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| @@ -256,13 +291,19 @@
|
| "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| + "--swarming-targets-file",
|
| + "browser_tests\n",
|
| "//out/Release"
|
| ],
|
| "cwd": "[BUILDER_CACHE]/linux/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": [
|
| @@ -303,6 +344,8 @@
|
| "--ninja-ensure-up-to-date",
|
| "--",
|
| "blink_tests",
|
| + "browser_tests",
|
| + "browser_tests_run",
|
| "content_browsertests",
|
| "content_unittests"
|
| ],
|
| @@ -319,6 +362,83 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/linux/src/tools/determinism/remove_build_metadata.py",
|
| + "--build-dir",
|
| + "[BUILDER_CACHE]/linux/src/out/Release"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| + "name": "remove_build_metadata"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client",
|
| + "batcharchive",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| + "[BUILDER_CACHE]/linux/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]/linux/src/out/Release",
|
| + "--output-json",
|
| + "/path/to/tmp/json"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| + "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]/linux",
|
| + "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",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| @@ -394,6 +514,26 @@
|
| ]
|
| },
|
| {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
|
| + "browser_tests"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| + "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
|
|
|