| Index: scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
|
| diff --git a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
|
| index e592755e1540e6b677d505425eead5b2c7f343db..ef471d6c1e7dd99606c45982a4a79bcb743ae080 100644
|
| --- a/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.json
|
| +++ b/scripts/slave/recipes/findit/chromium/compile.expected/find_culprit_using_bisect.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]/linux",
|
| + "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.linux",
|
| @@ -24,6 +46,7 @@
|
| "src@r10",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "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]/linux/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]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -190,7 +213,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -198,7 +221,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]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -213,12 +236,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -230,7 +253,7 @@
|
| "--format=%H",
|
| "r1..r10"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "name": "git commits in range",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -254,6 +277,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]/linux",
|
| + "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.linux",
|
| @@ -275,6 +321,7 @@
|
| "src@r6",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -419,7 +466,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -435,7 +482,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -443,7 +490,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]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -459,13 +506,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "test r6.read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -474,19 +521,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -501,7 +548,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
|
| "--target-build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--target",
|
| "target_name",
|
| "--json-output",
|
| @@ -537,19 +584,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -573,9 +620,11 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| + "--goma-deps-cache-dir",
|
| + "[GOMA_DEPS_CACHE]",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -610,6 +659,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]/linux",
|
| + "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.linux",
|
| @@ -631,6 +703,7 @@
|
| "src@r4",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -775,7 +848,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -791,7 +864,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -799,7 +872,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]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -815,13 +888,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "test r4.read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -830,19 +903,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -857,7 +930,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
|
| "--target-build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--target",
|
| "target_name",
|
| "--json-output",
|
| @@ -883,6 +956,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]/linux",
|
| + "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.linux",
|
| @@ -904,6 +1000,7 @@
|
| "src@r5",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -1048,7 +1145,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| @@ -1064,7 +1161,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -1072,7 +1169,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]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| "{\"buildername\": \"linux_variable\", \"buildnumber\": \"1\", \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -1088,13 +1185,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "test r5.read test spec (chromium.linux.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.linux.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -1103,19 +1200,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -1130,7 +1227,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::findit]/resources/check_target_existence.py",
|
| "--target-build-dir",
|
| - "[SLAVE_BUILD]/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--target",
|
| "target_name",
|
| "--json-output",
|
| @@ -1166,19 +1263,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.linux",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -1202,9 +1299,11 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| + "--goma-deps-cache-dir",
|
| + "[GOMA_DEPS_CACHE]",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
|
|