Revert "Reland: tradefed_test: switch to using 32 bit java."
This reverts commit fc87af6cad81f63c9e9e80a21771af0c9ee46a5c.
Might be causing CTS regressions.
BUG=chromium:717413, b:62895114
Change-Id: Iee6e3b58c804b068a56d1d2ebc818cc9e6a2ec38
Reviewed-on: https://chromium-review.googlesource.com/545205
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/server/cros/tradefed_test.py b/server/cros/tradefed_test.py
index 94b3761..f5b7860 100644
--- a/server/cros/tradefed_test.py
+++ b/server/cros/tradefed_test.py
@@ -301,18 +301,6 @@
return counts
-def select_32bit_java():
- """Switches to 32 bit java if installed (like in lab lxc images) to save
- about 30-40% server/shard memory during the run."""
- if utils.is_in_container() and not client_utils.is_moblab():
- java = '/usr/lib/jvm/java-8-openjdk-i386'
- if os.path.exists(java):
- logging.info('Found 32 bit java, switching to use it.')
- os.environ['JAVA_HOME'] = java
- os.environ['PATH'] = (os.path.join(java, 'bin') + os.pathsep +
- os.environ['PATH'])
-
-
class TradefedTest(test.test):
"""Base class to prepare DUT to run tests via tradefed."""
version = 1
@@ -329,9 +317,6 @@
cache_root = _TRADEFED_CACHE_CONTAINER
else:
cache_root = _TRADEFED_CACHE_LOCAL
-
- # Try to save server memory (crbug.com/717413).
- select_32bit_java()
# Quick sanity check and spew of java version installed on the server.
utils.run('java', args=('-version',), ignore_status=False, verbose=True,
stdout_tee=utils.TEE_TO_LOGS, stderr_tee=utils.TEE_TO_LOGS)
