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

Unified Diff: scripts/slave/recipes/chromium.expected/kitchen_path_config.json

Issue 2100153002: chromium_tests: remove unnecessary path component from cache checkout path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 4 years, 6 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/recipe_modules/chromium_tests/api.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/kitchen_path_config.json
diff --git a/scripts/slave/recipes/chromium.expected/kitchen_path_config.json b/scripts/slave/recipes/chromium.expected/kitchen_path_config.json
index 47e95d1ff83630ca77aab6f1c9b069e32ae89f1e..ffeb41f0a8d93fe5834428d78a6c19195d707b4b 100644
--- a/scripts/slave/recipes/chromium.expected/kitchen_path_config.json
+++ b/scripts/slave/recipes/chromium.expected/kitchen_path_config.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]/checkouts/Linux_Kitchen__kitchen_run_",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_",
"511"
],
"name": "makedirs checkout path",
@@ -47,7 +47,7 @@
"--force",
"--output_manifest"
],
- "cwd": "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_",
+ "cwd": "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -185,7 +185,7 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/swarming_client/swarming.py",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/swarming_client/swarming.py",
"--version"
],
"name": "swarming.py --version",
@@ -201,7 +201,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src",
+ "cwd": "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
@@ -214,14 +214,14 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/testing/scripts/get_compile_targets.py",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release",
"--paths",
- "{\"checkout\": \"[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/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_Kitchen__kitchen_run_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"Linux Kitchen (kitchen_run)\", \"buildnumber\": \"77457\", \"mastername\": \"chromium.fyi\", \"slavename\": \"build1-a1\", \"target_platform\": \"linux\"}"
],
@@ -236,12 +236,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/testing/buildbot/chromium.fyi.json",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
"name": "read test spec (chromium.fyi.json)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/testing/buildbot/chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -261,14 +261,14 @@
"cmd": [
"python",
"-u",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/mb/mb.py",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/mb/mb.py",
"gen",
"-m",
"chromium.fyi",
"-b",
"Linux Kitchen (kitchen_run)",
"--config-file",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src/tools/mb/mb_config.pyl",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src/tools/mb/mb_config.pyl",
"--goma-dir",
"[CACHE]/cipd/goma",
"//out/Release"
@@ -293,7 +293,7 @@
"--target",
"Release",
"--src-dir",
- "[BUILDER_CACHE]/checkouts/Linux_Kitchen__kitchen_run_/src",
+ "[BUILDER_CACHE]/Linux_Kitchen__kitchen_run_/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--goma-deps-cache-dir",
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/api.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698