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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/cronet/example.expected/local_test.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/cipd/test_api.py ('K') | « scripts/slave/recipe_modules/commit_position/example.expected/valid.json ('k') | scripts/slave/recipe_modules/crrev/example.expected/empty_commit_hash_output.json » ('j') | scripts/slave/recipe_modules/ios/api.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/cronet/example.expected/local_test.json
diff --git a/scripts/slave/recipe_modules/cronet/example.expected/local_test.json b/scripts/slave/recipe_modules/cronet/example.expected/local_test.json
index 70f036d7557f4dc1a440280c904f758143597b09..3f3c982e48b79e0dc3dc41e25a08539072211a15 100644
--- a/scripts/slave/recipe_modules/cronet/example.expected/local_test.json
+++ b/scripts/slave/recipe_modules/cronet/example.expected/local_test.json
@@ -4,9 +4,8 @@
"python",
"-u",
"\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
- "[SLAVE_BUILD]"
+ "[CWD]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup index.lock",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -35,13 +34,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_src_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -49,7 +48,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -126,12 +124,11 @@
"python",
"-u",
"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
- "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Debug/test_logs",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "[SLAVE_BUILD]/src"
+ "[CWD]/src/out/Debug/debug_info_dumps",
+ "[CWD]/src/out/Debug/test_logs",
+ "[CWD]/src/out/build_product.zip",
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -156,12 +153,11 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library disable_brotli_filter=1 disable_file_support=1 disable_ftp_support=1 enable_bidirectional_stream=1 enable_websockets=0 fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=0 use_platform_icu_alternatives=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_DEFINES": "OS=android component=static_library disable_brotli_filter=1 disable_file_support=1 disable_ftp_support=1 enable_bidirectional_stream=1 enable_websockets=0 fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=0 use_platform_icu_alternatives=1",
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -180,9 +176,9 @@
"--target",
"Debug",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[CWD]/src",
"--goma-cache-dir",
- "[GOMA_CACHE]",
+ "[ROOT]/b/build/slave/goma_cache",
"--build-tool",
"ninja",
"--compiler",
@@ -192,7 +188,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--clobber",
"--",
"cronet_package",
@@ -203,10 +199,9 @@
"net_unittests",
"net_unittests_apk"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [
@@ -219,10 +214,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/chrome/VERSION",
+ "[CWD]/src/chrome/VERSION",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get version"
},
{
@@ -231,13 +225,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
- "[SLAVE_BUILD]/src/out/Debug/cronet/VERSION",
+ "[CWD]/src/out/Debug/cronet/VERSION",
"gs://chromium-cronet/android/37.0.2021.0/Debug/VERSION"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload_cronet_version",
"~followup_annotations": [
"@@@STEP_LINK@Cronet version@https://storage.cloud.google.com/chromium-cronet/android/37.0.2021.0/Debug/VERSION@@@"
@@ -249,14 +242,13 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"-R",
- "[SLAVE_BUILD]/src/out/Debug/cronet",
+ "[CWD]/src/out/Debug/cronet",
"gs://chromium-cronet/android/37.0.2021.0/Debug"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload_cronet_package",
"~followup_annotations": [
"@@@STEP_LINK@Cronet package@https://storage.cloud.google.com/chromium-cronet/android/37.0.2021.0/Debug@@@"
@@ -266,25 +258,23 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/symlink.py",
+ "[CWD]/src/build/symlink.py",
"-f",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"name": "create adb symlink"
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
"--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/build/android/adb_logcat_monitor.py",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "spawn_logcat_monitor"
},
@@ -295,29 +285,27 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "authorize_adb_devices"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
"--json-output",
"/path/to/tmp/json",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[ROOT]/b/build/site_config/.known_devices"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "device_status_check",
"~followup_annotations": [
@@ -419,18 +407,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "[CWD]/src/build/android/provision_devices.py",
"-t",
"Debug",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--output-device-blacklist",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "provision_devices"
},
@@ -445,31 +432,29 @@
"/tmp/device_monitor.pid",
"--",
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"[\"07a00ca4\"]",
"chromium.testing.master",
"local_test",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
+ "[CWD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_unittests",
+ "[CWD]/src/out/Debug/bin/run_cronet_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"180"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "cronet_unittests"
},
@@ -477,17 +462,16 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_net_unittests",
+ "[CWD]/src/out/Debug/bin/run_net_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"-t",
"180"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "net_unittests"
},
@@ -495,28 +479,26 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_sample_test_apk",
+ "[CWD]/src/out/Debug/bin/run_cronet_sample_test_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--num-retries",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test cronet_sample_test_apk"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Debug/bin/run_cronet_test_instrumentation_apk",
+ "[CWD]/src/out/Debug/bin/run_cronet_test_instrumentation_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--num-retries",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test cronet_test_instrumentation_apk"
},
{
@@ -529,19 +511,17 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[CWD]/src/build/android/adb_logcat_printer.py",
"--output-path",
- "[SLAVE_BUILD]/src/out/Debug/full_log",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/out/Debug/full_log",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -550,17 +530,16 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"--force-version",
"4.7",
"-o",
"GSUtil:parallel_composite_upload_threshold=50M",
"----",
"cp",
- "[SLAVE_BUILD]/src/out/Debug/full_log",
+ "[CWD]/src/out/Debug/full_log",
"gs://chromium-android/logcat_dumps/local_test/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/local_test/571@@@"
@@ -568,32 +547,30 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
+ "[CWD]/src/third_party/android_platform/development/scripts/stack",
"--arch",
"arm",
"--more-info",
- "[SLAVE_BUILD]/src/out/Debug/full_log"
+ "[CWD]/src/out/Debug/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_with_logcat_dump"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/tombstones.py",
+ "[CWD]/src/build/android/tombstones.py",
"-a",
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Debug",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_tombstones"
},
@@ -602,9 +579,8 @@
"python",
"-u",
"\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
- "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
+ "[CWD]/src/out/Debug/test_logs/*.log"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
« scripts/slave/recipe_modules/cipd/test_api.py ('K') | « scripts/slave/recipe_modules/commit_position/example.expected/valid.json ('k') | scripts/slave/recipe_modules/crrev/example.expected/empty_commit_hash_output.json » ('j') | scripts/slave/recipe_modules/ios/api.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698