Skip to content

Commit

Permalink
Actually test Gerrit on ubuntu1804_java11 (bazelbuild#333)
Browse files Browse the repository at this point in the history
* Actually test Gerrit on ubuntu1804_java10

Closes bazelbuild#325.

* Fix path to Azul Zulu jvm

* Update path to JDK 11
  • Loading branch information
davido authored and joeleba committed Jun 17, 2019
1 parent bd2e9d7 commit 7bce8bd
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions buildkite/pipelines/gerrit-postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,22 @@ platforms:
- "--java_toolchain=@bazel_tools//tools/jdk:toolchain_java9"
test_targets:
- "//..."
# TODO(philwo): Enable once Bazel supports targeting Java 10 and this change has been merged:
# https://gerrit-review.googlesource.com/c/gerrit/+/193832
# ubuntu1804_java10:
# build_flags:
# - "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java10"
# - "--java_toolchain=@bazel_tools//tools/jdk:toolchain_java10"
# build_targets:
# - "//:release"
# test_flags:
# - "--test_tag_filters=-slow,-flaky,-docker"
# - "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java10"
# - "--java_toolchain=@bazel_tools//tools/jdk:toolchain_java10"
# test_targets:
# - "//..."
ubuntu1804_java11:
build_flags:
- "--define=ABSOLUTE_JAVABASE=/usr/lib/jvm/zulu-11-amd64"
- "--host_javabase=@bazel_tools//tools/jdk:absolute_javabase"
- "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla"
- "--java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla"
build_targets:
- "//:release"
test_flags:
- "--define=ABSOLUTE_JAVABASE=/usr/lib/jvm/zulu-11-amd64"
- "--host_javabase=@bazel_tools//tools/jdk:absolute_javabase"
- "--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla"
- "--java_toolchain=@bazel_tools//tools/jdk:toolchain_vanilla"
- "--test_tag_filters=-slow,-flaky,-docker"
test_targets:
- "//..."
macos:
build_targets:
- "//:release"
Expand Down

0 comments on commit 7bce8bd

Please sign in to comment.