Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/amp/example.expected/bad_test_id_data_for_upload.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« scripts/slave/recipe_modules/amp/api.py ('K') | « scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json ('k') | scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json » ('j') | scripts/slave/recipe_modules/chromium_android/api.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..55665facb1dd29c0e70f7c64047e601ffb863b57 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
@@ -5,13 +5,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/main_pool/api_key",
- "[BUILD]/site_config/.amp_main_pool_key"
+ "[ROOT]/b/build/site_config/.amp_main_pool_key"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api key"
},
{
@@ -20,20 +19,19 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/main_pool/api_secret",
- "[BUILD]/site_config/.amp_main_pool_secret"
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api secret"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"example_gtest_suite",
@@ -41,9 +39,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -60,9 +58,8 @@
"/path/to/tmp/json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[trigger] example_gtest_suite",
"~followup_annotations": [
@@ -88,16 +85,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"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"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_gtest_suite"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"instrumentation",
"--apk-under-test",
"ApkUnderTest.apk",
@@ -115,9 +111,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -134,9 +130,8 @@
"/path/to/tmp/json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[trigger] example_instrumentation_suite",
"~followup_annotations": [
@@ -162,16 +157,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"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"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_instrumentation_suite"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"uirobot",
"--minutes",
"5",
@@ -181,9 +175,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -200,9 +194,8 @@
"/path/to/tmp/json",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[trigger] example_uirobot_suite",
"~followup_annotations": [
@@ -228,9 +221,8 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"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"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_uirobot_suite"
},
{
@@ -238,10 +230,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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@{@@@",
@@ -260,7 +251,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"example_gtest_suite",
@@ -268,9 +259,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -280,14 +271,13 @@
"--device-type",
"Android",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[collect] example_gtest_suite",
"~followup_annotations": [
@@ -299,10 +289,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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,9 +304,8 @@
"-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\"}"
+ "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -325,13 +313,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[TMP]/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@@@"
@@ -342,10 +329,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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@{@@@",
@@ -364,7 +350,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"instrumentation",
"--apk-under-test",
"ApkUnderTest.apk",
@@ -374,9 +360,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -386,14 +372,13 @@
"--device-type",
"Android",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[collect] example_instrumentation_suite",
"~followup_annotations": [
@@ -405,10 +390,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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,9 +409,8 @@
"-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\"}"
+ "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -435,13 +418,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[TMP]/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@@@"
@@ -452,10 +434,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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@{@@@",
@@ -474,7 +455,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"uirobot",
"--minutes",
"5",
@@ -482,9 +463,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_main_pool_key",
+ "[ROOT]/b/build/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_main_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -494,14 +475,13 @@
"--device-type",
"Android",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
},
"name": "[collect] example_uirobot_suite",
"~followup_annotations": [
@@ -513,10 +493,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/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,9 +512,8 @@
"-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\"}"
+ "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -543,13 +521,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[TMP]/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@@@"
« scripts/slave/recipe_modules/amp/api.py ('K') | « scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json ('k') | scripts/slave/recipe_modules/amp/example.expected/device_oem_basic.json » ('j') | scripts/slave/recipe_modules/chromium_android/api.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698