Add jobs to build Gerrit with Java 11
Gerrit provides the option to be built with Java 11. Currently, however,
the CI did only provide jobs to build Gerrit with the currently
officially supported Java version (8).
This change adds jobs to build Gerrit also with Java 11.
Change-Id: I5adf53ea8a289c6e828e485f6e9a4ee97db51fd5
diff --git a/jenkins/gerrit-bazel-build.sh b/jenkins/gerrit-bazel-build.sh
index 2cbdf54..a55dc9c 100644
--- a/jenkins/gerrit-bazel-build.sh
+++ b/jenkins/gerrit-bazel-build.sh
@@ -3,7 +3,7 @@
cd gerrit
. set-java.sh 8
-export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone"
+export BAZEL_OPTS="$BAZEL_OPTS --spawn_strategy=standalone --genrule_strategy=standalone"
bazelisk version
bazelisk build $BAZEL_OPTS plugins:core release api
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index 16a77cf..0400c37 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -19,7 +19,23 @@
recursive: true
skip-tag: true
basedir: gerrit
-
+ wrappers:
+ - timeout:
+ timeout: 90
+ type: absolute
+ fail: false
+ - timestamps
+ - xvfb:
+ installation-name: Xvfb
+ display-name: 1
+ parallel-build: false
+ timeout: 30
+ screen: 1024x768x16
+ additional-options: -fbdir /tmp
+ debug: true
+ shutdown-with-build: false
+ - raw:
+ xml: <jenkins.plugins.logstash.LogstashBuildWrapper plugin="logstash@1.2.0"/>
builders:
- shell:
!include-raw: gerrit-bazel-build.sh
@@ -76,23 +92,23 @@
description: "{name} {branch} branch build with Bazel\n"
defaults: gerrit-bazel-defaults
node: bazel-debian
- wrappers:
- - timeout:
- timeout: 90
- type: absolute
- fail: false
- - timestamps
- - xvfb:
- installation-name: Xvfb
- display-name: 1
- parallel-build: false
- timeout: 30
- screen: 1024x768x16
- additional-options: -fbdir /tmp
- debug: true
- shutdown-with-build: false
- - raw:
- xml: <jenkins.plugins.logstash.LogstashBuildWrapper plugin="logstash@1.2.0"/>
+
+- job-template:
+ name: 'Gerrit-bazel-java11-{branch}'
+ description: "{name} {branch} branch build with Bazel and Java 11\n"
+ defaults: gerrit-bazel-defaults
+ properties:
+ - build-discarder:
+ days-to-keep: 20
+ artifact-days-to-keep: 20
+ - authorization:
+ anonymous:
+ - job-discover
+ - job-read
+ - job-extended-read
+ - inject:
+ properties-content: |
+ BAZEL_OPTS=--host_javabase=@bazel_tools//tools/jdk:remote_jdk11 --javabase=@bazel_tools//tools/jdk:remote_jdk11 --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11 --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
- project:
name: Gerrit-bazel
@@ -106,6 +122,13 @@
- 'Gerrit-bazel-{branch}'
- project:
+ name: Gerrit-bazel-java11
+ branch:
+ - master
+ jobs:
+ - 'Gerrit-bazel-java11-{branch}'
+
+- project:
name: Gerrit-build-flow
branch:
- master
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index f500186..70cc187 100755
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -3,7 +3,7 @@
cd gerrit
. set-java.sh 8
-export BAZEL_OPTS="--spawn_strategy=standalone --genrule_strategy=standalone \
+export BAZEL_OPTS="$BAZEL_OPTS --spawn_strategy=standalone --genrule_strategy=standalone \
--test_output errors \
--test_summary detailed --flaky_test_attempts 3 \
--test_verbose_timeout_warnings --build_tests_only \
