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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.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/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_webview_aosp_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.json
diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.json b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.json
index c05611e02c8f4665c347069c467504ecd4a7d98c..3d93890706b8bfd3b969f95c72e3d4595c61ae89 100644
--- a/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.json
+++ b/scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_cq.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_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",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--issue",
"12853011",
"--patchset",
@@ -30,6 +30,7 @@
"src@HEAD",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -106,11 +107,12 @@
"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",
- "[CWD]/src/out/Release/debug_info_dumps",
- "[CWD]/src/out/Release/test_logs",
- "[CWD]/src/out/build_product.zip",
- "[CWD]/src"
+ "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",
+ "[SLAVE_BUILD]/src/out/Release/test_logs",
+ "[SLAVE_BUILD]/src/out/build_product.zip",
+ "[SLAVE_BUILD]/src"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -135,7 +137,7 @@
"--cached",
"--name-only"
],
- "cwd": "[CWD]/src",
+ "cwd": "[SLAVE_BUILD]/src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -147,23 +149,25 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/symlink.py",
+ "[SLAVE_BUILD]/src/build/symlink.py",
"-f",
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/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",
"--",
- "[CWD]/src/build/android/adb_logcat_monitor.py",
- "[CWD]/src/out/logcat"
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
+ "[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "spawn_logcat_monitor"
},
@@ -174,27 +178,29 @@
"RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
"--verbose",
"--adb-path",
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
+ "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "authorize_adb_devices"
},
{
"cmd": [
- "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
"--json-output",
"/path/to/tmp/json",
"--blacklist-file",
- "[CWD]/src/out/bad_devices.json",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
"--known-devices-file",
- "[ROOT]/b/build/site_config/.known_devices"
+ "[BUILD]/site_config/.known_devices"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "device_status_check",
"~followup_annotations": [
@@ -296,11 +302,11 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/provision_devices.py",
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py",
"-t",
"Release",
"--blacklist-file",
- "[CWD]/src/out/bad_devices.json",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
"--output-device-blacklist",
"/path/to/tmp/json",
"--min-battery-level",
@@ -311,9 +317,10 @@
"350",
"--remove-system-webview"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "provision_devices"
},
@@ -328,13 +335,14 @@
"/tmp/device_monitor.pid",
"--",
"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"[\"07a00ca4\"]",
"tryserver.chromium.perf",
"android_s5_perf_cq",
"--blacklist-file",
- "[CWD]/src/out/bad_devices.json"
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -344,12 +352,13 @@
"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_CHROMIUM_NO_ACTION": "1",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm use_goma=1",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -359,10 +368,11 @@
"-u",
"RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py",
"--source",
- "[CWD]/src/tools/run-perf-test.cfg",
+ "[SLAVE_BUILD]/src/tools/run-perf-test.cfg",
"--output_json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "load config",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -380,6 +390,7 @@
"-u",
"import sys; sys.exit(1)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Recipe failed. Reason: Could not load config file. Double check your changes to config files for syntax errors.",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@import sys; sys.exit(1)@@@",
@@ -396,17 +407,19 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/build/android/adb_logcat_printer.py",
+ "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
"--output-path",
- "[CWD]/src/out/Release/full_log",
- "[CWD]/src/out/logcat"
+ "[SLAVE_BUILD]/src/out/Release/full_log",
+ "[SLAVE_BUILD]/src/out/logcat"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -415,7 +428,7 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"--force-version",
"4.7",
"-o",
@@ -424,9 +437,10 @@
"cp",
"-a",
"public-read",
- "[CWD]/src/out/Release/full_log",
+ "[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/android_s5_perf_cq/571"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_s5_perf_cq/571@@@"
@@ -434,30 +448,32 @@
},
{
"cmd": [
- "[CWD]/src/third_party/android_platform/development/scripts/stack",
+ "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
"--arch",
"arm",
"--more-info",
- "[CWD]/src/out/Release/full_log"
+ "[SLAVE_BUILD]/src/out/Release/full_log"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_with_logcat_dump"
},
{
"cmd": [
- "[CWD]/src/build/android/tombstones.py",
+ "[SLAVE_BUILD]/src/build/android/tombstones.py",
"-a",
"-s",
"-w"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_tombstones"
},
@@ -466,8 +482,9 @@
"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",
- "[CWD]/src/out/Release/test_logs/*.log"
+ "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
« no previous file with comments | « scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_s5_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/perf_tryjob_config_error_android_webview_aosp_perf_bisect.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698