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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/amp/example.expected/multiple_device_oses_basic.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.expected/minimum_device_os_basic.json ('k') | scripts/slave/recipe_modules/amp/example.expected/multiple_devices_basic.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/multiple_device_oses_basic.json
diff --git a/scripts/slave/recipe_modules/amp/example.expected/multiple_device_oses_basic.json b/scripts/slave/recipe_modules/amp/example.expected/multiple_device_oses_basic.json
index 57969170f74bb85a55a4ced6301c30bde4e9ba8d..5ad4dd69fb3fc922c2488f1064ffd3b47281bf3e 100644
--- a/scripts/slave/recipe_modules/amp/example.expected/multiple_device_oses_basic.json
+++ b/scripts/slave/recipe_modules/amp/example.expected/multiple_device_oses_basic.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",
@@ -60,8 +62,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": [
@@ -87,15 +90,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",
@@ -113,9 +117,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",
@@ -134,8 +138,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": [
@@ -161,15 +166,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",
@@ -179,9 +185,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",
@@ -200,8 +206,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": [
@@ -227,8 +234,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"
},
{
@@ -236,9 +244,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@{@@@",
@@ -257,7 +266,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"gtest",
"-s",
"example_gtest_suite",
@@ -265,9 +274,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",
@@ -277,13 +286,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": [
@@ -295,9 +305,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@{@@@",
@@ -314,8 +325,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": [
@@ -323,12 +335,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@@@"
@@ -339,9 +352,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@{@@@",
@@ -360,7 +374,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",
@@ -370,9 +384,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",
@@ -382,13 +396,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": [
@@ -400,9 +415,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@{@@@",
@@ -419,8 +435,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": [
@@ -428,12 +445,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@@@"
@@ -444,9 +462,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@{@@@",
@@ -465,7 +484,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/test_runner.py",
+ "[SLAVE_BUILD]/src/build/android/test_runner.py",
"uirobot",
"--minutes",
"5",
@@ -473,9 +492,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",
@@ -485,13 +504,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": [
@@ -503,9 +523,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@{@@@",
@@ -522,8 +543,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": [
@@ -531,12 +553,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.expected/minimum_device_os_basic.json ('k') | scripts/slave/recipe_modules/amp/example.expected/multiple_devices_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698