Commit a07816dd authored by Dan Jacques's avatar Dan Jacques Committed by Commit Bot

[infra_paths] Don't export "cleanup" for remote.

"remote_run" builds explicitly supply a cleanup directory in recipe
properties, so it isn't necessary to supply it here.

BUG=chromium:725631
TEST=None
TBR=iannucci@chromium.org

Change-Id: I6eaaeea14bd699181d7ceeff6b3baac2d1cd9861
Reviewed-on: https://chromium-review.googlesource.com/528630Reviewed-by: 's avatarDaniel Jacques <dnj@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
parent 433d34c7
......@@ -3,7 +3,7 @@
"cmd": [],
"name": "show paths",
"~followup_annotations": [
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
"@@@STEP_LOG_END@result@@@"
]
......
......@@ -3,7 +3,7 @@
"cmd": [],
"name": "show paths",
"~followup_annotations": [
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
"@@@STEP_LOG_END@result@@@"
]
......
......@@ -3,7 +3,7 @@
"cmd": [],
"name": "show paths",
"~followup_annotations": [
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
"@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
"@@@STEP_LOG_END@result@@@"
]
......
......@@ -30,7 +30,6 @@ def infra_buildbot(c):
def infra_kitchen(c):
"""Used on BuildBot by "remote_run" when NOT running Kitchen."""
c.base_paths['root'] = c.START_DIR
c.base_paths['cleanup'] = c.START_DIR[:-1] + ('build.dead',)
# TODO(phajdan.jr): have one cache dir, let clients append suffixes.
b_dir = c.START_DIR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment