No longer test Bazel against JDK 9 and 10.
Both are already EOL, not used as the default / native JDK for any stable Ubuntu release and for unknown reasons, Bazel's bazel_bootstrap_distfile_test has become recently flaky with JDK 9, to a point where presubmits often fail: https://github.com/bazelbuild/continuous-integration/issues/624
We are still testing against OpenJDK 8 and OpenJDK 11, which are both considered "LTS" releases, so we keep good test coverage for the two versions that are used by users.
PiperOrigin-RevId: 244831327
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index be73ed9..17ad57e 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -127,50 +127,6 @@
- "-//src/test/shell/bazel:embedded_tools_deps_test"
# TODO(twerth): Re-enable after java.desktop has been removed.
- "-//src/test/shell/bazel:jdeps_test"
- ubuntu1804_java9:
- shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE
- - rm -f WORKSPACE.bak
- build_targets:
- - "//src:bazel"
- - "//src:bazel_jdk_minimal"
- test_flags:
- - "--test_timeout=1200"
- test_targets:
- - "--"
- - "//scripts/..."
- - "//src/test/..."
- - "//src/tools/singlejar/..."
- - "//third_party/ijar/..."
- - "//tools/android/..."
- - "//tools/aquery_differ/..."
- # TODO(iirina): Re-enable after #7952 was released.
- - "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
- ubuntu1804_java10:
- shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE
- - rm -f WORKSPACE.bak
- build_targets:
- - "//src:bazel"
- - "//src:bazel_jdk_minimal"
- test_flags:
- - "--test_timeout=1200"
- test_targets:
- - "--"
- - "//scripts/..."
- - "//src/test/..."
- - "//src/tools/singlejar/..."
- - "//third_party/ijar/..."
- - "//tools/android/..."
- - "//tools/aquery_differ/..."
- # TODO(iirina): Re-enable after #7952 was released.
- - "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_java11:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index f2e3c2c..3d78bd0 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -141,58 +141,6 @@
- "-//src/tools/singlejar:zip64_test"
# TODO(twerth): Re-enable after java.desktop has been removed.
- "-//src/test/shell/bazel:jdeps_test"
- ubuntu1804_java9:
- shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE
- - rm -f WORKSPACE.bak
- build_targets:
- - "//src:bazel"
- - "//src:bazel_jdk_minimal"
- test_flags:
- - "--test_timeout=1200"
- test_targets:
- - "--"
- - "//scripts/..."
- - "//src/test/..."
- - "//src/tools/execlog/..."
- - "//src/tools/singlejar/..."
- - "//src/tools/workspacelog/..."
- - "//third_party/ijar/..."
- - "//tools/android/..."
- - "//tools/aquery_differ/..."
- # Disable Slow Tests
- - "-//src/test/shell/bazel:bazel_determinism_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
- ubuntu1804_java10:
- shell_commands:
- - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
- android_ndk_repository/android_ndk_repository/' WORKSPACE
- - rm -f WORKSPACE.bak
- build_targets:
- - "//src:bazel"
- - "//src:bazel_jdk_minimal"
- test_flags:
- - "--test_timeout=1200"
- test_targets:
- - "--"
- - "//scripts/..."
- - "//src/test/..."
- - "//src/tools/execlog/..."
- - "//src/tools/singlejar/..."
- - "//src/tools/workspacelog/..."
- - "//third_party/ijar/..."
- - "//tools/android/..."
- - "//tools/aquery_differ/..."
- # Disable Slow Tests
- - "-//src/test/shell/bazel:bazel_determinism_test"
- # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- - "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_java11:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
