| Index: scripts/slave/recipes/chromium.expected/full_client_skia_Linux_Builder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_client_skia_Linux_Builder.json b/scripts/slave/recipes/chromium.expected/full_client_skia_Linux_Builder.json
|
| index 27ba220823d3d02025b9837ddb076500fb7635fc..5d85ce9e18d4156f9c573c44ff408e38ad13100b 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_client_skia_Linux_Builder.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_client_skia_Linux_Builder.json
|
| @@ -4,7 +4,7 @@
|
| "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_Builder",
|
| + "[BUILDER_CACHE]/linux",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -49,7 +49,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Linux_Builder",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -196,7 +196,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/tools/swarming_client/swarming.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client/swarming.py",
|
| "--version"
|
| ],
|
| "name": "swarming.py --version",
|
| @@ -212,7 +212,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Linux_Builder/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",
|
| @@ -225,7 +225,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| @@ -233,7 +233,7 @@
|
| "Release",
|
| "--use-src-side-runtest-py",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Linux_Builder/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 Builder\", \"buildnumber\": 571, \"mastername\": \"client.skia\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -248,12 +248,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Linux_Builder/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: [BUILDER_CACHE]/Linux_Builder/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_LINE@json.output@ \"Linux Tests\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| @@ -286,7 +286,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--clean-isolated-files"
|
| ],
|
| "name": "clean isolated files"
|
| @@ -295,21 +295,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "client.skia",
|
| "-b",
|
| "Linux Builder",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--swarming-targets-file",
|
| "browser_tests\n",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Linux_Builder/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -334,7 +334,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Linux_Builder/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -370,9 +370,9 @@
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/out/Release",
|
| + "[BUILDER_CACHE]/linux/src/out/Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Linux_Builder/src"
|
| + "[BUILDER_CACHE]/linux/src"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "remove_build_metadata"
|
| @@ -382,14 +382,14 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/tools/swarming_client",
|
| + "[BUILDER_CACHE]/linux/src/tools/swarming_client",
|
| "batcharchive",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--isolate-server",
|
| "https://isolateserver.appspot.com",
|
| "--verbose",
|
| - "[BUILDER_CACHE]/Linux_Builder/src/out/Release/browser_tests.isolated.gen.json"
|
| + "[BUILDER_CACHE]/linux/src/out/Release/browser_tests.isolated.gen.json"
|
| ],
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| @@ -415,7 +415,7 @@
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Linux_Builder/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--build-url",
|
| "gs://chromium-skia-gm/client.skia/Linux Builder",
|
| "--build_revision",
|
|
|