| Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json
|
| index 8d8082fb137744007ffd8dd127966f4ecd1d3317..27899dca67733ce377d87945e099479e63da9553 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_swarming_rel.json
|
| @@ -273,15 +273,9 @@
|
| "@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
|
| "@@@STEP_LOG_END@excluded_files@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@{@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ \"system_webview_apk\"@@@",
|
| - "@@@STEP_LOG_LINE@analyze_details@ ], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"additional_compile_targets\": [], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"compile_targets\": [], @@@",
|
| + "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.compile_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"self.m.filter.test_targets\": [], @@@",
|
| "@@@STEP_LOG_LINE@analyze_details@ \"test_targets\": []@@@",
|
| "@@@STEP_LOG_LINE@analyze_details@}@@@",
|
| @@ -292,117 +286,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| - ],
|
| - "name": "cleanup_temp"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| - ],
|
| - "name": "clean local files",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import shutil, sys, os@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@try:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ pass@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "allow_subannotations": false,
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| - "[SLAVE_BUILD]/src",
|
| - "src"
|
| - ],
|
| - "name": "tree truth steps"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| - "gen",
|
| - "-m",
|
| - "tryserver.chromium.android",
|
| - "-b",
|
| - "android_swarming_rel",
|
| - "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| - "--goma-dir",
|
| - "[CACHE]/cipd/goma",
|
| - "//out/Release"
|
| - ],
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| - },
|
| - "name": "generate_build_files (with patch)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
|
| - "--gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--ninja-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--goma-cache-dir",
|
| - "[GOMA_CACHE]",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "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",
|
| - "--goma-fail-fast",
|
| - "--goma-disable-local-fallback",
|
| - "--",
|
| - "system_webview_apk"
|
| - ],
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| - },
|
| - "name": "compile (with patch)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| - "@@@STEP_LOG_END@json.output (invalid)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "import sys; sys.exit(0)"
|
| ],
|
| "name": "mark: before_tests"
|
|
|