Validate Gerrit on stable-3.7
Change-Id: I54cb4224f8c1bcac6f9e661c710cd098bd6f2c5b
diff --git a/jenkins-docker/agent-bazel/Dockerfile b/jenkins-docker/agent-bazel/Dockerfile
index 3ec12ba..4cbf991 100644
--- a/jenkins-docker/agent-bazel/Dockerfile
+++ b/jenkins-docker/agent-bazel/Dockerfile
@@ -3,7 +3,7 @@
# Bazel cache warm-up with Gerrit master and latest stable branch.
# Set-up google-java-format utility to ~/format/google-java-format.
USER jenkins
-RUN bash -c 'cd /tmp && git clone -b stable-3.6 --recursive https://gerrit.googlesource.com/gerrit && \
+RUN bash -c 'cd /tmp && git clone -b stable-3.7 --recursive https://gerrit.googlesource.com/gerrit && \
cd /tmp/gerrit && \
./tools/setup_gjf.sh 1.7 && \
( bazelisk build --remote_cache=https://gerrit-ci.gerritforge.com/cache --noremote_upload_local_results plugins:core release api || true ) && \
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index de61d9d..bedc188 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -5,7 +5,7 @@
"name": "RBE Build/Tests",
"description": "Builds the code base and executes unit/integration tests on RBE",
"repository": "gerrit",
- "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:stable-3.7 OR branch:master)",
"blocking": []
}
@@ -16,7 +16,7 @@
"name": "Build/Tests",
"description": "Builds the code base and executes unit/integration tests",
"repository": "gerrit",
- "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:stable-3.7 OR branch:master)",
"blocking": []
}
@@ -27,7 +27,7 @@
"name": "PolyGerrit UI Tests",
"description": "Executes unit/integration tests for PolyGerrit UI",
"repository": "gerrit",
- "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master)",
+ "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:stable-3.7 OR branch:master)",
"blocking": []
}
@@ -38,6 +38,6 @@
"name": "Code Style",
"description": "Executes Code Style tests",
"repository": "gerrit",
- "query": "branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:master",
+ "query": "branch:stable-3.4 OR branch:stable-3.5 OR branch:stable-3.6 OR branch:stable-3.7 OR branch:master",
"blocking": []
}
diff --git a/jenkins/gatling-test-pipeline.groovy b/jenkins/gatling-test-pipeline.groovy
index 94d6aa0..94be7e5 100644
--- a/jenkins/gatling-test-pipeline.groovy
+++ b/jenkins/gatling-test-pipeline.groovy
@@ -9,9 +9,9 @@
string(name: 'AWS_PREFIX', defaultValue:"jenkins", description: 'A string to prefix stacks and resources with')
string(name: 'AWS_REGION', defaultValue:"us-east-1", description: 'Which region to deploy to')
- string(name: 'GERRIT_VERSION', defaultValue:"3.6", description: 'The gerrit version under test')
+ string(name: 'GERRIT_VERSION', defaultValue:"3.7", description: 'The gerrit version under test')
string(name: 'GERRIT_PATCH', defaultValue:"0-rc3", description: 'The gerrit version patch under test')
- string(name: 'GERRIT_WAR_URL', defaultValue:"https://gerrit-ci.gerritforge.com/job/Gerrit-bazel-stable-3.6/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war", description: 'The gerrit.war URL to use as override of the gerrit version under test')
+ string(name: 'GERRIT_WAR_URL', defaultValue:"https://gerrit-ci.gerritforge.com/job/Gerrit-bazel-stable-3.7/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war", description: 'The gerrit.war URL to use as override of the gerrit version under test')
string(name: 'HOSTED_ZONE_NAME', defaultValue: "gerritforgeaws.com", description: 'Name of the hosted zone')
string(name: 'CLUSTER_INSTANCE_TYPE', defaultValue: 'm4.xlarge', description:'The EC2 instance Type used to run the cluster')
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index e731831..4b3cce1 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -74,6 +74,7 @@
name: Gerrit-bazel-chrome-latest
branch:
- master
+ - stable-3.7
- stable-3.6
- stable-3.5
browser: chrome-latest
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 13931f0..8981e86 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -15,11 +15,11 @@
echo '----------------------------------------------'
case $TARGET_BRANCH$MODE in
- masterrbe|stable-3.4rbe|stable-3.5rbe|stable-3.6rbe)
+ masterrbe|stable-3.4rbe|stable-3.5rbe|stable-3.6rbe|stable-3.7rbe)
TEST_TAG_FILTER="-flaky,-elastic,-no_rbe"
BAZEL_OPTS="--config=remote --remote_instance_name=projects/gerritcodereview-ci/instances/default_instance"
;;
- masternotedb|stable-3.4notedb|stable-3.5notedb|stable-3.6notedb)
+ masternotedb|stable-3.4notedb|stable-3.5notedb|stable-3.6notedb|stable-3.7notedb)
TEST_TAG_FILTER="-flaky,elastic,no_rbe"
;;
stable-2.*)
