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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.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/full_chromium_android_Android_MIPS_Builder__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
index 033a54a760751dba07d6a04af1f56df143b4838a..5873db22eb91e0c4d1a63857497f71ce4ade1993 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Swarm_Builder.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-386",
"--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-386 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 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 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 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 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,17 +189,18 @@
"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",
"--",
"--build-config-fs",
"Release",
"--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 Swarm Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -205,12 +212,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/testing/buildbot/chromium.android.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.android.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.android.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.android.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Android Swarm Builder\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -235,6 +243,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -242,11 +251,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@@@@",
@@ -267,10 +277,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"
},
{
@@ -279,29 +290,31 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--clean-isolated-files"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/src/tools/mb/mb.py",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.android",
"-b",
"Android Swarm Builder",
"--config-file",
- "[CWD]/src/tools/mb/mb_config.pyl",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--swarming-targets-file",
"browser_tests_apk\n",
"//out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests_apk@@@",
@@ -323,9 +336,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--build-data-dir",
@@ -337,13 +350,14 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--",
"browser_tests_apk_run"
],
+ "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": "compile",
"~followup_annotations": [
@@ -357,11 +371,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--src-dir",
- "[CWD]/src"
+ "[SLAVE_BUILD]/src"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata"
},
{
@@ -369,15 +383,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/src/tools/swarming_client",
+ "[SLAVE_BUILD]/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[CWD]/src/out/Release/browser_tests_apk.isolated.gen.json"
+ "[SLAVE_BUILD]/src/out/Release/browser_tests_apk.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -392,10 +407,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[CWD]/src/out/Release",
+ "[SLAVE_BUILD]/src/out/Release",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "find isolated tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -413,6 +429,7 @@
"\nimport sys\nprint '*.isolated file for target %s is missing' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests_apk"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -429,6 +446,7 @@
"\nimport sys\nprint '%s wasn\\'t triggered' % sys.argv[1]\nsys.exit(1)\n",
"browser_tests"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[collect error] browser_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -443,8 +461,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/full_chromium_android_Android_MIPS_Builder__dbg_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_android_Android_WebView_CTS_L_MR1__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698