Update plugin pipeline google-java-format defaults Gerrit core uses different default google-java-format versions depending on the target branch. Keep the plugin pipeline aligned with those defaults by using 1.24.0 for stable-3.11 through stable-3.14 and 1.35.0 for master and future stable branches. The formatter binaries are now preinstalled in the Bazel agent image. Remove the temporary gerrit-tools clone and per-build formatter setup from the formatting stage. This avoids an extra clone from googlesource on every plugin formatting check and relies on the image-provided tools instead. The gjfVersion parameter is still honored, so callers can override the branch-based default when needed. Change-Id: I2273e6eb7f3890242cccdb5a94b7ac6582fcb35f
diff --git a/vars/pluginPipeline.groovy b/vars/pluginPipeline.groovy index 786da5d..d9bfaf8 100644 --- a/vars/pluginPipeline.groovy +++ b/vars/pluginPipeline.groovy
@@ -39,7 +39,9 @@ def extraGhRepos = parm.extraGhRepos ?: [] def gerritReviewBaseUrl = "https://gerrit.googlesource.com/a" def gerritReviewHostname = "gerrit.googlesource.com" - def gjfVersion = parm.gjfVersion ?: '1.24.0' + def defaultGjfVersion = + env.GERRIT_BRANCH ==~ /stable-3\.(11|12|13|14)/ ? '1.24.0' : '1.35.0' + def gjfVersion = parm.gjfVersion ?: defaultGjfVersion def bazeliskCmd = "#!/bin/bash\n" + ". set-java.sh --branch $GERRIT_BRANCH && bazelisk" def bazeliskOptions = "--sandbox_tmpfs_path=/tmp" def gerritReviewCredentialsId = "gerrit.googlesource.com" @@ -85,16 +87,6 @@ } steps { gerritCheck (checks: ["${formatCheck}": 'RUNNING'], url: "${env.BUILD_URL}console") - script { - if (gjfVersion != '1.7') { - sh "git clone -b ${env.GERRIT_BRANCH} https://gerrit.googlesource.com/gerrit gerrit-tools" - dir ('gerrit-tools') { - sh "./tools/setup_gjf.sh ${gjfVersion}" - sh "mv ./tools/format/google-java-format-${gjfVersion} ~/format/." - sh "mv ./tools/format/google-java-format-${gjfVersion}-all-deps.jar ~/format/." - } - } - } sh "find ${pluginName} -name '*.java' | xargs /home/jenkins/format/google-java-format-${gjfVersion} -i" script { def formatOut = sh (script: "cd ${pluginName} && git status --porcelain", returnStdout: true)