| Index: scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json
|
| diff --git a/scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json b/scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json
|
| index 89fa3c178cfbae4fa18d652f4af1f2a393fa46a3..386125449b14050a159380c6ff68ca82d255d7b8 100644
|
| --- a/scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json
|
| +++ b/scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.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"
|
| },
|
| {
|
| @@ -60,7 +58,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -90,7 +87,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"
|
| },
|
| {
|
| @@ -134,7 +130,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -164,7 +159,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"
|
| },
|
| {
|
| @@ -200,7 +194,6 @@
|
| "/path/to/tmp/json",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -230,7 +223,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"
|
| },
|
| {
|
| @@ -241,7 +233,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@{@@@",
|
| @@ -285,7 +276,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -302,7 +292,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@{}@@@",
|
| @@ -315,7 +304,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\"}"
|
| },
|
| @@ -331,7 +319,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@@@"
|
| @@ -345,7 +332,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@{@@@",
|
| @@ -391,7 +377,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -408,7 +393,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@{@@@",
|
| @@ -425,7 +409,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\"}"
|
| },
|
| @@ -441,7 +424,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@@@"
|
| @@ -455,7 +437,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@{@@@",
|
| @@ -499,7 +480,6 @@
|
| "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
|
| },
|
| @@ -516,7 +496,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@{@@@",
|
| @@ -533,7 +512,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\"}"
|
| },
|
| @@ -549,7 +527,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@@@"
|
|
|