Only use JDK11, none on linux bots
The proper fix should probably migrate the rex script to look for
runtimes, such that we can shard on runtimes as well
Bug: 170454076
Change-Id: Iaf2034ce86015fffe8d09ad7b59abaae84519219
diff --git a/tools/test.py b/tools/test.py
index bb8dbd2..64d2ae0 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -335,7 +335,12 @@
runtimes = ['dex-' + art_vm]
# Only append the "none" runtime and JVMs if running on the "default" DEX VM.
if art_vm == "default":
- runtimes.extend(['jdk8', 'jdk9', 'jdk11', 'none'])
+ # TODO(b/170454076): Remove special casing for bot when rex-script has
+ # been migrated to account for runtimes.
+ if utils.is_bot():
+ runtimes.extend(['jdk11', 'none'])
+ else:
+ runtimes.extend(['jdk8', 'jdk9', 'jdk11', 'none'])
return_code = gradle.RunGradle(
gradle_args + [
'-Pdex_vm=%s' % art_vm + vm_suffix,
