diff options
| author | cmtice <cmtice@google.com> | 2015-06-12 13:26:47 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-12 23:51:55 +0000 |
| commit | aa700b0a78b10b709b990bcb535bc5588ebb2bb4 (patch) | |
| tree | b0d49cc13c34dca8b65fcf6ff4ed10f02b09bba6 | |
| parent | 441c94998a0b1b547bd9b4e594acb05d9e5ed6eb (diff) | |
| download | toolchain-utils-aa700b0a78b10b709b990bcb535bc5588ebb2bb4.tar.gz | |
Update nightly tests to use old file locking mechanism for now.
There are some issue with the role account using the AFE server
locking mechanism, so we will temporarily revert the nightly tests
to use the old file locking mechanism. This CL depends on the CL
that re-enables the file locking mechanism (with a new flag).
BUG=None
TEST=None
CQ-DEPEND=CL:219096
Change-Id: If525e4fcf292d3c57aa9c69a1b796914bd6d434c
Reviewed-on: https://chrome-internal-review.googlesource.com/219088
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
| -rwxr-xr-x | buildbot_test_toolchains.py | 6 | ||||
| -rwxr-xr-x | test_toolchains.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/buildbot_test_toolchains.py b/buildbot_test_toolchains.py index 7072c634..70990380 100755 --- a/buildbot_test_toolchains.py +++ b/buildbot_test_toolchains.py @@ -125,9 +125,9 @@ class ToolchainComparator(): crosperf = os.path.join(TOOLCHAIN_DIR, "crosperf", "crosperf") - command = ("%s --no_email=True --results_dir=%s %s" % (crosperf, - self._reports_dir, - experiment_file)) + command = ("%s --no_email=True --use_file_locks=True --results_dir=%s %s" % + (crosperf, self._reports_dir, experiment_file)) + ret = self._ce.RunCommand(command) if ret != 0: raise RuntimeError("Couldn't run crosperf!") diff --git a/test_toolchains.py b/test_toolchains.py index 616a97a3..cf52136d 100755 --- a/test_toolchains.py +++ b/test_toolchains.py @@ -240,8 +240,9 @@ class ToolchainComparator(ChromeOSCheckout): crosperf = os.path.join(os.path.dirname(__file__), "crosperf", "crosperf") - command = "%s --no_email=True --results_dir=%s %s" % (crosperf, self._reports_dir, - experiment_file) + command = ("%s --no_email=True --use_file_locks=True --results_dir=%s %s" % + (crosperf, self._reports_dir, experiment_file) + ret = self._ce.RunCommand(command) if ret != 0: raise RuntimeError("Couldn't run crosperf!") |