Skip to content

Commit 53d63f7

Browse files
committed
Enable Gerrit builds on stable-3.12
Validate incoming changes on stable-3.12 and build Gerrit and plugins for the stable-3.12 branch. Change-Id: Id283ac23f65a0baa94ad049a568920593410c460
1 parent fb38173 commit 53d63f7

4 files changed

+5
-3
lines changed

jenkins/gerrit-bazel-plugin-template.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@
285285
- 'Plugins-{branch}'
286286
branch:
287287
- master
288+
- stable-3.12
288289
- stable-3.11
289290
- stable-3.10
290291
- stable-3.9

jenkins/gerrit-bazel-template.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
- 'Gerrit-bazel-{branch}':
8080
branch:
8181
- master
82+
- stable-3.12
8283
- stable-3.11
8384
- stable-3.10
8485
- stable-3.9

jenkins/gerrit-bazel-verifier-test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ echo "Test with mode=$MODE"
88
echo '----------------------------------------------'
99

1010
case $TARGET_BRANCH$MODE in
11-
masterrbe|stable-3.9rbe|stable-3.10rbe|stable-3.11rbe)
11+
masterrbe|stable-3.9rbe|stable-3.10rbe|stable-3.11rbe|stable-3.12rbe)
1212
TEST_TAG_FILTER="-flaky,-elastic,-no_rbe,-lucene"
1313
BAZEL_OPTS="$BAZEL_OPTS --config=remote_bb --jobs=50 --remote_header=x-buildbuddy-api-key=$BB_API_KEY"
1414
;;
15-
masternotedb|stable-3.9notedb|stable-3.10notedb|stable-3.11notedb)
15+
masternotedb|stable-3.9notedb|stable-3.10notedb|stable-3.11notedb|stable-3.12notedb)
1616
TEST_TAG_FILTER="-flaky,elastic,no_rbe"
1717
;;
1818
stable-2.*)

vars/gerritPipeline.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def queryChangedFiles(url) {
130130

131131
def collectBuildModes() {
132132
Builds.modes = []
133-
if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH == "stable-3.9" || env.GERRIT_BRANCH ==~ /stable-3.1[0-1]/) {
133+
if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH == "stable-3.9" || env.GERRIT_BRANCH ==~ /stable-3.1[0-2]/) {
134134
Builds.modes = ["notedb", "rbe"]
135135
} else {
136136
throw new Exception("Unsupported branch ${env.GERRIT_BRANCH}")

0 commit comments

Comments
 (0)