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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.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/chromium.expected/dynamic_instrumentation_cloud_test.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_isolated_script_test.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
index 6cecb7c0bf9fb2f6a301f3833dccd5f0a883b457..5cd67acd529c9589c39c9ae0808e6e525069b9f2 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_instrumentation_test.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', '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': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', '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': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\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]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,6 +25,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -98,6 +99,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -108,16 +110,17 @@
"--platform",
"linux-amd64",
"--dest-directory",
- "[CWD]/cipd",
+ "[SLAVE_BUILD]/cipd",
"--json-output",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -125,10 +128,10 @@
},
{
"cmd": [
- "fake_slave_build/cipd",
+ "[SLAVE_BUILD]/cipd/cipd",
"ensure",
"--root",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--list",
"infra_internal/goma/client/linux-amd64 release",
"--json-output",
@@ -136,6 +139,7 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -154,9 +158,10 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/swarming_client/swarming.py",
+ "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
"--version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -170,12 +175,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/slave/cache/cipd/goma' target_arch=arm test_isolation_mode=prepare 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='[CACHE]/cipd/goma' target_arch=arm test_isolation_mode=prepare 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"
},
@@ -183,7 +189,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/src/testing/scripts/get_compile_targets.py",
+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -191,10 +197,11 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"Android Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -206,12 +213,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/testing/buildbot/chromium.linux.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Android Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"instrumentation_tests\": [@@@",
@@ -239,6 +247,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -246,11 +255,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@@@@",
@@ -271,10 +281,11 @@
{
"allow_subannotations": false,
"cmd": [
- "[CWD]/src/build/tree_truth.sh",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src/build/tree_truth.sh",
+ "[SLAVE_BUILD]/src",
"src"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -282,8 +293,9 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CWD]/src/out/Release"
+ "[SLAVE_BUILD]/src/out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -315,6 +327,7 @@
"--build-number",
"571"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -322,9 +335,10 @@
"python",
"-u",
"RECIPE_MODULE[build::adb]/resources/list_devices.py",
- "['[CWD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+ "['[SLAVE_BUILD]/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@[@@@",
@@ -338,9 +352,10 @@
"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",
- "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -359,23 +374,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"
},
@@ -386,27 +403,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": [
@@ -508,17 +527,18 @@
"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"
],
+ "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"
},
@@ -533,26 +553,28 @@
"/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\"]",
"chromium.linux",
"Android Tests",
"--blacklist-file",
- "[CWD]/src/out/bad_devices.json"
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/out/Release/bin/run_chrome_public_test_apk",
+ "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
"--blacklist-file",
- "[CWD]/src/out/bad_devices.json",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromePublicTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -580,6 +602,7 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest]"
},
{
@@ -592,17 +615,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"
},
{
@@ -611,16 +636,17 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"--force-version",
"4.7",
"-o",
"GSUtil:parallel_composite_upload_threshold=50M",
"----",
"cp",
- "[CWD]/src/out/Release/full_log",
+ "[SLAVE_BUILD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/Android Tests/571"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests/571@@@"
@@ -628,30 +654,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"
},
@@ -660,8 +688,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/chromium.expected/dynamic_instrumentation_cloud_test.json ('k') | scripts/slave/recipes/chromium.expected/dynamic_isolated_script_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698