Commit 55586009 authored by Hiroki Sato's avatar Hiroki Sato Committed by Commit Bot

Revert "Manually roll chromite to pick up localhost vs VM fixes."

This reverts commit a5301433.

Reason for revert: betty-pi-arc-pi-android-pfq is continuously failing

Bug: 1070126

Original change's description:
> Manually roll chromite to pick up localhost vs VM fixes.
> 
> Picks up a single change:
> $ git log 97d7f0702..8ef1e6c0 --date=short --first-parent --format='%ad %ae %s'
> 2020-04-06 bpastene@chromium.org device: Don't assume '--device=localhost' means VM.
> 
> And updates chromeos/test_runner.py to not specify '--device=localhost'
> when running VM tests.
> 
> Bug: 1067800
> Change-Id: Id8af6b2cb1d8a082b71a6ac01cfe9522578a21b4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145762
> Reviewed-by: Erik Chen <erikchen@chromium.org>
> Commit-Queue: Ben Pastene <bpastene@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#758264}

TBR=achuith@chromium.org,erikchen@chromium.org,bpastene@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1067800
Change-Id: Ide5832c94b127d0ad360f66954bf2ce101b0933e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146409Reviewed-by: default avatarHiroki Sato <hirokisato@chromium.org>
Commit-Queue: Hiroki Sato <hirokisato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758471}
parent a07c6dd7
...@@ -856,7 +856,7 @@ deps = { ...@@ -856,7 +856,7 @@ deps = {
# Build tools for Chrome OS. Note: This depends on third_party/pyelftools. # Build tools for Chrome OS. Note: This depends on third_party/pyelftools.
'src/third_party/chromite': { 'src/third_party/chromite': {
'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '8ef1e6c0d872d47236fd96565ede45379ce978d9', 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '97d7f070200a8a25cda75289a4f20d28b9fd00b5',
'condition': 'checkout_linux', 'condition': 'checkout_linux',
}, },
......
...@@ -109,6 +109,8 @@ class RemoteTest(object): ...@@ -109,6 +109,8 @@ class RemoteTest(object):
'--start', '--start',
# Don't persist any filesystem changes after the VM shutsdown. # Don't persist any filesystem changes after the VM shutsdown.
'--copy-on-write', '--copy-on-write',
'--device',
'localhost'
] ]
else: else:
self._test_cmd += [ self._test_cmd += [
...@@ -704,6 +706,8 @@ def host_cmd(args, unknown_args): ...@@ -704,6 +706,8 @@ def host_cmd(args, unknown_args):
'--start', '--start',
# Don't persist any filesystem changes after the VM shutsdown. # Don't persist any filesystem changes after the VM shutsdown.
'--copy-on-write', '--copy-on-write',
'--device',
'localhost',
] ]
else: else:
cros_run_test_cmd += [ cros_run_test_cmd += [
......
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