Remove builds on stable-3.1 branch
Gerrit v3.1 is now EOL: [1] and its associated builds will be
archived [2] and can be safely removed from the main CI.
[1] https://www.gerritcodereview.com/2021-03-16-gerrit-3.4-release-plan.html#end-of-life-for-gerrit-31x
[2] https://archive-ci.gerritforge.com/view/Plugins-stable-3.1
Change-Id: If69fe1a3ca8ed4adce2b175dbd3d80fbef8103cd
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index 5c93027..5f3f428 100644
--- a/jenkins/checker_definitions.txt
+++ b/jenkins/checker_definitions.txt
@@ -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-2.16 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (branch:stable-2.16 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
"blocking": []
}
@@ -38,7 +38,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-2.16 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
+ "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (branch:stable-2.16 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
"blocking": []
}
@@ -49,6 +49,6 @@
"name": "Code Style",
"description": "Executes Code Style tests",
"repository": "gerrit",
- "query": "branch:stable-2.16 OR branch:stable-3.1 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master",
+ "query": "branch:stable-2.16 OR branch:stable-3.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master",
"blocking": []
}
diff --git a/jenkins/gerrit-bazel-build-account-plugin.sh b/jenkins/gerrit-bazel-build-account-plugin.sh
index be6dfb0..d7ee152 100644
--- a/jenkins/gerrit-bazel-build-account-plugin.sh
+++ b/jenkins/gerrit-bazel-build-account-plugin.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
case "{branch}" in
- stable-2.16|stable-3.1|stable-3.2)
+ stable-2.16|stable-3.2)
. set-java.sh 8
;;
*)
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
index e2cd0fb..2927aab 100644
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ b/jenkins/gerrit-bazel-build-plugin-branch.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
case "{branch}" in
- stable-2.16|stable-3.1|stable-3.2)
+ stable-2.16|stable-3.2)
. set-java.sh 8
;;
*)
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
index 7287da7..f6f5556 100644
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ b/jenkins/gerrit-bazel-build-plugin.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
case "{branch}" in
- stable-2.16|stable-3.1|stable-3.2)
+ stable-2.16|stable-3.2)
. set-java.sh 8
;;
*)
diff --git a/jenkins/gerrit-bazel-lib-global-refdb.yaml b/jenkins/gerrit-bazel-lib-global-refdb.yaml
index 38638a7..abe6a27 100644
--- a/jenkins/gerrit-bazel-lib-global-refdb.yaml
+++ b/jenkins/gerrit-bazel-lib-global-refdb.yaml
@@ -5,6 +5,5 @@
branch:
- master
- stable-3.2
- - stable-3.1
jobs:
- 'plugin-{name}-gh-bazel-{branch}'
diff --git a/jenkins/gerrit-bazel-module-events-broker.yaml b/jenkins/gerrit-bazel-module-events-broker.yaml
index 26e424a..f08f4f3 100644
--- a/jenkins/gerrit-bazel-module-events-broker.yaml
+++ b/jenkins/gerrit-bazel-module-events-broker.yaml
@@ -7,5 +7,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-git-refs-filter.yaml b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
index 2ac8709..1b2a6b8 100644
--- a/jenkins/gerrit-bazel-module-git-refs-filter.yaml
+++ b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
@@ -9,5 +9,4 @@
- stable-3.2
- 'module-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index 8ca3f70..bdf6768 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -44,5 +44,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-admin-console.yaml b/jenkins/gerrit-bazel-plugin-admin-console.yaml
index b7ef74d..8393205 100644
--- a/jenkins/gerrit-bazel-plugin-admin-console.yaml
+++ b/jenkins/gerrit-bazel-plugin-admin-console.yaml
@@ -11,5 +11,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
index 448536a..15e68af 100644
--- a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
+++ b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-automerger.yaml b/jenkins/gerrit-bazel-plugin-automerger.yaml
index c4a7257..d68bd2e 100644
--- a/jenkins/gerrit-bazel-plugin-automerger.yaml
+++ b/jenkins/gerrit-bazel-plugin-automerger.yaml
@@ -11,5 +11,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
index 7d4e956..b52dd96 100644
--- a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
+++ b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
@@ -11,5 +11,4 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
index 125a0df..d87496f 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-external.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
@@ -9,7 +9,6 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
index eb584b4..883df3b 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
@@ -8,7 +8,6 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-batch.yaml b/jenkins/gerrit-bazel-plugin-batch.yaml
index 999b0e1..c101d88 100644
--- a/jenkins/gerrit-bazel-plugin-batch.yaml
+++ b/jenkins/gerrit-bazel-plugin-batch.yaml
@@ -6,5 +6,4 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-cfoauth.yaml b/jenkins/gerrit-bazel-plugin-cfoauth.yaml
index 85269ad..2dbd33b 100644
--- a/jenkins/gerrit-bazel-plugin-cfoauth.yaml
+++ b/jenkins/gerrit-bazel-plugin-cfoauth.yaml
@@ -6,5 +6,4 @@
- master
gerrit-branch:
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-changemessage.yaml b/jenkins/gerrit-bazel-plugin-changemessage.yaml
index 090ed9c..3f82960 100644
--- a/jenkins/gerrit-bazel-plugin-changemessage.yaml
+++ b/jenkins/gerrit-bazel-plugin-changemessage.yaml
@@ -10,5 +10,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-checks.yaml b/jenkins/gerrit-bazel-plugin-checks.yaml
index 57bd028..c0843f1 100644
--- a/jenkins/gerrit-bazel-plugin-checks.yaml
+++ b/jenkins/gerrit-bazel-plugin-checks.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-egit.yaml b/jenkins/gerrit-bazel-plugin-egit.yaml
index ae36fad..7f2fdd4 100644
--- a/jenkins/gerrit-bazel-plugin-egit.yaml
+++ b/jenkins/gerrit-bazel-plugin-egit.yaml
@@ -8,5 +8,4 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-events-kafka.yaml b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
index 661c545..6a02fd8 100644
--- a/jenkins/gerrit-bazel-plugin-events-kafka.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
@@ -7,6 +7,5 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-log.yaml b/jenkins/gerrit-bazel-plugin-events-log.yaml
index 0e9a06b..7ffe766 100644
--- a/jenkins/gerrit-bazel-plugin-events-log.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-log.yaml
@@ -11,5 +11,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-examples.yaml b/jenkins/gerrit-bazel-plugin-examples.yaml
index 324f6f0..7bdc834 100644
--- a/jenkins/gerrit-bazel-plugin-examples.yaml
+++ b/jenkins/gerrit-bazel-plugin-examples.yaml
@@ -32,5 +32,4 @@
- 'plugin-examples-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-find-owners.yaml b/jenkins/gerrit-bazel-plugin-find-owners.yaml
index 6cb865a..e6eb9bf 100644
--- a/jenkins/gerrit-bazel-plugin-find-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-find-owners.yaml
@@ -11,5 +11,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
index 1f962f5..c8e980b 100644
--- a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
+++ b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
@@ -9,5 +9,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-go-import.yaml b/jenkins/gerrit-bazel-plugin-go-import.yaml
index 869cfeb..2960dd5 100644
--- a/jenkins/gerrit-bazel-plugin-go-import.yaml
+++ b/jenkins/gerrit-bazel-plugin-go-import.yaml
@@ -9,5 +9,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
index 0cecfe3..5211889 100644
--- a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
+++ b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
@@ -11,5 +11,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-healthcheck.yaml b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
index 45d809b..e53052f 100644
--- a/jenkins/gerrit-bazel-plugin-healthcheck.yaml
+++ b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-heartbeat.yaml b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
index 01cc245..1bb6ff9 100644
--- a/jenkins/gerrit-bazel-plugin-heartbeat.yaml
+++ b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
@@ -9,5 +9,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-high-availability.yaml b/jenkins/gerrit-bazel-plugin-high-availability.yaml
index d104400..b382679 100644
--- a/jenkins/gerrit-bazel-plugin-high-availability.yaml
+++ b/jenkins/gerrit-bazel-plugin-high-availability.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- stable-2.15
- stable-2.14
diff --git a/jenkins/gerrit-bazel-plugin-imagare.yaml b/jenkins/gerrit-bazel-plugin-imagare.yaml
index 7ee3bf9..6b0cd9b 100644
--- a/jenkins/gerrit-bazel-plugin-imagare.yaml
+++ b/jenkins/gerrit-bazel-plugin-imagare.yaml
@@ -5,5 +5,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-its-base.yaml b/jenkins/gerrit-bazel-plugin-its-base.yaml
index 788b6a2..3c12a85 100644
--- a/jenkins/gerrit-bazel-plugin-its-base.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-base.yaml
@@ -12,6 +12,5 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
targets: 'plugins/its-base:its-base plugins/its-base:its_base_tests'
diff --git a/jenkins/gerrit-bazel-plugin-its-jira.yaml b/jenkins/gerrit-bazel-plugin-its-jira.yaml
index dc1333f..437437c 100644
--- a/jenkins/gerrit-bazel-plugin-its-jira.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-jira.yaml
@@ -12,6 +12,5 @@
- 'plugin-its-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
targets: 'plugins/its-jira:its-jira plugins/its-jira:its_jira_tests'
diff --git a/jenkins/gerrit-bazel-plugin-its-phabricator.yaml b/jenkins/gerrit-bazel-plugin-its-phabricator.yaml
index 4ae75f7..66f209e 100644
--- a/jenkins/gerrit-bazel-plugin-its-phabricator.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-phabricator.yaml
@@ -5,5 +5,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-javamelody.yaml b/jenkins/gerrit-bazel-plugin-javamelody.yaml
index 2f66467..18b73e8 100644
--- a/jenkins/gerrit-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-bazel-plugin-javamelody.yaml
@@ -38,7 +38,6 @@
- 'plugin-javamelody-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-kafka-events.yaml b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
index 2185f67..b8af9b9 100644
--- a/jenkins/gerrit-bazel-plugin-kafka-events.yaml
+++ b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
@@ -15,6 +15,5 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-lfs.yaml b/jenkins/gerrit-bazel-plugin-lfs.yaml
index 9676065..c1cd4e3 100644
--- a/jenkins/gerrit-bazel-plugin-lfs.yaml
+++ b/jenkins/gerrit-bazel-plugin-lfs.yaml
@@ -11,5 +11,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-log-level.yaml b/jenkins/gerrit-bazel-plugin-log-level.yaml
index f5f41f3..c568077 100644
--- a/jenkins/gerrit-bazel-plugin-log-level.yaml
+++ b/jenkins/gerrit-bazel-plugin-log-level.yaml
@@ -5,5 +5,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-login-redirect.yaml b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
index ecd8351..e56ea09 100644
--- a/jenkins/gerrit-bazel-plugin-login-redirect.yaml
+++ b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
@@ -9,5 +9,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-menuextender.yaml b/jenkins/gerrit-bazel-plugin-menuextender.yaml
index 35b7afe..1ca6ef6 100644
--- a/jenkins/gerrit-bazel-plugin-menuextender.yaml
+++ b/jenkins/gerrit-bazel-plugin-menuextender.yaml
@@ -9,5 +9,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-messageoftheday.yaml b/jenkins/gerrit-bazel-plugin-messageoftheday.yaml
index 9810ccb..2c39bc3 100644
--- a/jenkins/gerrit-bazel-plugin-messageoftheday.yaml
+++ b/jenkins/gerrit-bazel-plugin-messageoftheday.yaml
@@ -10,5 +10,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
index f50ed66..d8a0326 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
@@ -9,5 +9,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
index 89c36c1..ad929b7 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
@@ -7,5 +7,4 @@
gerrit-branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
index 33f4672..8054984 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
@@ -8,7 +8,6 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-motd.yaml b/jenkins/gerrit-bazel-plugin-motd.yaml
index deefdea..e8a3f3d 100644
--- a/jenkins/gerrit-bazel-plugin-motd.yaml
+++ b/jenkins/gerrit-bazel-plugin-motd.yaml
@@ -6,7 +6,6 @@
- master
gerrit-branch:
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-multi-site.yaml b/jenkins/gerrit-bazel-plugin-multi-site.yaml
index 3c99098..4b4593c 100644
--- a/jenkins/gerrit-bazel-plugin-multi-site.yaml
+++ b/jenkins/gerrit-bazel-plugin-multi-site.yaml
@@ -7,5 +7,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-oauth.yaml b/jenkins/gerrit-bazel-plugin-oauth.yaml
index 4c0736a..630bec9 100644
--- a/jenkins/gerrit-bazel-plugin-oauth.yaml
+++ b/jenkins/gerrit-bazel-plugin-oauth.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
index ce743e3..400c31a 100644
--- a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
+++ b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
@@ -9,5 +9,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
index 09b3f38..933e31e 100644
--- a/jenkins/gerrit-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-owners.yaml
@@ -71,5 +71,4 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-project-download-commands.yaml b/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
index b652068..64b47da 100644
--- a/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
+++ b/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
@@ -4,4 +4,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
diff --git a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
index 064c80e..25d77fb 100644
--- a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
+++ b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-pull-replication.yaml b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
index ec52232..31410e4 100644
--- a/jenkins/gerrit-bazel-plugin-pull-replication.yaml
+++ b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-quota.yaml b/jenkins/gerrit-bazel-plugin-quota.yaml
index 2635bc8..8c3d6cd 100644
--- a/jenkins/gerrit-bazel-plugin-quota.yaml
+++ b/jenkins/gerrit-bazel-plugin-quota.yaml
@@ -12,5 +12,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-rabbitmq.yaml b/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
index bf851e6..40e03b7 100644
--- a/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
+++ b/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
@@ -4,5 +4,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
index daf6b64..d4a8b70 100644
--- a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
+++ b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
@@ -5,5 +5,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-readonly.yaml b/jenkins/gerrit-bazel-plugin-readonly.yaml
index 958d1b0..46f3cec 100644
--- a/jenkins/gerrit-bazel-plugin-readonly.yaml
+++ b/jenkins/gerrit-bazel-plugin-readonly.yaml
@@ -11,5 +11,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
index b4e83a2..158750b 100644
--- a/jenkins/gerrit-bazel-plugin-ref-protection.yaml
+++ b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
@@ -11,5 +11,4 @@
- stable-3.2
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
index 2bba48e..063c1ab 100644
--- a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
+++ b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
@@ -11,4 +11,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
diff --git a/jenkins/gerrit-bazel-plugin-rename-project.yaml b/jenkins/gerrit-bazel-plugin-rename-project.yaml
index 555b799..dc3f7fb 100644
--- a/jenkins/gerrit-bazel-plugin-rename-project.yaml
+++ b/jenkins/gerrit-bazel-plugin-rename-project.yaml
@@ -11,5 +11,4 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
index a5c3d97..becaaa4 100644
--- a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
@@ -11,5 +11,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
index fe90119..62a4be8 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
@@ -12,4 +12,3 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
diff --git a/jenkins/gerrit-bazel-plugin-reviewers.yaml b/jenkins/gerrit-bazel-plugin-reviewers.yaml
index 61d474d..6607362 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers.yaml
@@ -11,5 +11,4 @@
branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-scala-provider.yaml b/jenkins/gerrit-bazel-plugin-scala-provider.yaml
index 69ea749..bdb7115 100644
--- a/jenkins/gerrit-bazel-plugin-scala-provider.yaml
+++ b/jenkins/gerrit-bazel-plugin-scala-provider.yaml
@@ -7,5 +7,4 @@
gerrit-branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-secure-config.yaml b/jenkins/gerrit-bazel-plugin-secure-config.yaml
index 10c3eb9..a8cc49d 100644
--- a/jenkins/gerrit-bazel-plugin-secure-config.yaml
+++ b/jenkins/gerrit-bazel-plugin-secure-config.yaml
@@ -4,5 +4,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-server-config.yaml b/jenkins/gerrit-bazel-plugin-server-config.yaml
index a6400c2..9be7bae 100644
--- a/jenkins/gerrit-bazel-plugin-server-config.yaml
+++ b/jenkins/gerrit-bazel-plugin-server-config.yaml
@@ -4,4 +4,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
diff --git a/jenkins/gerrit-bazel-plugin-serviceuser.yaml b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
index 0b45969..dd9930c 100644
--- a/jenkins/gerrit-bazel-plugin-serviceuser.yaml
+++ b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
@@ -11,5 +11,4 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
index 7890a4b..f879c9d 100644
--- a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
+++ b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-slack-integration.yaml b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
index 3a071b5..7054a6d 100644
--- a/jenkins/gerrit-bazel-plugin-slack-integration.yaml
+++ b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
@@ -11,5 +11,4 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-task.yaml b/jenkins/gerrit-bazel-plugin-task.yaml
index 47c4dea..de08214 100644
--- a/jenkins/gerrit-bazel-plugin-task.yaml
+++ b/jenkins/gerrit-bazel-plugin-task.yaml
@@ -10,5 +10,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 327cc7a..20b610a 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -285,5 +285,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
index c035125..3c5603a 100644
--- a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
+++ b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
@@ -11,5 +11,4 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-verify-status.yaml b/jenkins/gerrit-bazel-plugin-verify-status.yaml
index 9211361..3dcca86 100644
--- a/jenkins/gerrit-bazel-plugin-verify-status.yaml
+++ b/jenkins/gerrit-bazel-plugin-verify-status.yaml
@@ -3,7 +3,6 @@
jobs:
- 'plugin-{name}-bazel-{branch}':
branch:
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-websession-broker.yaml b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
index 9a2dbb1..9a5fe79 100644
--- a/jenkins/gerrit-bazel-plugin-websession-broker.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
@@ -11,4 +11,3 @@
branch:
- stable-3.3
- stable-3.2
- - stable-3.1
diff --git a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
index f0089f0..ffabaf1 100644
--- a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
@@ -9,7 +9,6 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}':
branch:
diff --git a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
index 51e2a7d..d307347 100644
--- a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
+++ b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
@@ -9,7 +9,4 @@
- stable-3.3
- stable-3.2
extra-artifacts: 'bazel-bin/plugins/{name}/{name}-zk-3.5.jar'
- - 'plugin-{name}-bazel-{branch}':
- branch:
- - stable-3.1
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index e481216..8b28a14 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -97,7 +97,6 @@
name: Gerrit-bazel
branch:
- stable-3.2
- - stable-3.1
- stable-2.16
jobs:
- 'Gerrit-bazel-{branch}'
diff --git a/jenkins/gerrit-mvn-build-plugin.sh b/jenkins/gerrit-mvn-build-plugin.sh
index dd37ec4..ace9e1d 100644
--- a/jenkins/gerrit-mvn-build-plugin.sh
+++ b/jenkins/gerrit-mvn-build-plugin.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
case "{branch}" in
- stable-2.16|stable-3.1|stable-3.2)
+ stable-2.16|stable-3.2)
. set-java.sh 8
;;
*)
diff --git a/jenkins/gerrit-mvn-plugin-github.yaml b/jenkins/gerrit-mvn-plugin-github.yaml
index 03a5c82..3d58ff5 100644
--- a/jenkins/gerrit-mvn-plugin-github.yaml
+++ b/jenkins/gerrit-mvn-plugin-github.yaml
@@ -6,7 +6,6 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
jobs:
- 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-plugin-saml.yaml b/jenkins/gerrit-plugin-saml.yaml
index 6caafff..fb5fe64 100644
--- a/jenkins/gerrit-plugin-saml.yaml
+++ b/jenkins/gerrit-plugin-saml.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
diff --git a/jenkins/gerrit-sbt-build-plugin.sh b/jenkins/gerrit-sbt-build-plugin.sh
index a959b37..c65edd0 100644
--- a/jenkins/gerrit-sbt-build-plugin.sh
+++ b/jenkins/gerrit-sbt-build-plugin.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
case "{branch}" in
- stable-2.16|stable-3.1|stable-3.2)
+ stable-2.16|stable-3.2)
. set-java.sh 8
;;
*)
diff --git a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml b/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
index ab91e9e..7b43878 100644
--- a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
@@ -7,5 +7,4 @@
gerrit-branch:
- master
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/jenkins/gerrit-sbt-plugin-analytics.yaml b/jenkins/gerrit-sbt-plugin-analytics.yaml
index b571912..368427b 100644
--- a/jenkins/gerrit-sbt-plugin-analytics.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics.yaml
@@ -7,5 +7,4 @@
- stable-3.4
- stable-3.3
- stable-3.2
- - stable-3.1
- stable-2.16
diff --git a/vars/pluginPipeline.groovy b/vars/pluginPipeline.groovy
index fe46831..c168cc0 100644
--- a/vars/pluginPipeline.groovy
+++ b/vars/pluginPipeline.groovy
@@ -37,7 +37,7 @@
def pluginScmUrl = "https://gerrit.googlesource.com/a/${env.GERRIT_PROJECT}"
def gjfVersion = '1.7'
def javaVersion = 11
- if (env.GERRIT_BRANCH in ["stable-2.16", "stable-3.0", "stable-3.1", "stable-3.2"]) {
+ if (env.GERRIT_BRANCH in ["stable-2.16", "stable-3.2"]) {
javaVersion = 8
}
def bazeliskCmd = "#!/bin/bash\n" + ". set-java.sh ${javaVersion} && bazelisk"
