commit aeca1306b9145e8fa7781e9aa615887835068e21
author Luca Milanesio <luca.milanesio@gmail.com> Sat Oct 24 01:31:35 2020 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Wed Oct 28 17:46:45 2020 +0000
tree f24102a4a2e477e08a3b36d1f49403cfd3d752a3
parent 30d74e5a5fae406c8228f80b80852a10d7677fd0

Validate plugin changes on Java 11 for stable-3.3 and master

Change-Id: If5398876e71803c93ccfa4e2649848c02d17bb81

vars/pluginPipeline.groovy

diff --git a/vars/pluginPipeline.groovy b/vars/pluginPipeline.groovy
index 36dcbc9..4d36f6a 100644
--- a/vars/pluginPipeline.groovy
+++ b/vars/pluginPipeline.groovy
@@ -36,7 +36,11 @@
     def buildCheck = parm.buildCheckId
     def pluginScmUrl = "https://gerrit.googlesource.com/a/${env.GERRIT_PROJECT}"
     def gjfVersion = '1.7'
-    def bazelOpts = '--java_toolchain=//tools:error_prone_warnings_toolchain'
+    def javaVersion = 11
+    if (["stable-2.16", "stable-3.0", "stable-3.1", "stable-3.2"].contains("${env.GERRIT_BRANCH}")) {
+        javaVersion = 8
+    }
+    def bazeliskCmd = "#!/bin/bash\n" + ". set-java.sh ${javaVersion} && bazelisk"
 
     echo "Starting pipeline for plugin '${pluginName}'" + (formatCheck ? " formatCheckId=${formatCheck}" : '') + (buildCheck ? " buildCheckId=${buildCheck}" : '')
     echo "Change : ${env.GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER} '${env.GERRIT_CHANGE_SUBJECT}'"
@@ -89,8 +93,8 @@
                         sh "cd plugins && ln -s ../../${pluginName} ."
                         sh "if [ -f ../${pluginName}/external_plugin_deps.bzl ]; then cd plugins && ln -sf ../../${pluginName}/external_plugin_deps.bzl .; fi"
                         sh "if [ -f ../${pluginName}/package.json ]; then cd plugins && ln -sf ../../${pluginName}/package.json .; fi"
-                        sh "bazelisk build ${bazelOpts} plugins/${pluginName}"
-                        sh "bazelisk test ${bazelOpts} --test_env DOCKER_HOST=" + '$DOCKER_HOST' + " plugins/${pluginName}/..."
+                        sh "${bazeliskCmd} build plugins/${pluginName}"
+                        sh "${bazeliskCmd} test --test_env DOCKER_HOST=" + '$DOCKER_HOST' + " plugins/${pluginName}/..."
                     }
                 }
         }