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

Unified Diff: scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.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
Index: scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json
diff --git a/scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json b/scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json
index d13ed0602bac9dc3a1f89dac44ac4a61fbdb1502..3fb145d09f674ba2ca00d2862b3cf0eb5b4e0d8d 100644
--- a/scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json
+++ b/scripts/slave/recipes/infra/recipe_autoroller_public.expected/failed_upload.json
@@ -6,8 +6,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]"
},
@@ -35,6 +36,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -65,6 +67,7 @@
"user.name",
"local_bot"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -81,6 +84,7 @@
"user.email",
"local_bot@example.com"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -93,6 +97,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -107,10 +112,12 @@
"--outfile",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Get luci-config projects"
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "build"
},
{
@@ -119,10 +126,11 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[TMP]/roll_build_tmp_1",
+ "[TMP_BASE]/roll_build_tmp_1",
"--url",
"https://repo.repo/build"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build.git setup",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -136,7 +144,7 @@
"origin",
"master"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git fetch",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -149,7 +157,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git checkout",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -161,7 +169,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -177,7 +185,7 @@
"-d",
"-x"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git clean",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -190,7 +198,7 @@
"user.email",
"recipe-roller@chromium.org"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git config",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -203,7 +211,7 @@
"user.name",
"recipe-roller"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git config (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -218,7 +226,7 @@
"roll",
"origin/master"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git checkout (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -226,15 +234,16 @@
},
{
"cmd": [
- "[CWD]/infra/ENV/bin/python",
+ "[SLAVE_BUILD]/infra/ENV/bin/python",
"-u",
- "[CWD]/infra/recipes-py/recipes.py",
+ "[SLAVE_BUILD]/infra/recipes-py/recipes.py",
"--package",
- "[TMP]/roll_build_tmp_1/infra/config/recipes.cfg",
+ "[TMP_BASE]/roll_build_tmp_1/infra/config/recipes.cfg",
"autoroll",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build.roll",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -284,7 +293,7 @@
"-m",
"roll recipes.cfg"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git commit",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -296,7 +305,7 @@
"show",
"--format=%b"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git show",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -312,11 +321,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cat",
"gs://recipe-roller-cl-uploads/8e9377cb1551d1353f8f1103e01bd5bf"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build.gsutil cat",
"stderr": "/path/to/tmp/",
"stdout": "/path/to/tmp/",
@@ -338,7 +348,7 @@
"Roll recipe dependencies (trivial).\n\nThis is an automated CL created by the recipe roller. This CL rolls recipe\nchanges from upstream projects (e.g. depot_tools) into downstream projects\n(e.g. tools/build).\n\n\nMore info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug\n(or complain)\n\nrecipe_engine:\n https://crrev.com/123abc some commit message (foo@chromium.org)\n\nR=foo@chromium.org,bar@chromium.org,baz@chromium.org\nBUG=123,456\n\nTBR=martiniss@chromium.org,phajdan.jr@chromium.org\n",
"--auth-refresh-token-json=/creds/refresh_tokens/recipe-roller"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git cl upload",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
@@ -350,7 +360,7 @@
"cl",
"issue"
],
- "cwd": "[TMP]/roll_build_tmp_1",
+ "cwd": "[TMP_BASE]/roll_build_tmp_1",
"name": "build.git cl issue",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -363,6 +373,7 @@
"-u",
"import sys; sys.exit(1)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "build.git cl upload failed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -376,9 +387,10 @@
"python",
"-u",
"\nimport shutil, sys\nshutil.rmtree(sys.argv[1])\n",
- "[TMP]/roll_build_tmp_1"
+ "[TMP_BASE]/roll_build_tmp_1"
],
- "name": "build.rmtree [TMP]/roll_build_tmp_1",
+ "cwd": "[SLAVE_BUILD]",
+ "name": "build.rmtree [TMP_BASE]/roll_build_tmp_1",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698