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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json

Issue 2223353004: findit: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 4 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/findit/chromium/test.expected/findit_steps_multiple_culprits.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
index 7083781612e32673eadbdea51388355265191893..c72f3f54d1be1c38cbceeee3ec6d6c2d71747de9 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
@@ -3,6 +3,28 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -24,6 +46,7 @@
"src@r6",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -161,7 +184,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -177,7 +200,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -191,7 +214,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -199,7 +222,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -214,12 +237,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.mac.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -231,7 +254,7 @@
"--format=%H",
"r0..r6"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"name": "git commits in range",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -252,6 +275,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "test r4.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -273,6 +319,7 @@
"src@r4",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -417,7 +464,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -434,7 +481,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -442,7 +489,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -458,13 +505,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r4.read test spec (chromium.mac.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -500,7 +547,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--clean-isolated-files"
],
"name": "test r4.clean isolated files",
@@ -512,21 +559,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.mac",
"-b",
"Mac Builder",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -545,7 +592,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -577,9 +624,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -610,9 +659,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/mac/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r4.remove_build_metadata",
@@ -625,14 +674,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/mac/src/out/Release/gl_tests.isolated.gen.json"
],
"name": "test r4.isolate tests",
"~followup_annotations": [
@@ -647,7 +696,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -707,6 +756,7 @@
"--gtest_filter=Test.One:Test.Two:Test.Three",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -737,7 +787,7 @@
"python",
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"--temp-root-dir",
"[TMP_BASE]",
"--merged-test-output",
@@ -751,6 +801,7 @@
"--json",
"{\"base_task_name\": \"gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1\", \"tasks\": {\"gl_tests (r4)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -783,6 +834,7 @@
"--chrome-revision",
"170242"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -800,6 +852,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "test r5.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -821,6 +896,7 @@
"src@r5",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -965,7 +1041,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -982,7 +1058,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -990,7 +1066,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -1006,13 +1082,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r5.read test spec (chromium.mac.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -1048,7 +1124,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--clean-isolated-files"
],
"name": "test r5.clean isolated files",
@@ -1060,21 +1136,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.mac",
"-b",
"Mac Builder",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1093,7 +1169,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -1125,9 +1201,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -1158,9 +1236,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/mac/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r5.remove_build_metadata",
@@ -1173,14 +1251,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/mac/src/out/Release/gl_tests.isolated.gen.json"
],
"name": "test r5.isolate tests",
"~followup_annotations": [
@@ -1195,7 +1273,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1255,6 +1333,7 @@
"--gtest_filter=Test.One:Test.Three",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1285,7 +1364,7 @@
"python",
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"--temp-root-dir",
"[TMP_BASE]",
"--merged-test-output",
@@ -1299,6 +1378,7 @@
"--json",
"{\"base_task_name\": \"gl_tests (r5)/Mac-10.9/[dummy has/mac_chromium_variable/1\", \"tasks\": {\"gl_tests (r5)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1331,6 +1411,7 @@
"--chrome-revision",
"170242"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1348,6 +1429,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "test r6.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -1369,6 +1473,7 @@
"src@r6",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -1513,7 +1618,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -1530,7 +1635,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -1538,7 +1643,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -1554,13 +1659,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r6.read test spec (chromium.mac.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -1596,7 +1701,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--clean-isolated-files"
],
"name": "test r6.clean isolated files",
@@ -1608,21 +1713,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.mac",
"-b",
"Mac Builder",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1641,7 +1746,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -1673,9 +1778,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -1706,9 +1813,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/mac/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r6.remove_build_metadata",
@@ -1721,14 +1828,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/mac/src/out/Release/gl_tests.isolated.gen.json"
],
"name": "test r6.isolate tests",
"~followup_annotations": [
@@ -1743,7 +1850,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -1803,6 +1910,7 @@
"--gtest_filter=Test.One",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1833,7 +1941,7 @@
"python",
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"--temp-root-dir",
"[TMP_BASE]",
"--merged-test-output",
@@ -1847,6 +1955,7 @@
"--json",
"{\"base_task_name\": \"gl_tests (r6)/Mac-10.9/[dummy has/mac_chromium_variable/1\", \"tasks\": {\"gl_tests (r6)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1879,6 +1988,7 @@
"--chrome-revision",
"170242"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -1896,6 +2006,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "test r2.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -1917,6 +2050,7 @@
"src@r2",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -2061,7 +2195,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -2078,7 +2212,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -2086,7 +2220,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -2102,13 +2236,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r2.read test spec (chromium.mac.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -2144,7 +2278,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--clean-isolated-files"
],
"name": "test r2.clean isolated files",
@@ -2156,21 +2290,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.mac",
"-b",
"Mac Builder",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2189,7 +2323,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -2221,9 +2355,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -2254,9 +2390,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/mac/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r2.remove_build_metadata",
@@ -2269,14 +2405,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/mac/src/out/Release/gl_tests.isolated.gen.json"
],
"name": "test r2.isolate tests",
"~followup_annotations": [
@@ -2291,7 +2427,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2351,6 +2487,7 @@
"--gtest_filter=Test.Two",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2381,7 +2518,7 @@
"python",
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"--temp-root-dir",
"[TMP_BASE]",
"--merged-test-output",
@@ -2395,6 +2532,7 @@
"--json",
"{\"base_task_name\": \"gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1\", \"tasks\": {\"gl_tests (r2)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2424,6 +2562,7 @@
"--chrome-revision",
"170242"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2441,6 +2580,29 @@
"cmd": [
"python",
"-u",
+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
+ "[BUILDER_CACHE]/mac",
+ "511"
+ ],
+ "name": "test r3.makedirs checkout path",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--master",
"tryserver.chromium.mac",
@@ -2462,6 +2624,7 @@
"src@r3",
"--output_manifest"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -2606,7 +2769,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -2623,7 +2786,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/mac/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
@@ -2631,7 +2794,7 @@
"Release",
"--use-src-side-runtest-py",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"mac_chromium_variable\", \"buildnumber\": 1, \"mastername\": \"tryserver.chromium.mac\", \"slavename\": \"build1-a1\", \"target_platform\": \"mac\"}"
],
@@ -2647,13 +2810,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json",
+ "[BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json",
"/path/to/tmp/json"
],
"name": "test r3.read test spec (chromium.mac.json)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.mac.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac/src/testing/buildbot/chromium.mac.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Mac10.9 Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -2689,7 +2852,7 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--clean-isolated-files"
],
"name": "test r3.clean isolated files",
@@ -2701,21 +2864,21 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.mac",
"-b",
"Mac Builder",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/mac/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"--swarming-targets-file",
"gl_tests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[BUILDER_CACHE]/mac/src",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2734,7 +2897,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--output-json",
"/path/to/tmp/json"
],
@@ -2766,9 +2929,11 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[BUILDER_CACHE]/mac/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
+ "--goma-deps-cache-dir",
+ "[GOMA_DEPS_CACHE]",
"--compiler",
"goma-clang",
"--goma-jsonstatus",
@@ -2799,9 +2964,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[BUILDER_CACHE]/mac/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[BUILDER_CACHE]/mac/src"
],
"cwd": "[SLAVE_BUILD]",
"name": "test r3.remove_build_metadata",
@@ -2814,14 +2979,14 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/gl_tests.isolated.gen.json"
+ "[BUILDER_CACHE]/mac/src/out/Release/gl_tests.isolated.gen.json"
],
"name": "test r3.isolate tests",
"~followup_annotations": [
@@ -2836,7 +3001,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -2896,6 +3061,7 @@
"--gtest_filter=Test.Two",
"--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2926,7 +3092,7 @@
"python",
"RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
"--swarming-client-dir",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[BUILDER_CACHE]/mac/src/tools/swarming_client",
"--temp-root-dir",
"[TMP_BASE]",
"--merged-test-output",
@@ -2940,6 +3106,7 @@
"--json",
"{\"base_task_name\": \"gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1\", \"tasks\": {\"gl_tests (r3)/Mac-10.9/[dummy has/mac_chromium_variable/1\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -2972,6 +3139,7 @@
"--chrome-revision",
"170242"
],
+ "cwd": "[BUILDER_CACHE]/mac",
"env": {
"FORCE_MAC_TOOLCHAIN": "1",
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
« no previous file with comments | « scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json ('k') | scripts/slave/recipes/findit/chromium/test.expected/none_swarming_tests.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698