Remove builds for stable-3.4 branch
Also remove references to stable-3.{3,4} in the
Gerrit pipeline.
Change-Id: I903456f1b0cd46e59e11bd73151a6113fd1a8d17
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
index bedc188..634bd25 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:stable-3.7 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (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:stable-3.7 OR branch:master)",
+ "query": "(not dir:polygerrit-ui) AND (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:stable-3.7 OR branch:master)",
+ "query": "(dir:polygerrit-ui OR file:WORKSPACE) AND (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:stable-3.7 OR branch:master",
+ "query": "branch:stable-3.5 OR branch:stable-3.6 OR branch:stable-3.7 OR branch:master",
"blocking": []
}
diff --git a/jenkins/gerrit-bazel-build.sh b/jenkins/gerrit-bazel-build.sh
index 1e9e980..0bb84f8 100644
--- a/jenkins/gerrit-bazel-build.sh
+++ b/jenkins/gerrit-bazel-build.sh
@@ -7,14 +7,7 @@
export BAZEL_OPTS=""
fi
-case "$TARGET_BRANCH" in
- stable-3.3|stable-3.4)
- . set-java.sh 8
- ;;
- *)
- . set-java.sh 11
- ;;
-esac
+. set-java.sh 11
echo "Build with mode=$MODE"
echo '----------------------------------------------'
diff --git a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml b/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
index e540423..d3b1f25 100644
--- a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
+++ b/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
@@ -6,7 +6,6 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
- '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 dbea86e..4eab6b2 100644
--- a/jenkins/gerrit-bazel-module-cached-refdb.yaml
+++ b/jenkins/gerrit-bazel-module-cached-refdb.yaml
@@ -7,11 +7,6 @@
- stable-3.5
- 'module-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- - stable-3.3
- gerrit-branch:
- - stable-3.4
- - 'module-{name}-bazel-{branch}-{gerrit-branch}':
- branch:
- master
gerrit-branch:
- stable-3.7
diff --git a/jenkins/gerrit-bazel-module-events-broker.yaml b/jenkins/gerrit-bazel-module-events-broker.yaml
index 8a4065a..390cdfb 100644
--- a/jenkins/gerrit-bazel-module-events-broker.yaml
+++ b/jenkins/gerrit-bazel-module-events-broker.yaml
@@ -4,7 +4,6 @@
- 'module-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
- 'module-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-module-git-refs-filter.yaml b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
index 2cef146..2bac589 100644
--- a/jenkins/gerrit-bazel-module-git-refs-filter.yaml
+++ b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
@@ -10,4 +10,3 @@
- 'module-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
index d3b3b67..99cb51a 100644
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ b/jenkins/gerrit-bazel-plugin-account.yaml
@@ -46,4 +46,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-admin-console.yaml b/jenkins/gerrit-bazel-plugin-admin-console.yaml
index 4360c2c..27008b3 100644
--- a/jenkins/gerrit-bazel-plugin-admin-console.yaml
+++ b/jenkins/gerrit-bazel-plugin-admin-console.yaml
@@ -8,7 +8,6 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
- '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 869791c..ae4a3a0 100644
--- a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
+++ b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
@@ -11,4 +11,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-automerger.yaml b/jenkins/gerrit-bazel-plugin-automerger.yaml
index 0937032..de20f0c 100644
--- a/jenkins/gerrit-bazel-plugin-automerger.yaml
+++ b/jenkins/gerrit-bazel-plugin-automerger.yaml
@@ -12,4 +12,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
index b62b772..6f1007b 100644
--- a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
+++ b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
index 2715aa7..394ce1a 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-external.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
index 9fe06a4..05f8335 100644
--- a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
+++ b/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
@@ -8,7 +8,6 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
- '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 d16a378..edebd52 100644
--- a/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml
+++ b/jenkins/gerrit-bazel-plugin-aws-dynamodb-refdb.yaml
@@ -11,5 +11,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-branch-network.yaml b/jenkins/gerrit-bazel-plugin-branch-network.yaml
index 96c2737..925e415 100644
--- a/jenkins/gerrit-bazel-plugin-branch-network.yaml
+++ b/jenkins/gerrit-bazel-plugin-branch-network.yaml
@@ -8,7 +8,6 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-checks.yaml b/jenkins/gerrit-bazel-plugin-checks.yaml
index 1cb7b94..4367e9a 100644
--- a/jenkins/gerrit-bazel-plugin-checks.yaml
+++ b/jenkins/gerrit-bazel-plugin-checks.yaml
@@ -7,4 +7,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-code-owners.yaml b/jenkins/gerrit-bazel-plugin-code-owners.yaml
index 9389a38..c231eaa 100644
--- a/jenkins/gerrit-bazel-plugin-code-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-code-owners.yaml
@@ -11,4 +11,3 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml b/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
index 64a0c84..f9582d9 100644
--- a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
@@ -10,5 +10,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml b/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
index cc9d9d0..7428cb0 100644
--- a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
@@ -10,5 +10,4 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-kafka.yaml b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
index 80c3810..d7effc0 100644
--- a/jenkins/gerrit-bazel-plugin-events-kafka.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
@@ -11,5 +11,4 @@
branch:
- master
- stable-3.5
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-log.yaml b/jenkins/gerrit-bazel-plugin-events-log.yaml
index d8e02b7..cf21a98 100644
--- a/jenkins/gerrit-bazel-plugin-events-log.yaml
+++ b/jenkins/gerrit-bazel-plugin-events-log.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-find-owners.yaml b/jenkins/gerrit-bazel-plugin-find-owners.yaml
index 3c851bc..1f44564 100644
--- a/jenkins/gerrit-bazel-plugin-find-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-find-owners.yaml
@@ -8,7 +8,6 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
- '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 cdd4f4d..ffa2ea1 100644
--- a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
+++ b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml b/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
index 1409272..dd00b82 100644
--- a/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
+++ b/jenkins/gerrit-bazel-plugin-git-repo-metrics.yaml
@@ -8,4 +8,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-go-import.yaml b/jenkins/gerrit-bazel-plugin-go-import.yaml
index ed59085..1284da9 100644
--- a/jenkins/gerrit-bazel-plugin-go-import.yaml
+++ b/jenkins/gerrit-bazel-plugin-go-import.yaml
@@ -11,4 +11,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
index 3cbdf99..64c2d9b 100644
--- a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
+++ b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
@@ -5,7 +5,6 @@
branch:
- master
- stable-3.5
- - stable-3.4
- 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-healthcheck.yaml b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
index 6bf0f7e..847f255 100644
--- a/jenkins/gerrit-bazel-plugin-healthcheck.yaml
+++ b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-heartbeat.yaml b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
index d392be5..a0e222b 100644
--- a/jenkins/gerrit-bazel-plugin-heartbeat.yaml
+++ b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-high-availability.yaml b/jenkins/gerrit-bazel-plugin-high-availability.yaml
index caa7e56..ab35205 100644
--- a/jenkins/gerrit-bazel-plugin-high-availability.yaml
+++ b/jenkins/gerrit-bazel-plugin-high-availability.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-its-base.yaml b/jenkins/gerrit-bazel-plugin-its-base.yaml
index 3e0dcd4..31c2535 100644
--- a/jenkins/gerrit-bazel-plugin-its-base.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-base.yaml
@@ -12,5 +12,4 @@
branch:
- master
- stable-3.5
- - stable-3.4
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 f6b4a19..83a7fa0 100644
--- a/jenkins/gerrit-bazel-plugin-its-jira.yaml
+++ b/jenkins/gerrit-bazel-plugin-its-jira.yaml
@@ -12,5 +12,4 @@
branch:
- master
- stable-3.5
- - stable-3.4
targets: 'plugins/its-jira:its-jira plugins/its-jira:its_jira_tests'
diff --git a/jenkins/gerrit-bazel-plugin-javamelody.yaml b/jenkins/gerrit-bazel-plugin-javamelody.yaml
index 9a96d04..a394499 100644
--- a/jenkins/gerrit-bazel-plugin-javamelody.yaml
+++ b/jenkins/gerrit-bazel-plugin-javamelody.yaml
@@ -37,4 +37,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-kafka-events.yaml b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
index 77c4afe..9f0236e 100644
--- a/jenkins/gerrit-bazel-plugin-kafka-events.yaml
+++ b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
@@ -7,5 +7,4 @@
- master
gerrit-branch:
- master
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-lfs.yaml b/jenkins/gerrit-bazel-plugin-lfs.yaml
index 5ae6ff0..63d6b30 100644
--- a/jenkins/gerrit-bazel-plugin-lfs.yaml
+++ b/jenkins/gerrit-bazel-plugin-lfs.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-login-redirect.yaml b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
index 1d9bdca..d9a4628 100644
--- a/jenkins/gerrit-bazel-plugin-login-redirect.yaml
+++ b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-menuextender.yaml b/jenkins/gerrit-bazel-plugin-menuextender.yaml
index 13b0872..1137355 100644
--- a/jenkins/gerrit-bazel-plugin-menuextender.yaml
+++ b/jenkins/gerrit-bazel-plugin-menuextender.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
index 0bee37b..d6ecc80 100644
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
+++ b/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
@@ -8,4 +8,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
index 46df30f..afadd52 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.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-multi-site.yaml b/jenkins/gerrit-bazel-plugin-multi-site.yaml
index b163588..77f58cd 100644
--- a/jenkins/gerrit-bazel-plugin-multi-site.yaml
+++ b/jenkins/gerrit-bazel-plugin-multi-site.yaml
@@ -11,5 +11,4 @@
branch:
- master
- stable-3.5
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-oauth.yaml b/jenkins/gerrit-bazel-plugin-oauth.yaml
index 2fa2b9e..8d588c9 100644
--- a/jenkins/gerrit-bazel-plugin-oauth.yaml
+++ b/jenkins/gerrit-bazel-plugin-oauth.yaml
@@ -1,9 +1,6 @@
- project:
name: oauth
jobs:
- - 'plugin-{name}-bazel-{branch}':
- branch:
- - stable-3.4
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
index 26b4c50..3627494 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.7
- stable-3.6
- stable-3.5
- - stable-3.4
- 'plugin-{name}-bazel-{branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
index e91d42f..6bf215b 100644
--- a/jenkins/gerrit-bazel-plugin-owners.yaml
+++ b/jenkins/gerrit-bazel-plugin-owners.yaml
@@ -75,4 +75,3 @@
targets: 'plugins/owners plugins/owners-a*'
branch:
- master
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
index 3acea11..135768f 100644
--- a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
+++ b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
@@ -8,4 +8,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-pull-replication.yaml b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
index 3c54b12..e4a290c 100644
--- a/jenkins/gerrit-bazel-plugin-pull-replication.yaml
+++ b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
- '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 b87b46a..5edabda 100644
--- a/jenkins/gerrit-bazel-plugin-quota.yaml
+++ b/jenkins/gerrit-bazel-plugin-quota.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
index d91fcce..cf5293c 100644
--- a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
+++ b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
@@ -5,7 +5,6 @@
branch:
- master
- stable-3.5
- - stable-3.4
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
branch:
- master
diff --git a/jenkins/gerrit-bazel-plugin-readonly.yaml b/jenkins/gerrit-bazel-plugin-readonly.yaml
index e5bdbc4..7b05b06 100644
--- a/jenkins/gerrit-bazel-plugin-readonly.yaml
+++ b/jenkins/gerrit-bazel-plugin-readonly.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-ref-copy.yaml b/jenkins/gerrit-bazel-plugin-ref-copy.yaml
index 2856141..d511649 100644
--- a/jenkins/gerrit-bazel-plugin-ref-copy.yaml
+++ b/jenkins/gerrit-bazel-plugin-ref-copy.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
index dd862ed..55174cc 100644
--- a/jenkins/gerrit-bazel-plugin-ref-protection.yaml
+++ b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
index 3b9191c..7eee66f 100644
--- a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
+++ b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-rename-project.yaml b/jenkins/gerrit-bazel-plugin-rename-project.yaml
index fe4b6c2..81ff09c 100644
--- a/jenkins/gerrit-bazel-plugin-rename-project.yaml
+++ b/jenkins/gerrit-bazel-plugin-rename-project.yaml
@@ -8,4 +8,3 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-replication-status.yaml b/jenkins/gerrit-bazel-plugin-replication-status.yaml
index 2b4772f..1156666 100644
--- a/jenkins/gerrit-bazel-plugin-replication-status.yaml
+++ b/jenkins/gerrit-bazel-plugin-replication-status.yaml
@@ -8,7 +8,4 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - 'plugin-{name}-bazel-{branch}':
- branch:
- - stable-3.4
- 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
index 276b7bf..ee7de12 100644
--- a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
@@ -7,4 +7,3 @@
gerrit-branch:
- master
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
index c7f81cd..aee73c1 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
@@ -11,4 +11,3 @@
- "plugin-{name}-bazel-{branch}":
branch:
- master
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-reviewers.yaml b/jenkins/gerrit-bazel-plugin-reviewers.yaml
index 86b9592..9c67983 100644
--- a/jenkins/gerrit-bazel-plugin-reviewers.yaml
+++ b/jenkins/gerrit-bazel-plugin-reviewers.yaml
@@ -5,7 +5,6 @@
branch:
- master
- stable-3.5
- - stable-3.4
- '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 0fc18ea..45ef184 100644
--- a/jenkins/gerrit-bazel-plugin-serviceuser.yaml
+++ b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
@@ -11,4 +11,3 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
index 80b3910..64522d4 100644
--- a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
+++ b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
@@ -10,4 +10,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-slack-integration.yaml b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
index d8dafa5..40bf5f9 100644
--- a/jenkins/gerrit-bazel-plugin-slack-integration.yaml
+++ b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
@@ -11,4 +11,3 @@
branch:
- master
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-task.yaml b/jenkins/gerrit-bazel-plugin-task.yaml
index c86b25e..6679b09 100644
--- a/jenkins/gerrit-bazel-plugin-task.yaml
+++ b/jenkins/gerrit-bazel-plugin-task.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 02f45db..6b49d85 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -286,4 +286,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
index 6afa381..25be5b2 100644
--- a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
+++ b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
@@ -5,7 +5,6 @@
branch:
- master
- stable-3.5
- - stable-3.4
- '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 61e1cdb..846165f 100644
--- a/jenkins/gerrit-bazel-plugin-verify-status.yaml
+++ b/jenkins/gerrit-bazel-plugin-verify-status.yaml
@@ -8,7 +8,6 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
- '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 922a45b..9551206 100644
--- a/jenkins/gerrit-bazel-plugin-websession-broker.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
@@ -11,4 +11,3 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
index 221ba39..9528ec5 100644
--- a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
+++ b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
index c713db2..e6e7737 100644
--- a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
+++ b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
@@ -7,7 +7,6 @@
- master
- stable-3.6
- stable-3.5
- - stable-3.4
extra-artifacts: 'bazel-bin/plugins/{name}/{name}-zk-3.5.jar'
- 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
targets: "plugins/{name}:{name} plugins/{name}:{name}-zk-3.5"
diff --git a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml b/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
index 3cd33f0..cf303a8 100644
--- a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
+++ b/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
@@ -9,4 +9,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
index 4b3cce1..8eddf26 100644
--- a/jenkins/gerrit-bazel-template.yaml
+++ b/jenkins/gerrit-bazel-template.yaml
@@ -63,14 +63,6 @@
--host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
- project:
- name: Gerrit-bazel-chrome-69
- branch:
- - stable-3.4
- browser: chrome-69
- jobs:
- - 'Gerrit-bazel-{branch}'
-
-- project:
name: Gerrit-bazel-chrome-latest
branch:
- master
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
index c7daf31..a76f1ca 100755
--- a/jenkins/gerrit-bazel-test.sh
+++ b/jenkins/gerrit-bazel-test.sh
@@ -7,14 +7,7 @@
export BAZEL_OPTS=""
fi
-case "$TARGET_BRANCH" in
- stable-3.3|stable-3.4)
- . set-java.sh 8
- ;;
- *)
- . set-java.sh 11
- ;;
-esac
+. set-java.sh 11
export BAZEL_OPTS="$BAZEL_OPTS \
--flaky_test_attempts 3 \
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
index bfa1ca8..c920e2f 100755
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -1,13 +1,6 @@
#!/bin/bash -ex
-case "$TARGET_BRANCH" in
- stable-3.3|stable-3.4)
- . set-java.sh 8
- ;;
- *)
- . set-java.sh 11
- ;;
-esac
+. set-java.sh 11
cd gerrit
@@ -15,11 +8,11 @@
echo '----------------------------------------------'
case $TARGET_BRANCH$MODE in
- masterrbe|stable-3.4rbe|stable-3.5rbe|stable-3.6rbe|stable-3.7rbe)
+ masterrbe|stable-3.5rbe|stable-3.6rbe|stable-3.7rbe)
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.4notedb|stable-3.5notedb|stable-3.6notedb|stable-3.7notedb)
+ masternotedb|stable-3.5notedb|stable-3.6notedb|stable-3.7notedb)
TEST_TAG_FILTER="-flaky,elastic,no_rbe"
;;
stable-2.*)
diff --git a/jenkins/gerrit-codestyle-polygerrit-lint.sh b/jenkins/gerrit-codestyle-polygerrit-lint.sh
index 88685ec..5fe10c0 100644
--- a/jenkins/gerrit-codestyle-polygerrit-lint.sh
+++ b/jenkins/gerrit-codestyle-polygerrit-lint.sh
@@ -5,14 +5,7 @@
export BAZEL_OPTS=""
fi
-case "{branch}" in
- stable-3.3|stable-3.4)
- . set-java.sh 8
- ;;
- *)
- . set-java.sh 11
- ;;
-esac
+. set-java.sh 11
cd gerrit
bazelisk version
diff --git a/jenkins/gerrit-mvn-plugin-github.yaml b/jenkins/gerrit-mvn-plugin-github.yaml
index 7013387..31a7ba6 100644
--- a/jenkins/gerrit-mvn-plugin-github.yaml
+++ b/jenkins/gerrit-mvn-plugin-github.yaml
@@ -6,6 +6,5 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
jobs:
- 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-plugin-saml.yaml b/jenkins/gerrit-plugin-saml.yaml
index f18c5d0..298716d 100644
--- a/jenkins/gerrit-plugin-saml.yaml
+++ b/jenkins/gerrit-plugin-saml.yaml
@@ -4,7 +4,6 @@
- 'plugin-{name}-bazel-{branch}':
branch:
- master
- - stable-3.4
- '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 e23a62e..82b412e 100644
--- a/jenkins/gerrit-sbt-plugin-analytics.yaml
+++ b/jenkins/gerrit-sbt-plugin-analytics.yaml
@@ -7,4 +7,3 @@
- stable-3.7
- stable-3.6
- stable-3.5
- - stable-3.4
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index fb64358..9511830 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -130,10 +130,8 @@
def collectBuildModes() {
Builds.modes = []
- if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[4-7]/) {
+ if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH ==~ /stable-3.[5-7]/) {
Builds.modes = ["notedb", "rbe"]
- } else if (env.GERRIT_BRANCH == "stable-3.3") {
- Builds.modes = ["notedb"]
} else {
throw new Exception("Unsupported branch ${env.GERRIT_BRANCH}")
}
