Build Gerrit and validate changes on stable-3.3
Adapt the Gerrit checks definition and select also all
incoming changes on the stable-3.3 branch.
Define a new Gerrit build for stable-3.3 based on Java 11.
Change-Id: I186dd71f8bb456bc9f31577b42d79ad2ca5a215a
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index 27aa121..c82b1ee 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -5,7 +5,7 @@
"name": "Build/Tests",
"description": "Builds the code base and executes unit/integration tests",
"repository": "gerrit",
- "query": "branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:master",
+ "query": "branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:master",
"blocking": []
}
@@ -27,7 +27,7 @@
"name": "PolyGerrit UI Tests",
"description": "Executes unit/integration tests for PolyGerrit UI",
"repository": "gerrit",
- "query": "(directory:polygerit-ui OR file:WORKSPACE) AND (branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:master)",
+ "query": "(directory:polygerit-ui OR file:WORKSPACE) AND (branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:master)",
"blocking": []
}
@@ -38,6 +38,6 @@
"name": "Code Style",
"description": "Executes Code Style tests",
"repository": "gerrit",
- "query": "branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:master",
+ "query": "branch:stable-2.16 OR branch:stable-3.0 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:master",
"blocking": []
}
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index cd82282..fbd5271 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -107,6 +107,7 @@
name: Gerrit-bazel-java11
branch:
- master
+ - stable-3.3
jobs:
- 'Gerrit-bazel-java11-{branch}'
diff --git a/jenkins/gerrit-codestyle-polygerrit-lint.sh b/jenkins/gerrit-codestyle-polygerrit-lint.sh
index 91a5fef..d4072e6 100644
--- a/jenkins/gerrit-codestyle-polygerrit-lint.sh
+++ b/jenkins/gerrit-codestyle-polygerrit-lint.sh
@@ -2,6 +2,7 @@
cd gerrit
bazelisk version
if ([ "$TARGET_BRANCH" == "master" ] || \
+ [ "$TARGET_BRANCH" == "stable-3.3" ] || \
[ "$TARGET_BRANCH" == "stable-3.2" ] || \
[ "$TARGET_BRANCH" == "stable-3.1" ] || \
[ "$TARGET_BRANCH" == "stable-3.0" ] || \
