From 4a6354a3a5ca23583f8b62e3e439a04ce75b863f Mon Sep 17 00:00:00 2001 From: philwo Date: Thu, 25 Apr 2019 02:04:53 -0700 Subject: [PATCH] Now that ubuntu1804 uses JDK 11, remove explicit ubuntu1804_java11 tests. Also bring back testing on JDK 9 and 10 via --javabase. RELNOTES: None. PiperOrigin-RevId: 245197710 --- .bazelci/postsubmit.yml | 60 +++++++++++++++++++++++++++++++++++------ .bazelci/presubmit.yml | 60 +++++++++++++++++++++++++++++++++-------- 2 files changed, 101 insertions(+), 19 deletions(-) diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml index 21c8a89f26b950..07dc2a5bb8cb09 100644 --- a/.bazelci/postsubmit.yml +++ b/.bazelci/postsubmit.yml @@ -61,20 +61,27 @@ platforms: - "//tools/android/..." - "//tools/aquery_differ/..." - "//tools/python/..." + # Some prebuilt jars don't run with Java 11 + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:maven_test" + # Re-enable once bootstrap works with Java 11 + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" # TODO(iirina): Re-enable after #7952 was released. - "-//src/test/shell/bazel:embedded_tools_deps_test" - ubuntu1804_nojava: + ubuntu1804_javabase9: + platform: ubuntu1804_nojava + name: ":java: OpenJDK 9 Javabase" 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_flags: - - "--javabase=@openjdk11_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" build_targets: - "//src:bazel" - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk11_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" - "--test_timeout=1200" test_targets: - "--" @@ -124,15 +131,20 @@ platforms: - "-//src/test/shell/integration:test_test" # TODO(iirina): Re-enable after #7952 was released. - "-//src/test/shell/bazel:embedded_tools_deps_test" - ubuntu1804_java11: + ubuntu1804_javabase10: + platform: ubuntu1804_nojava + name: ":java: OpenJDK 10 Javabase" 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_flags: + - "--javabase=@openjdk10_linux_archive//:runtime" build_targets: - "//src:bazel" - "//src:bazel_jdk_minimal" test_flags: + - "--javabase=@openjdk10_linux_archive//:runtime" - "--test_timeout=1200" test_targets: - "--" @@ -140,14 +152,46 @@ platforms: - "//src/test/..." - "//src/tools/singlejar/..." - "//third_party/ijar/..." - - "//tools/android/..." - "//tools/aquery_differ/..." + - "//tools/android/..." - "//tools/python/..." - # Some prebuilt jars doesn't run with Java 11 + # Currently broken tests on this platform. + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + # TODO(philwo): Use tags instead of an explicit blacklist. + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" - "-//src/test/shell/bazel:maven_test" - # Re-enable once bootstrap works with Java 11 - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" # TODO(iirina): Re-enable after #7952 was released. - "-//src/test/shell/bazel:embedded_tools_deps_test" macos: diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index f63272617c9c1d..48883aa2222bfd 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -75,18 +75,25 @@ platforms: - "-//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" - ubuntu1804_nojava: + # Some prebuilt jars don't run with Java 11 + - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:maven_test" + # Re-enable once bootstrap works with Java 11 + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + ubuntu1804_java9: + platform: ubuntu1804_nojava + name: ":java: OpenJDK 9 Javabase" 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_flags: - - "--javabase=@openjdk11_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" build_targets: - "//src:bazel" - "//src:bazel_jdk_minimal" test_flags: - - "--javabase=@openjdk11_linux_archive//:runtime" + - "--javabase=@openjdk9_linux_archive//:runtime" - "--test_timeout=1200" test_targets: - "--" @@ -101,10 +108,8 @@ platforms: - "//tools/python/..." # Disable Slow Tests - "-//src/test/shell/bazel:bazel_determinism_test" - # Currently broken tests on this platform. # These tests do not work without an installed system JDK: # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) - # TODO(philwo): Use tags instead of an explicit blacklist. - "-//src/test/java/com/google/devtools/build/android/..." - "-//src/test/py/bazel:launcher_test" - "-//src/test/py/bazel:runfiles_test" @@ -138,15 +143,20 @@ platforms: - "-//src/test/shell/integration:output_filter_test" - "-//src/test/shell/integration:stub_finds_runfiles_test" - "-//src/test/shell/integration:test_test" - ubuntu1804_java11: + ubuntu1804_javabase10: + platform: ubuntu1804_nojava + name: ":java: OpenJDK 10 Javabase" 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_flags: + - "--javabase=@openjdk10_linux_archive//:runtime" build_targets: - "//src:bazel" - "//src:bazel_jdk_minimal" test_flags: + - "--javabase=@openjdk10_linux_archive//:runtime" - "--test_timeout=1200" test_targets: - "--" @@ -161,13 +171,41 @@ platforms: - "//tools/python/..." # 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" - # Some prebuilt jars doesn't run with Java 11 + # These tests do not work without an installed system JDK: + # (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868) + - "-//src/test/java/com/google/devtools/build/android/..." + - "-//src/test/py/bazel:launcher_test" + - "-//src/test/py/bazel:runfiles_test" + - "-//src/test/shell/bazel/android/..." + - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc" + - "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm" + - "-//src/test/shell/bazel:bazel_coverage_java_test" + - "-//src/test/shell/bazel:bazel_coverage_sh_test" + - "-//src/test/shell/bazel:bazel_determinism_test" + - "-//src/test/shell/bazel:bazel_example_test" + - "-//src/test/shell/bazel:bazel_java_test" + - "-//src/test/shell/bazel:bazel_random_characters_test" + - "-//src/test/shell/bazel:bazel_repository_cache_test" + - "-//src/test/shell/bazel:bazel_rules_test" + - "-//src/test/shell/bazel:bazel_sandboxing_test" + - "-//src/test/shell/bazel:bazel_test_test" + - "-//src/test/shell/bazel:empty_package_test" - "-//src/test/shell/bazel:external_integration_test" + - "-//src/test/shell/bazel:java_launcher_test" + - "-//src/test/shell/bazel:local_repository_test" - "-//src/test/shell/bazel:maven_test" - # Re-enable once bootstrap works with Java 11 - - "-//src/test/shell/bazel:bazel_bootstrap_distfile_test" + - "-//src/test/shell/bazel:runfiles_test" + - "-//src/test/shell/integration:bazel_java_test" + - "-//src/test/shell/integration:bazel_sandboxed_worker_test" + - "-//src/test/shell/integration:bazel_worker_test" + - "-//src/test/shell/integration:discard_analysis_cache_test" + - "-//src/test/shell/integration:java_integration_test" + - "-//src/test/shell/integration:jvm_flags_escaping_test" + - "-//src/test/shell/integration:minimal_jdk_test" + - "-//src/test/shell/integration:output_filter_test" + - "-//src/test/shell/integration:stub_finds_runfiles_test" + - "-//src/test/shell/integration:test_test" macos: shell_commands: - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#