| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| index e20f5e94acd23a610ad32899bb9bfc2ac2495aa7..9fd3f3e023b1e72a2101e953a527fa1b32e6e685 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Site_Isolation_Linux.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]/Site_Isolation_Linux",
|
| + "[BUILDER_CACHE]/linux",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -47,7 +47,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Site_Isolation_Linux",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -188,7 +188,7 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Site_Isolation_Linux/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",
|
| @@ -201,14 +201,14 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Site_Isolation_Linux/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\": \"Site Isolation Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| @@ -223,12 +223,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Site_Isolation_Linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -248,19 +248,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.fyi",
|
| "-b",
|
| "Site Isolation Linux",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Site_Isolation_Linux/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -281,7 +281,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--goma-deps-cache-dir",
|
| @@ -334,7 +334,7 @@
|
| "-o",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/out",
|
| + "[BUILDER_CACHE]/linux/src/out",
|
| "--json-test-results",
|
| "/path/to/tmp/json",
|
| "--test-results-server",
|
| @@ -352,7 +352,7 @@
|
| "--options",
|
| "http/tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Site_Isolation_Linux",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -369,7 +369,7 @@
|
| "--results-dir",
|
| "[SLAVE_BUILD]/layout-test-results",
|
| "--build-dir",
|
| - "[BUILDER_CACHE]/Site_Isolation_Linux/src/out",
|
| + "[BUILDER_CACHE]/linux/src/out",
|
| "--build-number",
|
| "571",
|
| "--builder-name",
|
| @@ -379,7 +379,7 @@
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Site_Isolation_Linux",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
|
|