From 7bce8bd57173d406e699a28a9b311ce02f0996e5 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Mon, 14 Jan 2019 21:18:27 +0100
Subject: [PATCH] Actually test Gerrit on ubuntu1804_java11 (#333)

* Actually test Gerrit on ubuntu1804_java10

Closes #325.

* Fix path to Azul Zulu jvm

* Update path to JDK 11
---
 buildkite/pipelines/gerrit-postsubmit.yml | 30 ++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/buildkite/pipelines/gerrit-postsubmit.yml b/buildkite/pipelines/gerrit-postsubmit.yml
index 3e68240ef8..dd360ae44c 100644
--- a/buildkite/pipelines/gerrit-postsubmit.yml
+++ b/buildkite/pipelines/gerrit-postsubmit.yml
@@ -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"