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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.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/chromium_android/example.py ('K') | « scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/downgrade_install_tester_basic.json » ('j') | scripts/slave/recipe_modules/cipd/test_api.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.json
index 4053cccdf2aa841eaf3211116042727c1928dd05..44d2bc4864554dcbeaf4f2ebad116f20b45bf501 100644
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.json
+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/device_flags_builder_basic.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@@@@",
@@ -30,9 +29,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -42,11 +40,10 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/gclient_safe_revert.py",
+ "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py",
".",
- "[DEPOT_TOOLS]/gclient"
+ "[ROOT]/b/depot_tools/gclient"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gclient revert"
},
{
@@ -64,7 +61,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -109,12 +105,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/Release/debug_info_dumps",
- "[SLAVE_BUILD]/src/out/Release/test_logs",
- "[SLAVE_BUILD]/src/out/build_product.zip",
- "[SLAVE_BUILD]/src"
+ "[CWD]/src/out/Release/debug_info_dumps",
+ "[CWD]/src/out/Release/test_logs",
+ "[CWD]/src/out/build_product.zip",
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -139,25 +134,23 @@
"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 fastbuild=1 target_arch=arm",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
{
"allow_subannotations": false,
"cmd": [
- "[SLAVE_BUILD]/src/build/tree_truth.sh",
- "[SLAVE_BUILD]/src",
+ "[CWD]/src/build/tree_truth.sh",
+ "[CWD]/src",
"src",
"foo",
"src/repo"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -165,10 +158,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"
},
{
@@ -177,31 +169,30 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"--force-version",
"4.7",
"----",
"cp",
"gs://build-bucket/build_product.zip",
- "[SLAVE_BUILD]/src/out/build_product.zip"
+ "[CWD]/src/out/build_product.zip"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil download_build_product"
},
{
"cmd": [
"unzip",
"-o",
- "[SLAVE_BUILD]/src/out/build_product.zip"
+ "[CWD]/src/out/build_product.zip"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[CWD]/src",
"name": "unzip_build_product"
},
{
"cmd": [
- "[DEPOT_TOOLS]/git_number.py"
+ "[ROOT]/b/depot_tools/git_number.py"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[CWD]/src",
"name": "git_number",
"stdout": "/path/to/tmp/"
},
@@ -210,10 +201,9 @@
"python",
"-u",
"RECIPE_MODULE[build::adb]/resources/list_devices.py",
- "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+ "['[CWD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "List adb devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -227,10 +217,9 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -249,13 +238,12 @@
"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"
},
@@ -266,29 +254,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": [
@@ -390,35 +376,33 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "[CWD]/src/build/android/provision_devices.py",
"-t",
"Release",
"--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"
},
{
"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 (2)",
"~followup_annotations": [
@@ -520,20 +504,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "[CWD]/src/build/android/provision_devices.py",
"-t",
"Release",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--output-device-blacklist",
"/path/to/tmp/json",
"--reboot-timeout",
"1800"
],
- "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 (2)"
},
@@ -541,18 +524,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"monkey",
"-v",
"--package=chrome",
"--event-count=50000",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
+ "[CWD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"BUILDTYPE": "Release",
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "Monkey Test"
},
@@ -560,10 +542,10 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"instrumentation",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--flakiness-dashboard-server",
"test-results.appspot.com",
"-A",
@@ -572,13 +554,13 @@
"FlakyTest",
"--screenshot",
"--host-driven-root",
- "[SLAVE_BUILD]/src/chrome/test",
+ "[CWD]/src/chrome/test",
"--device-flags",
"device_flags_file",
"--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
+ "[CWD]/src/out/Release/apks/AndroidWebViewTest.apk",
"--apk-under-test",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
+ "[CWD]/src/out/Release/apks/AndroidWebView.apk",
"--additional-apk",
"Additional.apk",
"--isolate-file-path",
@@ -586,9 +568,8 @@
"--release",
"--official-build"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "Instrumentation test SmallTest"
},
@@ -596,41 +577,38 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_unittests",
+ "[CWD]/src/out/Release/bin/run_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
- "--isolate_file_path=[SLAVE_BUILD]/src/some_file.isolate",
+ "--isolate_file_path=[CWD]/src/some_file.isolate",
"--gtest_filter=WebRtc*",
"--tool=asan"
],
- "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": "unittests"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/tools/prepare-bisect-perf-regression.py",
+ "[CWD]/src/tools/prepare-bisect-perf-regression.py",
"-w",
- "[SLAVE_BUILD]"
+ "[CWD]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "prepare bisect perf regression"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/tools/run-bisect-perf-regression.py",
+ "[CWD]/src/tools/run-bisect-perf-regression.py",
"-w",
- "[SLAVE_BUILD]",
+ "[CWD]",
"--extra_src",
"test.py",
"--path_to_config",
"test.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "run bisect perf regression"
},
{
@@ -638,56 +616,52 @@
"python",
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/tee.py",
- "[SLAVE_BUILD]/src/out/Release/full_log",
+ "[CWD]/src/out/Release/full_log",
"--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/build/android/adb_logcat_printer.py",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
"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/Release/full_log"
+ "[CWD]/src/out/Release/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
"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/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
"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"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/asan_symbolize.py",
+ "[CWD]/src/build/android/asan_symbolize.py",
"-l",
- "[SLAVE_BUILD]/src/out/Release/full_log"
+ "[CWD]/src/out/Release/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
"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_asan"
},
« scripts/slave/recipe_modules/chromium_android/example.py ('K') | « scripts/slave/recipe_modules/chromium_android/example.expected/coverage_builder_basic.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/downgrade_install_tester_basic.json » ('j') | scripts/slave/recipe_modules/cipd/test_api.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698