commit 7233a337cef10826e4f7cadbc895773f349e4821
author Luca Milanesio <luca.milanesio@gmail.com> Mon May 04 10:27:19 2020 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Mon May 04 14:58:08 2020 +0000
tree 643e5fd56002fe6f905094baee9a13d1dc398ffc
parent 30302b04f796a071d6e9267886959bc7e9582fcc

Add special verification job for Chrome 80

Different branches of Gerrit may need different verification
options, such as a different Docker image with Chrome.

Add the ability to verify using Chrome 80 so that the different
branches of Gerrit can refer to in their Jenkinsfile pipeline.

Keep the legacy verification job for allowing existing verifications
on stable branches to keep on working as usual.

Change-Id: Ib34d00d06e9c80bf6073ea88967e69dd7c62495d

jenkins-docker/master/config.xml

diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 513edcd..3268d5f 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -38,6 +38,53 @@
       <templates>
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
+          <labelString>bazel-debian-chrome80</labelString>
+          <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
+            <sshConnector plugin="ssh-slaves@1.11">
+              <port>22</port>
+              <jvmOptions></jvmOptions>
+              <javaPath></javaPath>
+              <maxNumRetries>0</maxNumRetries>
+              <retryWaitTime>0</retryWaitTime>
+            </sshConnector>
+          </launcher>
+          <remoteFsMapping></remoteFsMapping>
+          <remoteFs>/home/jenkins</remoteFs>
+          <instanceCap>5</instanceCap>
+          <mode>EXCLUSIVE</mode>
+          <retentionStrategy class="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">
+            <idleMinutes>10</idleMinutes>
+            <idleMinutes defined-in="com.nirima.jenkins.plugins.docker.strategy.DockerOnceRetentionStrategy">10</idleMinutes>
+          </retentionStrategy>
+          <numExecutors>1</numExecutors>
+          <dockerTemplateBase>
+            <image>gerritforge/gerrit-ci-slave-bazel-docker:debian-stretch-80.0.3987.149</image>
+            <dockerCommand></dockerCommand>
+            <lxcConfString></lxcConfString>
+            <hostname></hostname>
+            <dnsHosts>
+              <string>8.8.8.8</string>
+              <string>8.8.4.4</string>
+            </dnsHosts>
+            <volumes>
+              <string>/dev/urandom:/dev/random</string>
+            </volumes>
+            <volumesFrom2/>
+            <environment/>
+            <bindPorts></bindPorts>
+            <bindAllPorts>false</bindAllPorts>
+            <privileged>true</privileged>
+            <tty>false</tty>
+            <extraHosts class="java.util.Collections$UnmodifiableRandomAccessList" resolves-to="java.util.Collections$UnmodifiableList">
+              <c class="list"/>
+              <list reference="../c"/>
+            </extraHosts>
+          </dockerTemplateBase>
+          <removeVolumes>false</removeVolumes>
+          <pullStrategy>PULL_NEVER</pullStrategy>
+        </com.nirima.jenkins.plugins.docker.DockerTemplate>
+        <com.nirima.jenkins.plugins.docker.DockerTemplate>
+          <configVersion>2</configVersion>
           <labelString>bazel-debian</labelString>
           <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
             <sshConnector plugin="ssh-slaves@1.11">
@@ -58,7 +105,7 @@
           </retentionStrategy>
           <numExecutors>1</numExecutors>
           <dockerTemplateBase>
-            <image>gerritforge/gerrit-ci-slave-bazel-docker:debian-stretch</image>
+            <image>gerritforge/gerrit-ci-slave-bazel-docker:debian-stretch-69.0.3497.92</image>
             <dockerCommand></dockerCommand>
             <lxcConfString></lxcConfString>
             <hostname></hostname>

jenkins/gerrit-verifier.yaml

diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 39d659c..dc69949 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -125,6 +125,37 @@
             gerrit/bazel-bin/gerrit-acceptance-framework/*.jar
           excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
 
+- job-template:
+    name: Gerrit-verifier-{config}
+    description: 'Gerrit build of open change with {config}'
+    defaults: verifier-defaults
+    node: bazel-{config}
+    properties:
+      - inject:
+          properties-content: >
+            BAZEL_OPTS=--remote_cache=https://gerrit-ci.gerritforge.com/cache
+    builders:
+      - merge-target-branch
+      - fetch-all-submodules
+      - shell: !include-raw-escape: gerrit-bazel-build.sh
+      - shell: !include-raw-escape: set-docker-host.sh
+      - shell: !include-raw-escape: gerrit-bazel-verifier-test.sh
+      - shell: !include-raw-escape: gerrit-bazel-cat-test-log.sh
+    publishers:
+      - archive:
+          artifacts: >
+            gerrit/bazel-bin/*.war,gerrit/bazel-bin/plugins/*/*.jar,
+            gerrit/bazel-bin/*api/*api.jar,
+            gerrit/bazel-bin/gerrit-acceptance-framework/*.jar
+          excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
+
+- project:
+    name: Gerrit-verifier-bazel
+    config:
+      - chrome80
+    jobs:
+      - 'Gerrit-verifier-{config}'
+
 - job:
     name: Gerrit-codestyle
     description: 'Gerrit code-style checker for an open change'