Move BAZEL_OPTS properties to defaults
Avoid duplication of the BAZEL_OPTS definition in the
individual templates. The specific template properties definition
was also shadowing the defaults: as a side effect, the cleanup
policy of the job was not effective anymore.
The common BAZEL_OPTS is used for all verification jobs,
including the Gerrit-CodeStyle.
Bug: Issue 13210
Change-Id: Iac70a4e2e1ade0ac04d4052a6f0b95358f1467fb
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 93eaaeb..c08a198 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -73,6 +73,9 @@
- job-extended-read
- build-discarder:
days-to-keep: 30
+ - inject:
+ properties-content: >
+ BAZEL_OPTS=--remote_cache=https://gerrit-ci.gerritforge.com/cache
scm:
- git:
url: https://gerrit.googlesource.com/a/gerrit
@@ -120,10 +123,6 @@
description: 'Gerrit build of open change with Bazel'
defaults: verifier-defaults
node: bazel-debian
- properties:
- - inject:
- properties-content: >
- BAZEL_OPTS=--remote_cache=https://gerrit-ci.gerritforge.com/cache
builders:
- set-git-credentials
- merge-target-branch
@@ -145,10 +144,6 @@
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:
- set-git-credentials
- merge-target-branch
