| Index: scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json
|
| diff --git a/scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json b/scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json
|
| index 7154ae10fdc3ecf3d651f4178070e3a4fab253dd..11b6220885c6ccb8e1da759afbeb5594ef89d1ca 100644
|
| --- a/scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json
|
| +++ b/scripts/slave/recipe_modules/amp/example.expected/device_oem_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"
|
| },
|
| {
|
| @@ -62,7 +60,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -92,7 +89,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"
|
| },
|
| {
|
| @@ -138,7 +134,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -168,7 +163,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"
|
| },
|
| {
|
| @@ -206,7 +200,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -236,7 +229,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"
|
| },
|
| {
|
| @@ -247,7 +239,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@{@@@",
|
| @@ -291,7 +282,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -308,7 +298,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@{@@@",
|
| @@ -325,7 +314,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\"}"
|
| },
|
| @@ -341,7 +329,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@@@"
|
| @@ -355,7 +342,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@{@@@",
|
| @@ -401,7 +387,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -418,7 +403,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@{@@@",
|
| @@ -435,7 +419,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\"}"
|
| },
|
| @@ -451,7 +434,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@@@"
|
| @@ -465,7 +447,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@{@@@",
|
| @@ -509,7 +490,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -526,7 +506,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@{@@@",
|
| @@ -543,7 +522,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\"}"
|
| },
|
| @@ -559,7 +537,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@@@"
|
|
|