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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 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/infra/recipe_roll_tryjob.expected/one_patch.json ('k') | scripts/slave/recipes/infra/recipe_simulation.expected/normal.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
diff --git a/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json b/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
index dfbdd27da77fcc969e41eae81c2b271a10b230af..e3d0abb9e4b3d5e634f1488295a8f764da91245f 100644
--- a/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
+++ b/scripts/slave/recipes/infra/recipe_roll_tryjob.expected/tryjob.json
@@ -4,6 +4,7 @@
"/opt/infra-tools/authutil",
"token"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get auth token",
"stdout": "/path/to/tmp/"
},
@@ -14,8 +15,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'infra', 'url': 'https://chromium.googlesource.com/infra/infra.git'}]"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -41,6 +43,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -68,6 +71,7 @@
"user.name",
"local_bot"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -84,6 +88,7 @@
"user.email",
"local_bot@example.com"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -96,6 +101,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -112,6 +118,7 @@
"--headers-json",
"{\"Authorization\": \"Bearer ya29.foobar\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get luci-config projects"
},
{
@@ -125,6 +132,7 @@
"--headers-json",
"{\"Authorization\": \"Bearer ya29.foobar\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get project 'recipe_engine' config 'recipes.cfg'"
},
{
@@ -138,6 +146,7 @@
"--headers-json",
"{\"Authorization\": \"Bearer ya29.foobar\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get project 'build' config 'recipes.cfg'"
},
{
@@ -145,9 +154,10 @@
"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",
- "[CWD]/recipe_engine/recipe_engine",
+ "[SLAVE_BUILD]/recipe_engine/recipe_engine",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs recipe_engine directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -168,13 +178,13 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
- "cache_dir = '[CWD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'recipe_engine', 'url': 'https://repo.repo/recipe_engine'}]",
+ "cache_dir = '[SLAVE_BUILD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'recipe_engine', 'url': 'https://repo.repo/recipe_engine'}]",
"--root",
"recipe_engine",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
- "[CWD]/__cache_dir",
+ "[SLAVE_BUILD]/__cache_dir",
"--rietveld_server",
"https://fake.code.review",
"--output_json",
@@ -184,7 +194,7 @@
"--force",
"--output_manifest"
],
- "cwd": "[CWD]/recipe_engine",
+ "cwd": "[SLAVE_BUILD]/recipe_engine",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -211,9 +221,10 @@
"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",
- "[CWD]/build/build",
+ "[SLAVE_BUILD]/build/build",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -234,13 +245,13 @@
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
- "cache_dir = '[CWD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://repo.repo/build'}]",
+ "cache_dir = '[SLAVE_BUILD]/__cache_dir'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'build', 'url': 'https://repo.repo/build'}]",
"--root",
"build",
"--revision_mapping_file",
"{}",
"--git-cache-dir",
- "[CWD]/__cache_dir",
+ "[SLAVE_BUILD]/__cache_dir",
"--issue",
"12345678",
"--patchset",
@@ -254,7 +265,7 @@
"--force",
"--output_manifest"
],
- "cwd": "[CWD]/build",
+ "cwd": "[SLAVE_BUILD]/build",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -278,26 +289,28 @@
},
{
"cmd": [
- "[CWD]/infra/ENV/bin/python",
+ "[SLAVE_BUILD]/infra/ENV/bin/python",
"-u",
- "[CWD]/recipe_engine/recipe_engine/recipes.py",
+ "[SLAVE_BUILD]/recipe_engine/recipe_engine/recipes.py",
"--package",
- "[CWD]/recipe_engine/recipe_engine/infra/config/recipes.cfg",
+ "[SLAVE_BUILD]/recipe_engine/recipe_engine/infra/config/recipes.cfg",
"simulation_test"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "recipe_engine tests"
},
{
"cmd": [
- "[CWD]/infra/ENV/bin/python",
+ "[SLAVE_BUILD]/infra/ENV/bin/python",
"-u",
- "[CWD]/build/build/recipes.py",
+ "[SLAVE_BUILD]/build/build/recipes.py",
"-O",
- "recipe_engine=[CWD]/recipe_engine/recipe_engine",
+ "recipe_engine=[SLAVE_BUILD]/recipe_engine/recipe_engine",
"--package",
- "[CWD]/build/build/infra/config/recipes.cfg",
+ "[SLAVE_BUILD]/build/build/infra/config/recipes.cfg",
"simulation_test"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build tests"
},
{
« no previous file with comments | « scripts/slave/recipes/infra/recipe_roll_tryjob.expected/one_patch.json ('k') | scripts/slave/recipes/infra/recipe_simulation.expected/normal.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698