Build Gerrit master against the latest Chrome
The build of Gerrit master branch against the
latest version of Chrome published on the
docker build agent image.
Change-Id: Iddf805904a94c70fee47478fd967f1ad8ee60285
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 3785ff0..9c94de1 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -38,7 +38,7 @@
<templates>
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
- <labelString>bazel-debian-chrome-latest</labelString>
+ <labelString>bazel-chrome-latest</labelString>
<connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
<user>jenkins</user>
</connector>
@@ -75,7 +75,7 @@
</com.nirima.jenkins.plugins.docker.DockerTemplate>
<com.nirima.jenkins.plugins.docker.DockerTemplate>
<configVersion>2</configVersion>
- <labelString>bazel-debian</labelString>
+ <labelString>bazel-chrome-69</labelString>
<connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
<user>jenkins</user>
</connector>
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index d6e1501..8ef52f7 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -54,7 +54,7 @@
name: 'Gerrit-bazel-{branch}'
description: '{name} {branch} branch build with Bazel'
defaults: gerrit-bazel-defaults
- node: bazel-debian
+ node: 'bazel-{browser}'
properties:
- inject:
properties-content: >
@@ -64,7 +64,7 @@
name: 'Gerrit-bazel-java11-{branch}'
description: '{name} {branch} branch build with Bazel'
defaults: gerrit-bazel-defaults
- node: bazel-debian
+ node: 'bazel-{browser}'
properties:
- inject:
properties-content: >
@@ -73,19 +73,28 @@
--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
- project:
- name: Gerrit-bazel
+ name: Gerrit-bazel-java8-chrome-69
branch:
- stable-3.2
- stable-2.16
+ browser: chrome-69
jobs:
- 'Gerrit-bazel-{branch}'
- project:
- name: Gerrit-bazel-java11
+ name: Gerrit-bazel-java11-chrome-69
branch:
- - master
- stable-3.4
- stable-3.3
+ browser: chrome-69
+ jobs:
+ - 'Gerrit-bazel-java11-{branch}'
+
+- project:
+ name: Gerrit-bazel-java11-chrome-latest
+ branch:
+ - master
+ browser: chrome-latest
jobs:
- 'Gerrit-bazel-java11-{branch}'
