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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
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
« no previous file with comments | « scripts/slave/recipe_modules/amp/example.py ('k') | scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/amp/example.expected/bad_device_data_for_collect.json
diff --git a/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_for_collect.json b/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_for_collect.json
index a47cad222e38d7fb1f93fe379e2e6da27a240a92..42d53bbde85763e5a7713c6659e1b0ee0c24b658 100644
--- a/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_for_collect.json
+++ b/scripts/slave/recipe_modules/amp/example.expected/bad_device_data_for_collect.json
@@ -5,12 +5,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/main_pool/api_key",
- "[ROOT]/b/build/site_config/.amp_main_pool_key"
+ "[BUILD]/site_config/.amp_main_pool_key"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api key"
},
{
@@ -19,19 +20,20 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/main_pool/api_secret",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret"
+ "[BUILD]/site_config/.amp_main_pool_secret"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api secret"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
"example_gtest_suite",
@@ -39,9 +41,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -58,8 +60,9 @@
"/path/to/tmp/json",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[trigger] example_gtest_suite",
"~followup_annotations": [
@@ -85,15 +88,16 @@
"-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]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_gtest_suite"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"instrumentation",
"--apk-under-test",
"ApkUnderTest.apk",
@@ -111,9 +115,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -130,8 +134,9 @@
"/path/to/tmp/json",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[trigger] example_instrumentation_suite",
"~followup_annotations": [
@@ -157,15 +162,16 @@
"-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]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_instrumentation_suite"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"uirobot",
"--minutes",
"5",
@@ -175,9 +181,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -194,8 +200,9 @@
"/path/to/tmp/json",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[trigger] example_uirobot_suite",
"~followup_annotations": [
@@ -221,8 +228,9 @@
"-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]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save example_uirobot_suite"
},
{
@@ -230,9 +238,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{}@@@",
@@ -243,7 +252,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
"example_gtest_suite",
@@ -251,9 +260,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -263,13 +272,14 @@
"--device-type",
"Android",
"--collect",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[collect] example_gtest_suite",
"~followup_annotations": [
@@ -282,9 +292,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{@@@",
@@ -301,8 +312,9 @@
"-u",
"RECIPE_MODULE[build::zip]/resources/unzip.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[upload logcat] unzip results for example_gtest_suite",
- "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
+ "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -310,12 +322,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[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@@@"
@@ -326,9 +339,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{@@@",
@@ -347,7 +361,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"instrumentation",
"--apk-under-test",
"ApkUnderTest.apk",
@@ -357,9 +371,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -369,13 +383,14 @@
"--device-type",
"Android",
"--collect",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[collect] example_instrumentation_suite",
"~followup_annotations": [
@@ -387,9 +402,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{@@@",
@@ -406,8 +422,9 @@
"-u",
"RECIPE_MODULE[build::zip]/resources/unzip.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[upload logcat] unzip results for example_instrumentation_suite",
- "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
+ "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -415,12 +432,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[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@@@"
@@ -431,9 +449,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{@@@",
@@ -452,7 +471,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"uirobot",
"--minutes",
"5",
@@ -460,9 +479,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_key",
+ "[BUILD]/site_config/.amp_main_pool_key",
"--api-secret-file",
- "[ROOT]/b/build/site_config/.amp_main_pool_secret",
+ "[BUILD]/site_config/.amp_main_pool_secret",
"--api-address",
"127.0.0.1",
"--api-port",
@@ -472,13 +491,14 @@
"--device-type",
"Android",
"--collect",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug"
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug"
},
"name": "[collect] example_uirobot_suite",
"~followup_annotations": [
@@ -490,9 +510,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[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@{@@@",
@@ -509,8 +530,9 @@
"-u",
"RECIPE_MODULE[build::zip]/resources/unzip.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[upload logcat] unzip results for example_uirobot_suite",
- "stdin": "{\"output\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
+ "stdin": "{\"output\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/unzipped_results\", \"zip_file\": \"[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip\"}"
},
{
"cmd": [
@@ -518,12 +540,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
- "[TMP]/amp_results_tmp_2/T35TRUN1D/unzipped_results/appurify_results/logcat.txt",
+ "[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@@@"
« no previous file with comments | « scripts/slave/recipe_modules/amp/example.py ('k') | scripts/slave/recipe_modules/amp/example.expected/bad_device_data_from_trigger.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698