| Index: scripts/slave/recipe_modules/amp/example.expected/no_device_os_basic.json
|
| diff --git a/scripts/slave/recipe_modules/amp/example.expected/no_device_os_basic.json b/scripts/slave/recipe_modules/amp/example.expected/no_device_os_basic.json
|
| index c6ca566b242f338e7287b15e3535f7edc58320db..9e1d9ab26767b5c3e066006ebd3f14cb7afd3d62 100644
|
| --- a/scripts/slave/recipe_modules/amp/example.expected/no_device_os_basic.json
|
| +++ b/scripts/slave/recipe_modules/amp/example.expected/no_device_os_basic.json
|
| @@ -11,7 +11,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"
|
| },
|
| {
|
| @@ -26,7 +25,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"
|
| },
|
| {
|
| @@ -58,7 +56,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -88,7 +85,6 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save example_gtest_suite"
|
| },
|
| {
|
| @@ -130,7 +126,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -160,7 +155,6 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save example_instrumentation_suite"
|
| },
|
| {
|
| @@ -194,7 +188,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -224,7 +217,6 @@
|
| "{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save example_uirobot_suite"
|
| },
|
| {
|
| @@ -235,7 +227,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[collect] load example_gtest_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -279,7 +270,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -296,7 +286,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] load example_gtest_suite data",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -313,7 +302,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::zip]/resources/unzip.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] unzip results for example_gtest_suite",
|
| "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
|
| },
|
| @@ -329,7 +317,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
|
| "gs://chrome-amp-results/logcats/logcat_example_gtest_suite_T35TRUN1D.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil [upload logcat] example_gtest_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat@https://storage.cloud.google.com/chrome-amp-results/logcats/logcat_example_gtest_suite_T35TRUN1D.txt@@@"
|
| @@ -343,7 +330,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[collect] load example_instrumentation_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -389,7 +375,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -406,7 +391,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] load example_instrumentation_suite data",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -423,7 +407,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::zip]/resources/unzip.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] unzip results for example_instrumentation_suite",
|
| "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
|
| },
|
| @@ -439,7 +422,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
|
| "gs://chrome-amp-results/logcats/logcat_example_instrumentation_suite_T35TRUN1D.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil [upload logcat] example_instrumentation_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat@https://storage.cloud.google.com/chrome-amp-results/logcats/logcat_example_instrumentation_suite_T35TRUN1D.txt@@@"
|
| @@ -453,7 +435,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[collect] load example_uirobot_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -497,7 +478,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -514,7 +494,6 @@
|
| "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] load example_uirobot_suite data",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -531,7 +510,6 @@
|
| "-u",
|
| "RECIPE_MODULE[build::zip]/resources/unzip.py"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[upload logcat] unzip results for example_uirobot_suite",
|
| "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
|
| },
|
| @@ -547,7 +525,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
|
| "gs://chrome-amp-results/logcats/logcat_example_uirobot_suite_T35TRUN1D.txt"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil [upload logcat] example_uirobot_suite",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@logcat@https://storage.cloud.google.com/chrome-amp-results/logcats/logcat_example_uirobot_suite_T35TRUN1D.txt@@@"
|
|
|