| Index: scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json b/scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json
|
| index 0451fcea6e6b9f8540027c026a8974c74a8a5d21..b5dae9cf4aee465d1f3ac537190453cb7cd2ef87 100644
|
| --- a/scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json
|
| +++ b/scripts/slave/recipes/chromium.expected/amp_split_recipe_instrumentation_trigger_failure.json
|
| @@ -25,7 +25,6 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -99,7 +98,6 @@
|
| },
|
| {
|
| "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -114,7 +112,6 @@
|
| "--json-output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma.install cipd",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| @@ -139,7 +136,6 @@
|
| "--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@@@",
|
| @@ -161,7 +157,6 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CROSSCOMPILE": "1",
|
| @@ -185,7 +180,6 @@
|
| "--properties",
|
| "{\"buildername\": \"Android Tests (amp instrumentation test split)\", \"buildnumber\": \"77457\", \"mastername\": \"chromium.fyi\", \"slavename\": \"build1-a1\", \"target_platform\": \"android\"}"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| @@ -200,7 +194,6 @@
|
| "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| @@ -217,7 +210,6 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -230,7 +222,6 @@
|
| "[SLAVE_BUILD]/src/out/build_product.zip",
|
| "[SLAVE_BUILD]/src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -255,7 +246,6 @@
|
| "[SLAVE_BUILD]/src",
|
| "src"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "tree truth steps"
|
| },
|
| {
|
| @@ -265,7 +255,6 @@
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| "[SLAVE_BUILD]/src/out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -295,7 +284,6 @@
|
| "--build-number",
|
| "77457"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| @@ -306,7 +294,6 @@
|
| "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "List adb devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -323,7 +310,6 @@
|
| "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -350,7 +336,6 @@
|
| "gs://chrome-amp-keys/main_pool/api_key",
|
| "[BUILD]/site_config/.amp_main_pool_key"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download amp api key"
|
| },
|
| {
|
| @@ -365,7 +350,6 @@
|
| "gs://chrome-amp-keys/main_pool/api_secret",
|
| "[BUILD]/site_config/.amp_main_pool_secret"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download amp api secret"
|
| },
|
| {
|
| @@ -404,7 +388,6 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| @@ -423,7 +406,6 @@
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|