Remove stable-3.6 builds
Gerrit v3.6 is now EOL and all builds can be safely
removed from the CI.
Change-Id: I8bc280db15c64c4dcff263ebe57f6a3cd680eee2
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index 0b83dd8..8306f99 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.6 OR branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (branch:branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 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.6 OR branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR bbranch:master)",
+ "query": "(not dir:polygerrit-ui) AND (branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR bbranch: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.6 OR branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR branch:master)",
+ "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR branch:master)",
"blocking": []
}
@@ -38,6 +38,6 @@
"name": "Code Style",
"description": "Executes Code Style tests",
"repository": "gerrit",
- "query": "branch:stable-3.6 OR branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR branch:master",
+ "query": "branch:stable-3.7 OR branch:stable-3.8 OR branch:stable-3.9 OR branch:master",
"blocking": []
}
diff --git a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml b/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
index 054cd50..fac146e 100644
--- a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
+++ b/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-module-cached-refdb.yaml b/jenkins/gerrit-bazel-module-cached-refdb.yaml
index 50c1e62..de373ee 100644
--- a/jenkins/gerrit-bazel-module-cached-refdb.yaml
+++ b/jenkins/gerrit-bazel-module-cached-refdb.yaml
@@ -10,5 +10,4 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-events-broker.yaml b/jenkins/gerrit-bazel-module-events-broker.yaml
index eff8093..45aeca0 100644
--- a/jenkins/gerrit-bazel-module-events-broker.yaml
+++ b/jenkins/gerrit-bazel-module-events-broker.yaml
@@ -7,5 +7,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-git-refs-filter.yaml b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
index b8bedf9..c96249d 100644
--- a/jenkins/gerrit-bazel-module-git-refs-filter.yaml
+++ b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
@@ -8,7 +8,6 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-module-global-refdb.yaml b/jenkins/gerrit-bazel-module-global-refdb.yaml
index 246b58e..bf08616 100644
--- a/jenkins/gerrit-bazel-module-global-refdb.yaml
+++ b/jenkins/gerrit-bazel-module-global-refdb.yaml
@@ -7,5 +7,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-index-elasticsearch.yaml b/jenkins/gerrit-bazel-module-index-elasticsearch.yaml
index 0fad4af..e6ea232 100644
--- a/jenkins/gerrit-bazel-module-index-elasticsearch.yaml
+++ b/jenkins/gerrit-bazel-module-index-elasticsearch.yaml
@@ -6,5 +6,4 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
- 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index d08a7bb..7c9f86e 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -44,4 +44,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-admin-console.yaml b/jenkins/gerrit-bazel-plugin-admin-console.yaml
index a5ad2dd..7596828 100644
--- a/jenkins/gerrit-bazel-plugin-admin-console.yaml
+++ b/jenkins/gerrit-bazel-plugin-admin-console.yaml
@@ -7,7 +7,6 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
index bebeb49..4f869a5 100644
--- a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
+++ b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
@@ -10,4 +10,3 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-automerger.yaml b/jenkins/gerrit-bazel-plugin-automerger.yaml
index ea3faa5..2daff59 100644
--- a/jenkins/gerrit-bazel-plugin-automerger.yaml
+++ b/jenkins/gerrit-bazel-plugin-automerger.yaml
@@ -5,9 +5,7 @@
branch:
- master
gerrit-branch:
- - master
- stable-3.7
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
index 84c8ff2..64b9ca8 100644
--- a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
+++ b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
@@ -9,4 +9,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
index 7c31293..fef75c4 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-external.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
index cd5ccc4..dc6b11c 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
@@ -8,7 +8,6 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml b/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml
index 06d0e2c..cfc2019 100644
--- a/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml
+++ b/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml
@@ -8,5 +8,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-branch-network.yaml b/jenkins/gerrit-bazel-plugin-branch-network.yaml
index 695af3a..c5a22bf 100644
--- a/jenkins/gerrit-bazel-plugin-branch-network.yaml
+++ b/jenkins/gerrit-bazel-plugin-branch-network.yaml
@@ -6,7 +6,6 @@
- master
gerrit-branch:
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-checks-jenkins.yaml b/jenkins/gerrit-bazel-plugin-checks-jenkins.yaml
index a8bb126..e1d6270 100644
--- a/jenkins/gerrit-bazel-plugin-checks-jenkins.yaml
+++ b/jenkins/gerrit-bazel-plugin-checks-jenkins.yaml
@@ -9,4 +9,3 @@
- master
gerrit-branch:
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-checks.yaml b/jenkins/gerrit-bazel-plugin-checks.yaml
index 12c36b6..2a83818 100644
--- a/jenkins/gerrit-bazel-plugin-checks.yaml
+++ b/jenkins/gerrit-bazel-plugin-checks.yaml
@@ -6,4 +6,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-code-owners.yaml b/jenkins/gerrit-bazel-plugin-code-owners.yaml
index 7e582a5..927dadc 100644
--- a/jenkins/gerrit-bazel-plugin-code-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-code-owners.yaml
@@ -10,4 +10,3 @@
branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml b/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
index ca18329..dbb6c3c 100644
--- a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
@@ -8,5 +8,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml b/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
index fb33585..9de3f1a 100644
--- a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
@@ -8,5 +8,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-kafka.yaml b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
index 87bba44..abce234 100644
--- a/jenkins/gerrit-bazel-plugin-events-kafka.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
@@ -8,5 +8,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-log.yaml b/jenkins/gerrit-bazel-plugin-events-log.yaml
index a279d12..4b5790a 100644
--- a/jenkins/gerrit-bazel-plugin-events-log.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-log.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-find-owners.yaml b/jenkins/gerrit-bazel-plugin-find-owners.yaml
index 28155d2..6584786 100644
--- a/jenkins/gerrit-bazel-plugin-find-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-find-owners.yaml
@@ -6,7 +6,6 @@
- master
gerrit-branch:
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
index d62bcf9..ab2b5e6 100644
--- a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
+++ b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml b/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
index 14cc083..6d55138 100644
--- a/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
+++ b/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
@@ -11,5 +11,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-go-import.yaml b/jenkins/gerrit-bazel-plugin-go-import.yaml
index b02d84b..c352e1f 100644
--- a/jenkins/gerrit-bazel-plugin-go-import.yaml
+++ b/jenkins/gerrit-bazel-plugin-go-import.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
index f8deaff..bc133d5 100644
--- a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
+++ b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
@@ -11,4 +11,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-healthcheck.yaml b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
index 1e80dda..f022540 100644
--- a/jenkins/gerrit-bazel-plugin-healthcheck.yaml
+++ b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
@@ -7,4 +7,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-heartbeat.yaml b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
index 5c52dc2..d7413c4 100644
--- a/jenkins/gerrit-bazel-plugin-heartbeat.yaml
+++ b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-high-availability.yaml b/jenkins/gerrit-bazel-plugin-high-availability.yaml
index 776b8a6..2af9077 100644
--- a/jenkins/gerrit-bazel-plugin-high-availability.yaml
+++ b/jenkins/gerrit-bazel-plugin-high-availability.yaml
@@ -6,5 +6,4 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
- plugin-{name}-verifier
diff --git a/jenkins/gerrit-bazel-plugin-its-base.yaml b/jenkins/gerrit-bazel-plugin-its-base.yaml
index 0b23541..3034c59 100644
--- a/jenkins/gerrit-bazel-plugin-its-base.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-base.yaml
@@ -7,7 +7,6 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
targets: 'plugins/its-base:its-base plugins/its-base:its_base_tests'
- 'plugin-{name}-bazel-{branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-its-jira.yaml b/jenkins/gerrit-bazel-plugin-its-jira.yaml
index 216cef5..8271844 100644
--- a/jenkins/gerrit-bazel-plugin-its-jira.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-jira.yaml
@@ -7,7 +7,6 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
targets: 'plugins/its-jira:its-jira plugins/its-jira:its_jira_tests'
- 'plugin-its-{name}-bazel-{branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-javamelody.yaml b/jenkins/gerrit-bazel-plugin-javamelody.yaml
index 0bfb33d..3693e00 100644
--- a/jenkins/gerrit-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-bazel-plugin-javamelody.yaml
@@ -38,4 +38,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-lfs.yaml b/jenkins/gerrit-bazel-plugin-lfs.yaml
index 88a769a..cbe1227 100644
--- a/jenkins/gerrit-bazel-plugin-lfs.yaml
+++ b/jenkins/gerrit-bazel-plugin-lfs.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-login-redirect.yaml b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
index c0e0caf..4dbe78a 100644
--- a/jenkins/gerrit-bazel-plugin-login-redirect.yaml
+++ b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-menuextender.yaml b/jenkins/gerrit-bazel-plugin-menuextender.yaml
index 267cf8b..5c991d5 100644
--- a/jenkins/gerrit-bazel-plugin-menuextender.yaml
+++ b/jenkins/gerrit-bazel-plugin-menuextender.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
index fbae40e..c15b776 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
index aa9674f..961b7a5 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
@@ -11,4 +11,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-multi-site.yaml b/jenkins/gerrit-bazel-plugin-multi-site.yaml
index b049275..f77a18a 100644
--- a/jenkins/gerrit-bazel-plugin-multi-site.yaml
+++ b/jenkins/gerrit-bazel-plugin-multi-site.yaml
@@ -9,5 +9,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-oauth.yaml b/jenkins/gerrit-bazel-plugin-oauth.yaml
index 732aa56..b72dfce 100644
--- a/jenkins/gerrit-bazel-plugin-oauth.yaml
+++ b/jenkins/gerrit-bazel-plugin-oauth.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
index 2f12b17..69208c9 100644
--- a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
+++ b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
@@ -8,7 +8,6 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
index 2186170..b0cc8d2 100644
--- a/jenkins/gerrit-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-owners.yaml
@@ -72,4 +72,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
index b3543ae..a215fd4 100644
--- a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
+++ b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
@@ -6,4 +6,3 @@
- master
gerrit-branch:
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-pull-replication.yaml b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
index 6c37f67..6e64209 100644
--- a/jenkins/gerrit-bazel-plugin-pull-replication.yaml
+++ b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
@@ -12,5 +12,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-quota.yaml b/jenkins/gerrit-bazel-plugin-quota.yaml
index 4cfab30..7c70e27 100644
--- a/jenkins/gerrit-bazel-plugin-quota.yaml
+++ b/jenkins/gerrit-bazel-plugin-quota.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
index 4c60532..b6b6d91 100644
--- a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
+++ b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
@@ -6,4 +6,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-readonly.yaml b/jenkins/gerrit-bazel-plugin-readonly.yaml
index eae3676..bd7ae86 100644
--- a/jenkins/gerrit-bazel-plugin-readonly.yaml
+++ b/jenkins/gerrit-bazel-plugin-readonly.yaml
@@ -10,4 +10,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-ref-copy.yaml b/jenkins/gerrit-bazel-plugin-ref-copy.yaml
index 651918f..92d974f 100644
--- a/jenkins/gerrit-bazel-plugin-ref-copy.yaml
+++ b/jenkins/gerrit-bazel-plugin-ref-copy.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
index fbe8c68..182c23d 100644
--- a/jenkins/gerrit-bazel-plugin-ref-protection.yaml
+++ b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
@@ -8,8 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
- branch:
- - stable-3.5
- gerrit-branch:
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
index 2c605e3..e55eb34 100644
--- a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
+++ b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-rename-project.yaml b/jenkins/gerrit-bazel-plugin-rename-project.yaml
index b96fb67..0b5ef7d 100644
--- a/jenkins/gerrit-bazel-plugin-rename-project.yaml
+++ b/jenkins/gerrit-bazel-plugin-rename-project.yaml
@@ -4,4 +4,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-replication-status.yaml b/jenkins/gerrit-bazel-plugin-replication-status.yaml
index e987442..84d1224 100644
--- a/jenkins/gerrit-bazel-plugin-replication-status.yaml
+++ b/jenkins/gerrit-bazel-plugin-replication-status.yaml
@@ -11,5 +11,4 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
index 673b844..ddef732 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-reviewers.yaml b/jenkins/gerrit-bazel-plugin-reviewers.yaml
index edc6fd7..3bc8c88 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers.yaml
@@ -5,8 +5,6 @@
branch:
- master
- stable-3.7
- - stable-3.6
-
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-serviceuser.yaml b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
index 1f0f25b..e46df38 100644
--- a/jenkins/gerrit-bazel-plugin-serviceuser.yaml
+++ b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
@@ -10,4 +10,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
index b1798a2..ef8cbd7 100644
--- a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
+++ b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
@@ -1,11 +1,6 @@
- project:
name: simple-submit-rules
jobs:
- - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
- branch:
- - master
- gerrit-branch:
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-slack-integration.yaml b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
index b19c485..ac87790 100644
--- a/jenkins/gerrit-bazel-plugin-slack-integration.yaml
+++ b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
@@ -8,7 +8,6 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-task.yaml b/jenkins/gerrit-bazel-plugin-task.yaml
index 26d5637..0ba7ea1 100644
--- a/jenkins/gerrit-bazel-plugin-task.yaml
+++ b/jenkins/gerrit-bazel-plugin-task.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index cf8e09a..43c7134 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -286,4 +286,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
index 160b99c..1ee44af 100644
--- a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
+++ b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-verify-status.yaml b/jenkins/gerrit-bazel-plugin-verify-status.yaml
index 7d43554..7a82bc0 100644
--- a/jenkins/gerrit-bazel-plugin-verify-status.yaml
+++ b/jenkins/gerrit-bazel-plugin-verify-status.yaml
@@ -7,7 +7,6 @@
gerrit-branch:
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-websession-broker.yaml b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
index b03b3f3..4665f8f 100644
--- a/jenkins/gerrit-bazel-plugin-websession-broker.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
@@ -8,4 +8,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
index 0498470..66a39f6 100644
--- a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
index 9146ffb..12254a3 100644
--- a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
+++ b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
targets: "plugins/{name}:{name} plugins/{name}:{name}-zk-3.5"
branch:
- - stable-3.6
- stable-3.7
- stable-3.8
extra-modules: 'global-refdb'
diff --git a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml b/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
index 5ecade1..100eedb 100644
--- a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
+++ b/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.7
- - stable-3.6
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index 86c901d..5a6ed4b 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -68,7 +68,6 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
browser: chrome-latest
jobs:
- 'Gerrit-bazel-{branch}':
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index 00d9f5b..c84d258 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -16,11 +16,11 @@
echo '----------------------------------------------'
case $TARGET_BRANCH$MODE in
- masterrbe|stable-3.6rbe|stable-3.7rbe|stable-3.8rbe|stable-3.9rbe)
+ masterrbe|stable-3.7rbe|stable-3.8rbe|stable-3.9rbe)
TEST_TAG_FILTER="-flaky,-elastic,-no_rbe"
BAZEL_OPTS="$BAZEL_OPTS --config=remote --remote_instance_name=projects/gerritcodereview-ci/instances/default_instance"
;;
- masternotedb|stable-3.6notedb|stable-3.7notedb|stable-3.8notedb|stable-3.9notedb)
+ masternotedb|stable-3.7notedb|stable-3.8notedb|stable-3.9notedb)
TEST_TAG_FILTER="-flaky,elastic,no_rbe"
;;
stable-2.*)
diff --git a/jenkins/gerrit-mvn-plugin-github.yaml b/jenkins/gerrit-mvn-plugin-github.yaml
index c220820..734e121 100644
--- a/jenkins/gerrit-mvn-plugin-github.yaml
+++ b/jenkins/gerrit-mvn-plugin-github.yaml
@@ -6,6 +6,5 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
jobs:
- 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-plugin-saml.yaml b/jenkins/gerrit-plugin-saml.yaml
index 042ec07..050f1f1 100644
--- a/jenkins/gerrit-plugin-saml.yaml
+++ b/jenkins/gerrit-plugin-saml.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.8
- stable-3.7
- - stable-3.6
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-sbt-plugin-analytics.yaml b/jenkins/gerrit-sbt-plugin-analytics.yaml
index fe04611..4d2c1fa 100644
--- a/jenkins/gerrit-sbt-plugin-analytics.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics.yaml
@@ -7,4 +7,3 @@
- stable-3.9
- stable-3.8
- stable-3.7
- - stable-3.6
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index 11b0928..ba00562 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -130,7 +130,7 @@
def collectBuildModes() {
Builds.modes = []
- if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[6-9]/) {
+ if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[7-9]/) {
Builds.modes = ["notedb", "rbe"]
} else {
throw new Exception("Unsupported branch ${env.GERRIT_BRANCH}")
@@ -160,7 +160,7 @@
}
def buildVerificationJob() {
- (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[5-9]/) ? "Gerrit-verifier-chrome-latest" : "Gerrit-verifier-chrome-69"
+ (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[7-9]/) ? "Gerrit-verifier-chrome-latest" : "Gerrit-verifier-chrome-69"
}
def prepareBuildsForMode(buildName, mode="notedb", retryTimes = 1) {
