Merge branch 'master' into private

* master:
  Add docker-compose to the slave-bazel-docker image
  Fix task plugin branch configuration
  Print chrome version used for PolyGerrit tests to build logs
  Build owners plugin on stable-3.4
  Add stable-3.{3,4} rate-limiter master tree builds
  Add stable-3.{3,4} heartbeat master tree builds
  Add stable-3.{3,4} gc-conductor master tree builds
  Remove obsolete gerrit branch go-import build lines
  Build go-import plugin on stable-3.4 branch
  Build/test owners on Java 11 for stable-3.3 onwards
  Run tests for the owners' plugin builds
  Allow to build all owners-a* artifacts
  Build go-import plugin on stable-3.3 branch
  Remove builds on stable-3.1 branch
  Gatling tests: set Gerrit to 3.4.0-rc5
  Build events-rabbitmq plugin on master
  Set Gerrit to v3.4.0-rc4
  Simplify the execution of the release container
  Pass or fail gatling-gerrit-test based on gatling results
  Build project-group-structure plugin on stable-3.3 && stable-3.4 branch
  Remove unused manual plugin build template
  Export logs to S3 when running gatling-gerrit-test
  Test Gerrit v3.4.0-rc3 with Gatling
  Build multi-site on its own stable-3.4 branch
  Build zookeeper-refdb on its own stable-3.4 branch
  Build events-kafka on its own stable-3.4 branch
  Install python3-distutils package
  Build events-aws-kinesis master against gerrit-3.4
  Build events-gcloud-pubsub master against gerrit-3.4
  Avoid looking for plugin's artifacts in subdirectories
  Enable events-kafka build on 3.1, 3.2, 3.3
  Verify the events-gcloud-pubsub plugin changes on stable-3.3
  Verify the events-aws-kinesis plugin changes on stable-3.3
  Remove redundant repo variable in events-aws-kinesis
  Build events-kafka plugin on stable-2.16/3.0
  Move gcloud-pubsub-events job to events-gcloud-pubsub
  Move kinesis-events job to events-aws-kinesis
  Build events-broker on its own stable-3.4 branch
  Pass GERRIT_WAR_URL to override the version under test
  Build account plugin on stable-3.4 branch
  Build analytics plugin on stable-3.4 branch
  Gatling tests: bump Gerrit to v3.4.0-rc1
  Build owners plugin on stable-3.4 branch
  Build find-owners plugin on stable-3.4 branch
  Build github plugin on stable-3.4 branch
  Build its-base plugin on stable-3.4 branch
  Build its-jira plugin on stable-3.4 branch
  Build kafka-events plugin on stable-3.4 branch
  Build menuextender plugin on stable-3.4 branch
  Build simple-submit-rules plugin on stable-3.4 branch
  Build verify-status plugin on stable-3.4 branch
  Build metrics-reporter-prometheus plugin on stable-3.4 branch
  Build oauth plugin on stable-3.4 branch
  Build reject-private-submit plugin on stable-3.4 branch
  Build rename-project plugin on stable-3.4 branch
  Build reviewassistant plugin on stable-3.4 branch
  Build groovy-provider plugin on stable-3.4 branch
  Build slack-integration plugin on stable-3.4 branch
  Build websession-broker plugin on stable-3.4 branch
  Build websession-flatfile plugin on stable-3.4 branch
  Build zookeeper-refdb plugin on stable-3.4 branch
  Build zuul-results-summary plugin on stable-3.4 branch
  Build serviceuser plugin on stable-3.4 branch
  Build ref-protection plugin on stable-3.4 branch
  Build login-redirect plugin on stable-3.4 branch
  Build events-log plugin on stable-3.4 branch
  Build quota plugin on stable-3.4 branch
  Build lfs plugin on stable-3.4 branch
  Build audit-sl4j plugin on stable-3.4 branch
  Build code-owners plugin on stable-3.4 branch
  Build branch-network plugin on stable-3.4 branch
  Build pull-replication plugin on stable-3.4 branch
  Build avatars-external plugin on stable-3.4 branch
  Build autosubmitter plugin on stable-3.4 branch
  Build automerger plugin on stable-3.4 branch
  Build admin-console plugin on stable-3.4 branch
  Build module events-broker on stable-3.4 branch
  Build module cache-chroniclemap on stable-3.4 branch
  Build reviewers-by-blame plugin on stable-3.4 branch
  Build readonly plugin on stable-3.4 branch
  Build multi-site plugin on stable-3.4 branch
  Build high-availability plugin on stable-3.4 branch
  Build reviewers plugin on stable-3.4 branch
  Build checks plugin on stable-3.4 branch
  Build saml plugin on stable-3.4 branch
  zuul-results-summary plugin is jar plugin now
  Build saml plugin on own 3.2 and 3.3 branches
  Build metrics-reporter-cloudwatch plugin on stable-3.4
  Build healthcheck plugin on stable-3.4
  Build javamelody plugin on stable-3.4
  Gatling tests: bump Gerrit to v3.4.0-rc0
  Rename gatling test pipeline using kebab-case
  Build Gerrit and validate changes on stable-3.4
  Build out-of-the-box plugin on stable-3.4
  Build avatars-gravatar plugin on stable-3.4
  Build uploadvalidator plugin on stable-3.4
  Introduce Plugins-stable-3.4 view on Gerrit-CI
  Build ref-prottection plugn in 3.3
  Build kinesis plugin master against Gerrit stable-3.3
  Add gcloud-pubsub-events plugin build
  Add kinesis-events plugin build
  Bump Gerrit/Gatling tests to v3.3.2
  Revert "Move execution of gatling test to 17:15 UTC"
  Fully qualify parameters and environment variables
  Move execution of gatling test to 17:15 UTC
  Build Owner plugin on stable 3.3
  Default git http username and password to empty strings
  Make gatling-gerrit-test job more resilient
  Gatling Gerrit: Generate unique target URL
  Adapt to aws-gerrit primary/replica renaming
  Build go-import plugin on own 3.2 branch
  Build javamelody plugin on own 3.2 branch
  Quote and qualify parameters explicitly
  Build automerger plugin on recent branches
  Adapt checker query
  Allow publishing to different Docker registries
  Mention that Java 8 will have to stay until v3.4 is EOL
  Fix slave-debian Dockerfile setup of OpenJDK 8
  web-component-tester: Install babel runtime dependency
  Fix Jenkins master image
  Remove broken --test_verbose_timeout_warnings option
  Remove explicit --build_tests_only option
  Remove explicit --test_output errors option
  Remove --test_summary=detailed option
  Test only Git protocol v2 and Elastic outside RBE
  Revert "Revert "Bazel: Activate RBE configuration on GCP""
  Default params for gatling against single-master gerrit
  Revert "Bazel: Activate RBE configuration on GCP"
  Revert "Revert "Bazel: Activate RBE configuration on GCP""
  Don't build bazelisk and buildifier from source
  Build server-config plugin for stable-3.1
  Do not import Google's DNS hosts on Docker images
  Bump buildifier version to 4.0.0
  Bump bazel version to 4.0.0
  Build reject-private-submit plugin against 3.0-3.3
  Build zuul-results-summary plugin on stable-3.3
  Cross-build Gerrit UI plugins
  Build events-broker module on recent branches
  Build find-owners plugin against its own 3.2 branch
  Build its-base plugin against 3.3
  Build its-jira plugin against 3.3
  Fix jenkins docker image name
  Build lfs plugin against 3.3
  Build egit against gerrit 3.3
  Build menuextender against gerrit 3.3
  Build events-log against gerrit 3.3
  Build readonly plugin against gerrit 3.3
  Build reviewassistant plugin against gerrit 3.3
  Build avatars-external against gerrit 3.3
  Build login-redirect against gerrit 3.3
  Build admin-console against gerrit 3.3
  Fix bazelisk build on Docker build image
  Build autosubmitter plugin on stable-3.3 branch
  Build metrics-reporter-elasticsearch plugin
  Update Docker debian variant for Jenkins master
  Build serviceuser plugin on stable-3.3
  Build reviewassistant on 3.2 branch
  Revert "Bazel: Activate RBE configuration on GCP"
  Revert "Revert "Bazel: Activate RBE configuration on GCP""
  Revert "Bazel: Activate RBE configuration on GCP"
  Bazel: Activate RBE configuration on GCP
  Build events-broker module
  Remove builds on stable-3.0
  Remove obsolete Bazel spawn strategies from plugin branch build
  Build autosubmitter plugin on stable-3.2
  Multiple targets build for zookeeper-refdb plugin
  Fix branch detection for Java 8/11 to build plugins
  Build websession-flatfile on stable-3.3
  Build quota plugin on stable-3.2 and stable-3.3
  Build oauth plugin on stable-3.2
  Build saml plugin on recent branches
  Remove obsolete Bazel spawn strategies
  Remove '[' in the execution of git diff for .bazelversion
  Build code-owners plugin on stable-3.3
  Build simple-submit-rules plugin on stable-3.2 and stable-3.3
  Build reviewassistant on 3.0 and 3.1 branch
  Build verify-status plugin on stable-3.1
  Build simple-submit-rules plugin on stable-3.1
  Remove obsolete Bazel spawn strategies
  Build rename-project plugin on stable-3.3
  Build zookeeper-refdb plugin on stable-3.3
  Verify kafka-events plugin
  Build out-of-the-box plugin on stable-3.3
  Build kafka-events plugin on stable-3.3
  Build reviewers plugin on stable-3.3
  Build account plugin on stable-3.3
  Build analytics plugin on stable-3.3
  Extend maximum build time to 2h
  Build code-owners plugin on stable-3.3
  Build uploadvalidator plugin on stable-3.3
  Build websession-broker plugin on stable-3.3
  Build slack-integration plugin on stable-3.3
  Build pull-replication plugin on stable-3.3
  Build multi-site plugin on stable-3.3
  Build groovy-provider on stable-3.3
  Build reviewers-by-blame plugin on stable-3.3
  Build oauth plugin on stable-3.3
  Build find-owners plugin on stable-3.2 and stable-3.3
  Build audit-sl4j on stable-3.3
  Build github plugin on stable-3.3
  Set the correct JDK version for Maven plugins
  Build batch plugin on its stable-3.3 branch
  Build checks plugin on stable-3.3
  Build high-availability plugin on stable-3.3
  Build branch-network plugin on stable-3.3
  Build avatars-gravatar plugin on stable-3.3
  Build autosubmitter plugin on stable-3.3
  Revert "Disable elasticsearch tests in Gerrit-CI builds"
  Build metrics-reporter-cloudwatch against stable-3.3
  Build healthcheck stable-3.3 branch
  Build javamelody master branch against stable-3.3
  Fixed typo for GERRIT_VOLUME_SNAPSHOT_ID
  Expose gerrit version and gerrit patch parameters
  Make DOCKER_HOST env variable available to all steps
  Adopt gatling-gerrit-test job to the gerrit-ci environment

Change-Id: I3978d1b8a66daf7d2518b628846b74d572a64b9d
diff --git a/jenkins-docker/Makefile b/jenkins-docker/Makefile
index 2430dbd..413e638 100644
--- a/jenkins-docker/Makefile
+++ b/jenkins-docker/Makefile
@@ -2,6 +2,14 @@
 ALL_DIRS ?= master bazel-cache $(SLAVE_DIRS)
 NO_CACHE ?= true
 
+USE_SECURITY ?= true
+JENKINS_HOME ?= ~/jenkins_home
+NGINX_CERTS ?= ~/.ssl
+
+OPTS = USE_SECURITY=${USE_SECURITY} \
+       JENKINS_HOME=${JENKINS_HOME} \
+       NGINX_CERTS=${NGINX_CERTS}
+
 default: build
 
 build clean publish:
@@ -10,6 +18,18 @@
 publish_slave:
 	for dir in $(SLAVE_DIRS); do (make NO_CACHE=$(NO_CACHE) -C $$dir build publish) || exit 1; done
 
-start stop restart:
-	make -C master $@
+ssl_certs:
+	if [ ! -f ${NGINX_CERTS}/cert.key ] || [ ! -f ${NGINX_CERTS}/cert.key ]; then \
+		openssl req -x509 \
+			-newkey rsa:4096 \
+			-keyout ${NGINX_CERTS}/cert.key \
+			-out ${NGINX_CERTS}/cert.crt \
+			-nodes \
+			-subj '/CN=gerrit-ci.gerritforge.com'; \
+	fi
 
+start: ssl_certs
+	$(OPTS) docker-compose up -d
+
+stop:
+	$(OPTS) docker-compose down
diff --git a/jenkins-docker/README.md b/jenkins-docker/README.md
index 1517d7d..ec8f7f5 100644
--- a/jenkins-docker/README.md
+++ b/jenkins-docker/README.md
@@ -33,7 +33,54 @@
 
 make build
 
-## Images
+## Starting Jenkins
+
+To start Jenkins and the reverse proxy regulating ingress traffic, follow the
+following steps:
+
+### (Optional) Provide SSL certificates to enable HTTPS
+
+The reverse proxy will serve traffic via HTTPS. To do this it requires a
+certificate and key. For browsers to trust these certificates, certificates
+from trusted authorities (e.g. digicert) can be used. To do this, put both the
+certificate and the key into the same folder and name them `cert.crt` and
+`cert.key` respectively.
+
+If no certificates are provided, the Nginx-container will create self-signed
+certificates.
+
+### (Optional) Provide a CA-certificate for authentication
+
+For authentication of users a CA-certificate will be needed, since certificate-
+based authentication will be used. Put the CA-certificate into the same directory
+as the SSL certificates and call it `auth_ca.crt`.
+
+To allow a user to access Jenkins get a certificate for this user with this CA.
+The username should be set in the CN-field of the CSR's-subject. The username then
+also has to be set in the `config.xml` of Jenkins to configure permissions.
+
+If no CA will be provided, certificate-based authentication will be disabled. All
+users will be anonymous.
+
+### Start up Nginx and Jenkins
+
+In the directory of this README run:
+
+```sh
+make \
+  USE_SECURITY=true \
+  JENKINS_API_USER=user \
+  JENKINS_API_PASSWORD=pass \
+  JENKINS_HOME=~/jenkins_home \
+  NGINX_CERTS=~/.ssl \
+  start
+```
+
+If no CA for authentication was provide use `USE_SECURITY=false`, otherwise only
+read-access will be available. The `NGINX_CERTS`-variable should point to the
+directory containing the SSL-certificates and authentication-CA.
+
+## Slave images
 
 Images available are:
 
diff --git a/jenkins-docker/docker-compose.yml b/jenkins-docker/docker-compose.yml
new file mode 100644
index 0000000..44ce10b
--- /dev/null
+++ b/jenkins-docker/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '3.2'
+
+services:
+  jenkins:
+    image: gerritforge/gerrit-ci:2.204.1
+    container_name: gerrit-ci-master
+    restart: on-failure
+    command: ["--httpPort=38080"]
+    volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - ${JENKINS_HOME}/jobs:/var/jenkins_home/jobs
+    - ${JENKINS_HOME}/.netrc:/var/jenkins_home/.netrc
+    environment:
+    - USE_SECURITY=${USE_SECURITY}
+  nginx:
+    image: gerritforge/gerrit-ci-nginx-proxy
+    container_name: nginx-proxy
+    restart: on-failure
+    ports:
+    - 80:80
+    - 443:443
+    volumes:
+    - ${NGINX_CERTS}:/etc/ssl/certs/
+    depends_on:
+    - jenkins
diff --git a/jenkins-docker/master/Makefile b/jenkins-docker/master/Makefile
index 0498bb2..b7157d3 100644
--- a/jenkins-docker/master/Makefile
+++ b/jenkins-docker/master/Makefile
@@ -8,9 +8,9 @@
 JENKINS_API_PASSWORD=pass
 JENKINS_WAR_VER=2.204.1
 JENKINS_WAR_SHA=924d2c9fabfdcacee1bae757337a07d7599eaa35
-JENKINS_HOME?=~/jenkins_home
+JENKINS_HOME?=~/jenkins_home_private
 DOCKER_GID?=993
-IMAGE=${ORGANISATION}/${NAME}:${JENKINS_WAR_VER}
+IMAGE=${ORGANISATION}/${NAME}:${JENKINS_WAR_VER}-private
 
 # Targets
 
diff --git a/jenkins-docker/master/config.sh b/jenkins-docker/master/config.sh
index 3d1f9e0..5755a81 100755
--- a/jenkins-docker/master/config.sh
+++ b/jenkins-docker/master/config.sh
@@ -16,8 +16,6 @@
 xsltproc \
   --stringparam use-security $USE_SECURITY \
   --stringparam docker-url $DOCKER_HOST \
-  --stringparam oauth-client-id $OAUTH_ID \
-  --stringparam oauth-client-secret $OAUTH_SECRET \
   $JENKINS_REF/edit-config.xslt $CONFIG > /tmp/config.xml.new
 mv /tmp/config.xml.new $CONFIG
 
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/master/config.xml
index 4162268..51ebc7a 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/master/config.xml
@@ -15,12 +15,28 @@
     <permission>hudson.model.Hudson.Read:anonymous</permission>
     <permission>hudson.model.Item.Read:anonymous</permission>
     <permission>hudson.model.View.Read:anonymous</permission>
+    <permission>hudson.model.Hudson.Read:JJB</permission>
+    <permission>hudson.model.Item.Configure:JJB</permission>
+    <permission>hudson.model.Item.Create:JJB</permission>
+    <permission>hudson.model.Item.Delete:JJB</permission>
+    <permission>hudson.model.Item.Read:JJB</permission>
+    <permission>hudson.model.View.Configure:JJB</permission>
+    <permission>hudson.model.View.Create:JJB</permission>
+    <permission>hudson.model.View.Delete:JJB</permission>
+    <permission>hudson.model.View.Read:JJB</permission>
   </authorizationStrategy>
-  <securityRealm class="org.jenkinsci.plugins.GithubSecurityRealm">
-    <githubWebUri>https://github.com</githubWebUri>
-    <githubApiUri>https://api.github.com</githubApiUri>
-    <clientID>#OAUTH_ID#</clientID>
-    <clientSecret>#OAUTH_SECRET#</clientSecret>
+  <securityRealm class="org.jenkinsci.plugins.reverse_proxy_auth.ReverseProxySecurityRealm" plugin="reverse-proxy-auth-plugin@1.6.3">
+    <proxyTemplate/>
+    <inhibitInferRootDN>false</inhibitInferRootDN>
+    <userSearchBase></userSearchBase>
+    <userSearch>uid={0}</userSearch>
+    <updateInterval>15</updateInterval>
+    <forwardedUser>X-Forwarded-User</forwardedUser>
+    <headerGroups>X-Forwarded-Groups</headerGroups>
+    <headerGroupsDelimiter>|</headerGroupsDelimiter>
+    <disableLdapEmailResolver>false</disableLdapEmailResolver>
+    <displayNameLdapAttribute></displayNameLdapAttribute>
+    <emailAddressLdapAttribute></emailAddressLdapAttribute>
   </securityRealm>
   <disableRememberMe>false</disableRememberMe>
   <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
@@ -82,15 +98,9 @@
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
           <labelString>bazel-debian</labelString>
-          <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
-            <sshConnector plugin="ssh-slaves@1.11">
-              <port>22</port>
-              <jvmOptions></jvmOptions>
-              <javaPath></javaPath>
-              <maxNumRetries>0</maxNumRetries>
-              <retryWaitTime>0</retryWaitTime>
-            </sshConnector>
-          </launcher>
+          <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+            <user>jenkins</user>
+          </connector>
           <remoteFsMapping></remoteFsMapping>
           <remoteFs>/home/jenkins</remoteFs>
           <instanceCap>5</instanceCap>
@@ -125,15 +135,9 @@
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
           <labelString>mvn</labelString>
-          <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
-            <sshConnector plugin="ssh-slaves@1.11">
-              <port>22</port>
-              <jvmOptions></jvmOptions>
-              <javaPath></javaPath>
-              <maxNumRetries>0</maxNumRetries>
-              <retryWaitTime>0</retryWaitTime>
-            </sshConnector>
-          </launcher>
+          <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+            <user>jenkins</user>
+          </connector>
           <remoteFsMapping></remoteFsMapping>
           <remoteFs>/home/jenkins</remoteFs>
           <instanceCap>5</instanceCap>
@@ -169,15 +173,9 @@
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
           <labelString>sbt</labelString>
-          <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
-            <sshConnector plugin="ssh-slaves@1.11">
-              <port>22</port>
-              <jvmOptions></jvmOptions>
-              <javaPath></javaPath>
-              <maxNumRetries>0</maxNumRetries>
-              <retryWaitTime>0</retryWaitTime>
-            </sshConnector>
-          </launcher>
+          <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+            <user>jenkins</user>
+          </connector>
           <remoteFsMapping></remoteFsMapping>
           <remoteFs>/home/jenkins</remoteFs>
           <instanceCap>5</instanceCap>
@@ -213,15 +211,9 @@
         <com.nirima.jenkins.plugins.docker.DockerTemplate>
           <configVersion>2</configVersion>
           <labelString>python3</labelString>
-          <launcher class="com.nirima.jenkins.plugins.docker.launcher.DockerComputerSSHLauncher">
-            <sshConnector plugin="ssh-slaves@1.11">
-              <port>22</port>
-              <jvmOptions></jvmOptions>
-              <javaPath></javaPath>
-              <maxNumRetries>0</maxNumRetries>
-              <retryWaitTime>0</retryWaitTime>
-            </sshConnector>
-          </launcher>
+          <connector class="io.jenkins.docker.connector.DockerComputerAttachConnector">
+            <user>jenkins</user>
+          </connector>
           <remoteFsMapping></remoteFsMapping>
           <remoteFs>/home/jenkins</remoteFs>
           <instanceCap>5</instanceCap>
diff --git a/jenkins-docker/master/edit-config.xslt b/jenkins-docker/master/edit-config.xslt
index 1ef00ad..a33645c 100644
--- a/jenkins-docker/master/edit-config.xslt
+++ b/jenkins-docker/master/edit-config.xslt
@@ -4,8 +4,6 @@
 
   <xsl:param name="use-security"/>
   <xsl:param name="docker-url"/>
-  <xsl:param name="oauth-client-id"/>
-  <xsl:param name="oauth-client-secret"/>
 
   <xsl:template match="*" priority="-1">
     <xsl:element name="{name()}">
@@ -25,15 +23,4 @@
      <xsl:element name="serverUrl"><xsl:value-of select="$docker-url"/></xsl:element>
   </xsl:template>
 
-  <xsl:template match="hudson/securityRealm">
-     <xsl:element name="securityRealm">
-        <xsl:attribute name="class">org.jenkinsci.plugins.GithubSecurityRealm</xsl:attribute>
-        <xsl:element name="githubWebUri">https://github.com</xsl:element>
-        <xsl:element name="githubApiUri">https://api.github.com</xsl:element>
-        <xsl:element name="clientId"><xsl:value-of select="$oauth-client-id"/></xsl:element>
-        <xsl:element name="clientSecret"><xsl:value-of select="$oauth-client-secret"/></xsl:element>
-        <xsl:element name="oauthScopes">read:org,user:email</xsl:element>
-     </xsl:element>
-  </xsl:template>
-
 </xsl:stylesheet>
diff --git a/jenkins-docker/master/gerrit-ci-scripts.xml b/jenkins-docker/master/gerrit-ci-scripts.xml
index 1b8e018..febbc26 100644
--- a/jenkins-docker/master/gerrit-ci-scripts.xml
+++ b/jenkins-docker/master/gerrit-ci-scripts.xml
@@ -20,7 +20,7 @@
     </userRemoteConfigs>
     <branches>
       <hudson.plugins.git.BranchSpec>
-        <name>*/master</name>
+        <name>*/private</name>
       </hudson.plugins.git.BranchSpec>
     </branches>
     <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
diff --git a/jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml b/jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml
index f2e465f..50d69d9 100644
--- a/jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml
+++ b/jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <jenkins.model.JenkinsLocationConfiguration>
   <adminAddress>GerritForge CI &lt;jenkins@gerritforge.com&gt;</adminAddress>
-  <jenkinsUrl>https://gerrit-ci.gerritforge.com/</jenkinsUrl>
+  <jenkinsUrl>https://gerrit-ci-private.gerritforge.com/</jenkinsUrl>
 </jenkins.model.JenkinsLocationConfiguration>
diff --git a/jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml b/jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
index 37230fd..e37aaa7 100644
--- a/jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
+++ b/jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
@@ -30,7 +30,7 @@
           </traits>
         </scm>
       </retriever>
-      <defaultVersion>master</defaultVersion>
+      <defaultVersion>private</defaultVersion>
       <implicit>true</implicit>
       <allowVersionOverride>true</allowVersionOverride>
       <includeInChangesets>true</includeInChangesets>
diff --git a/jenkins-docker/master/plugins.txt b/jenkins-docker/master/plugins.txt
index abaca17..842c6c6 100644
--- a/jenkins-docker/master/plugins.txt
+++ b/jenkins-docker/master/plugins.txt
@@ -43,7 +43,6 @@
 github:1.29.5
 github-api:1.92
 github-branch-source:2.3.6
-github-oauth:0.33
 github-organization-folder:1.6
 git-server:1.7
 greenballs:1.15
@@ -79,6 +78,7 @@
 script-security:1.66
 sse-gateway:1.20
 ssh-credentials:1.18
+reverse-proxy-auth-plugin:1.6.3
 ssh-slaves:1.26
 structs:1.20
 token-macro:2.10
diff --git a/jenkins-docker/nginx-proxy/Dockerfile b/jenkins-docker/nginx-proxy/Dockerfile
new file mode 100644
index 0000000..f372aba
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/Dockerfile
@@ -0,0 +1,10 @@
+FROM nginx:stable-alpine
+
+RUN apk update && \
+    apk add curl
+
+COPY *.conf /etc/nginx/conf.d/
+RUN rm /etc/nginx/conf.d/default.conf
+COPY nginx.sh /var/opt/
+
+ENTRYPOINT ["/var/opt/nginx.sh"]
diff --git a/jenkins-docker/nginx-proxy/Makefile b/jenkins-docker/nginx-proxy/Makefile
new file mode 100644
index 0000000..ef68ef3
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/Makefile
@@ -0,0 +1,13 @@
+NO_CACHE=false
+IMAGE=gerritforge/gerrit-ci-nginx-proxy
+
+build:
+	docker build --no-cache=$(NO_CACHE) -t ${IMAGE} .
+
+publish:
+	docker push ${IMAGE}
+
+clean:
+	docker rmi -f ${IMAGE}
+
+.PHONY: clean publish
diff --git a/jenkins-docker/nginx-proxy/jenkins-cert-auth.conf b/jenkins-docker/nginx-proxy/jenkins-cert-auth.conf
new file mode 100644
index 0000000..d10a42b
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/jenkins-cert-auth.conf
@@ -0,0 +1,58 @@
+map $ssl_client_s_dn $ssl_client_s_dn_cn {
+    default "anonymous";
+    ~CN=(?<CN>[^/]+) $CN;
+}
+
+server {
+    listen 443 ssl;
+    server_name gerrit-ci-secure.gerritforge.com;
+
+    ssl_certificate /etc/ssl/certs/cert.crt;
+    ssl_certificate_key /etc/ssl/certs/cert.key;
+
+    ssl_session_cache builtin:1000 shared:SSL:10m;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
+    ssl_prefer_server_ciphers on;
+
+    ssl_client_certificate /etc/ssl/certs/auth_ca.crt;
+    ssl_verify_client on;
+
+    ssl_session_timeout 5m;
+
+    location / {
+        sendfile off;
+        proxy_http_version 1.1;
+
+        proxy_pass http://jenkins:38080;
+        proxy_redirect http://jenkins:38080 https://gerrit-ci.gerritforge.com;
+
+        proxy_set_header Authorization "";
+        proxy_set_header X-Forwarded-User $ssl_client_s_dn_cn;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_max_temp_file_size 0;
+
+        proxy_connect_timeout 90;
+        proxy_send_timeout 90;
+        proxy_read_timeout 90;
+
+        proxy_buffer_size 4k;
+        proxy_buffers 4 32k;
+        proxy_busy_buffers_size 64k;
+        proxy_temp_file_write_size 64k;
+
+        # Set maximum upload size
+        client_max_body_size 10m;
+        client_body_buffer_size 128k;
+
+        # Required for new HTTP-based CLI
+        proxy_request_buffering off;
+    }
+}
\ No newline at end of file
diff --git a/jenkins-docker/nginx-proxy/jenkins.conf b/jenkins-docker/nginx-proxy/jenkins.conf
new file mode 100644
index 0000000..8a1fdc4
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/jenkins.conf
@@ -0,0 +1,55 @@
+server {
+   listen 80;
+   return 301 https://$host:443$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name gerrit-ci.gerritforge.com;
+
+    ssl_certificate /etc/ssl/certs/cert.crt;
+    ssl_certificate_key /etc/ssl/certs/cert.key;
+
+    ssl_session_cache builtin:1000 shared:SSL:10m;
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
+    ssl_prefer_server_ciphers on;
+
+    ssl_session_timeout 5m;
+
+    location / {
+        sendfile off;
+        proxy_http_version 1.1;
+
+        proxy_pass http://jenkins:38080;
+        proxy_redirect http://jenkins:38080 https://gerrit-ci.gerritforge.com;
+
+        proxy_set_header Authorization "";
+        proxy_set_header X-Forwarded-User "anonymous";
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_max_temp_file_size 0;
+
+        proxy_connect_timeout 90;
+        proxy_send_timeout 90;
+        proxy_read_timeout 90;
+
+        proxy_buffer_size 4k;
+        proxy_buffers 4 32k;
+        proxy_busy_buffers_size 64k;
+        proxy_temp_file_write_size 64k;
+
+        # Set maximum upload size
+        client_max_body_size 10m;
+        client_body_buffer_size 128k;
+
+        # Required for new HTTP-based CLI
+        proxy_request_buffering off;
+    }
+}
\ No newline at end of file
diff --git a/jenkins-docker/nginx-proxy/jjb.conf b/jenkins-docker/nginx-proxy/jjb.conf
new file mode 100644
index 0000000..42140f0
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/jjb.conf
@@ -0,0 +1,39 @@
+server {
+    # Endpoint for Jenkins-Job-Builder
+    listen 8081;
+
+    location / {
+        sendfile off;
+        proxy_http_version 1.1;
+
+        proxy_pass http://jenkins:38080;
+
+        proxy_set_header Authorization "";
+        proxy_set_header X-Forwarded-User "JJB";
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Server $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_max_temp_file_size 0;
+
+        proxy_connect_timeout 90;
+        proxy_send_timeout 90;
+        proxy_read_timeout 90;
+
+        proxy_buffer_size 4k;
+        proxy_buffers 4 32k;
+        proxy_busy_buffers_size 64k;
+        proxy_temp_file_write_size 64k;
+
+        # Set maximum upload size
+        client_max_body_size 10m;
+        client_body_buffer_size 128k;
+
+        # Required for new HTTP-based CLI
+        proxy_request_buffering off;
+    }
+}
\ No newline at end of file
diff --git a/jenkins-docker/nginx-proxy/nginx.sh b/jenkins-docker/nginx-proxy/nginx.sh
new file mode 100755
index 0000000..f05d2a1
--- /dev/null
+++ b/jenkins-docker/nginx-proxy/nginx.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -f /etc/ssl/certs/cert.key ] || [ ! -f /etc/ssl/certs/cert.crt ]; then
+  echo "ERROR: Missing SSL-key pair."
+  echo "Expected to find `/etc/ssl/certs/cert.key` and `/etc/ssl/certs/cert.crt`"
+  exit 1
+fi
+
+if [ ! -f /etc/ssl/certs/auth_ca.crt ]; then
+  rm -f /etc/nginx/conf.d/jenkins-cert-auth.conf
+fi
+
+nginx -g 'daemon off;'
diff --git a/jenkins/checker_definitions.txt b/jenkins/checker_definitions.txt
deleted file mode 100644
index 5f3f428..0000000
--- a/jenkins/checker_definitions.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-POST /plugins/checks/checkers/ HTTP/1.0
-  Content-Type: application/json; charset=UTF-8
-  {
-    "uuid": "gerritforge:rbe-a6a0e4682515f3521897c5f950d1394f4619d928",
-    "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:master)",
-    "blocking": []
-  }
-
-POST /plugins/checks/checkers/ HTTP/1.0
-  Content-Type: application/json; charset=UTF-8
-  {
-    "uuid": "gerritforge:notedb-a6a0e4682515f3521897c5f950d1394f4619d928",
-    "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.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
-    "blocking": []
-  }
-
-POST /plugins/checks/checkers/ HTTP/1.0
-  Content-Type: application/json; charset=UTF-8
-  {
-    "uuid": "gerritforge:reviewdb-a6a0e4682515f3521897c5f950d1394f4619d928",
-    "name": "ReviewDb Build/Tests",
-    "description": "Using ReviewDb, builds the code base and executes unit/integration tests",
-    "repository": "gerrit",
-    "query": "branch:stable-2.16",
-    "blocking": []
-  }
-
-POST /plugins/checks/checkers/ HTTP/1.0
-  Content-Type: application/json; charset=UTF-8
-  {
-    "uuid": "gerritforge:polygerrit-a6a0e4682515f3521897c5f950d1394f4619d928",
-    "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.2 OR branch:stable-3.3 OR branch:stable-3.4 OR branch:master)",
-    "blocking": []
-  }
-
-POST /plugins/checks/checkers/ HTTP/1.0
-  Content-Type: application/json; charset=UTF-8
-  {
-    "uuid": "gerritforge:codestyle-a6a0e4682515f3521897c5f950d1394f4619d928",
-    "name": "Code Style",
-    "description": "Executes Code Style tests",
-    "repository": "gerrit",
-    "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/defaults.yaml b/jenkins/defaults.yaml
deleted file mode 100644
index e69de29..0000000
--- a/jenkins/defaults.yaml
+++ /dev/null
diff --git a/jenkins/gatling-git-extension.yaml b/jenkins/gatling-git-extension.yaml
deleted file mode 100644
index e9fe49b..0000000
--- a/jenkins/gatling-git-extension.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job-template:
-    name: 'gatling-git-sbt-{branch}'
-    description: 'Gatling Git extension {branch} branch build with Sbt'
-    node: sbt
-    targets: compile test assembly
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://review.gerrithub.io/GerritForge/gatling-git
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - shell: |
-          sbt -no-colors compile test assembly
-          # Extract version information
-          JARS=$(find . -name 'gatling-git*jar')
-          for jar in $JARS
-          do
-              VERSION=$(git describe  --always origin/master)
-              echo -e "Implementation-Version: $VERSION" > MANIFEST.MF
-              jar ufm $jar MANIFEST.MF && rm MANIFEST.MF
-              echo "$VERSION" > $jar-version
-          done
-    publishers:
-      - archive:
-          artifacts: '**/target/**/gatling-git-extension.jar*'
-
-- project:
-    name: gatling-git-sbt-{branch}
-    jobs:
-      - 'gatling-git-sbt-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-app-analytics-etl.yaml b/jenkins/gerrit-app-analytics-etl.yaml
deleted file mode 100644
index 57446c6..0000000
--- a/jenkins/gerrit-app-analytics-etl.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- job-template:
-    name: 'app-{name}-sbt-{branch}'
-    description: 'App {name} {branch} branch build with Sbt'
-    node: sbt
-    targets: compile test assembly
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/apps/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-sbt-build-app.sh
-    publishers:
-      - archive:
-          artifacts: '**/target/**/*{name}*.jar*,**/target/**/*{name}*.json'
-
-- project:
-    name: analytics-etl
-    jobs:
-      - 'app-{name}-sbt-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-app-reviewit-build.sh b/jenkins/gerrit-app-reviewit-build.sh
deleted file mode 100755
index 49ad97a..0000000
--- a/jenkins/gerrit-app-reviewit-build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-export ANDROID_HOME=~/android-sdk
-
-if [ ! -f "$ANDROID_HOME/licenses/android-sdk-license" ]; then
-    # See https://developer.android.com/studio/intro/update.html#download-with-gradle.
-    echo "Exporting an Android SDK license..."
-    mkdir -p $ANDROID_HOME/licenses
-    echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-fi
-
-# Work around https://code.google.com/p/android/issues/detail?id=223424.
-mkdir -p ~/.android
-
-./gradlew assemble
diff --git a/jenkins/gerrit-app-reviewit.yaml b/jenkins/gerrit-app-reviewit.yaml
deleted file mode 100644
index f8651f9..0000000
--- a/jenkins/gerrit-app-reviewit.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: reviewit
-    branch:
-      - master
-    jobs:
-      - 'app-{name}-{branch}'
-    commands: !include-raw-escape: gerrit-app-reviewit-build.sh
-    artifacts: 'app/build/outputs/apk/*.apk'
diff --git a/jenkins/gerrit-app-template.yaml b/jenkins/gerrit-app-template.yaml
deleted file mode 100644
index 836da4c..0000000
--- a/jenkins/gerrit-app-template.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-- job-template:
-    name: 'app-{name}-{branch}'
-    description: 'App {name} {branch} branch build'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/apps/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - shell: '{commands}'
-    publishers:
-      - archive:
-          artifacts: '{artifacts}'
diff --git a/jenkins/gerrit-app-view.yaml b/jenkins/gerrit-app-view.yaml
deleted file mode 100644
index 0b107cc..0000000
--- a/jenkins/gerrit-app-view.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- view:
-    name: Apps
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-    regex: 'app-.*'
diff --git a/jenkins/gerrit-bazel-build-account-plugin.sh b/jenkins/gerrit-bazel-build-account-plugin.sh
deleted file mode 100644
index d7ee152..0000000
--- a/jenkins/gerrit-bazel-build-account-plugin.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-git checkout -f -b gerrit-{branch}  gerrit/{branch}
-git submodule update --init
-rm -rf plugins/account
-git read-tree -u --prefix=plugins/account origin/{branch}
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/account/$file ]
-  then
-    cp -f plugins/account/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "plugins/account:account" | sed -e 's/account/account/g')
-
-export NODE_MODULES=$PWD/node_modules
-npm install bower
-
-pushd plugins/account
-$NODE_MODULES/bower/bin/bower install
-cp -Rf bower_components/jquery/dist/*js src/main/resources/static/js/.
-cp -Rf bower_components/bootstrap/dist/js/*js src/main/resources/static/js/.
-cp -Rf bower_components/bootstrap/dist/css/*css src/main/resources/static/css/.
-cp -Rf bower_components/angular/*js src/main/resources/static/js/.
-popd
-
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS $TARGETS
-bazelisk test $BAZEL_OPTS --test_env DOCKER_HOST=$DOCKER_HOST //tools/bzl:always_pass_test plugins/account/...
-
-for JAR in $(find bazel-bin/plugins/account -name account*.jar)
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/account/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/account/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-build-examples-plugin.sh b/jenkins/gerrit-bazel-build-examples-plugin.sh
deleted file mode 100644
index f5621d9..0000000
--- a/jenkins/gerrit-bazel-build-examples-plugin.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e
-
-. set-java.sh 8
-
-git checkout {branch}
-
-java -fullversion
-bazelisk version
-bazelisk build all
diff --git a/jenkins/gerrit-bazel-build-its-plugin-branch.sh b/jenkins/gerrit-bazel-build-its-plugin-branch.sh
deleted file mode 100644
index eb87d98..0000000
--- a/jenkins/gerrit-bazel-build-its-plugin-branch.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash -e
-
-. set-java.sh 8
-
-git remote add origin https://gerrit.googlesource.com/a/gerrit
-git fetch origin
-git checkout origin/{gerrit-branch}
-git submodule update --init
-rm -rf plugins/its-{name}
-rm -rf plugins/its-base
-git read-tree -u --prefix=plugins/its-{name} plugin/{branch}
-git fetch --tags origin
-
-# Try first the Gerrit-specific branch of its-base and then fallback to the one of the plugin
-git read-tree -u --prefix=plugins/its-base base/{gerrit-branch} || git read-tree -u --prefix=plugins/its-base base/{branch}
-
-rm -Rf bazel-bin
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/its-{name}/$file ]
-  then
-    cp -f plugins/its-{name}/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/its-{{name}}/its-{name}/g')
-
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS $TARGETS
-bazelisk test $BAZEL_OPTS --test_env DOCKER_HOST=$DOCKER_HOST //tools/bzl:always_pass_test plugins/its-{name}/...
-
-for JAR in $(find bazel-bin/plugins/its-{name} -name its-{name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe --always plugin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/its-{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/its-{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-build-its-plugin.sh b/jenkins/gerrit-bazel-build-its-plugin.sh
deleted file mode 100644
index ddf2e51..0000000
--- a/jenkins/gerrit-bazel-build-its-plugin.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash -e
-
-. set-java.sh 8
-
-git checkout origin/{branch}
-git submodule update --init
-rm -rf plugins/its-{name}
-rm -rf plugins/its-base
-git read-tree -u --prefix=plugins/its-{name} plugin/{branch}
-git read-tree -u --prefix=plugins/its-base base/{branch}
-git fetch --tags origin
-
-rm -Rf bazel-bin
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/its-{name}/$file ]
-  then
-    cp -f plugins/its-{name}/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/its-{{name}}/its-{name}/g')
-
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS $TARGETS
-bazelisk test $BAZEL_OPTS --test_env DOCKER_HOST=$DOCKER_HOST //tools/bzl:always_pass_test plugins/its-{name}/...
-
-for JAR in $(find bazel-bin/plugins/its-{name} -name its-{name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe --always plugin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/its-{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/its-{name}/$(basename $JAR-version)
-done
-
diff --git a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh b/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
deleted file mode 100644
index 88acbf4..0000000
--- a/jenkins/gerrit-bazel-build-owners-plugin-branch.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-git checkout -fb {branch} gerrit/{gerrit-branch}
-git submodule update --init
-git read-tree -u --prefix=plugins/{name}-plugin origin/{branch}
-git fetch --tags origin
-ln -s plugins/{name}-plugin/owners-common .
-pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/{name}-plugin/$file ]
-  then
-    cp -f plugins/{name}-plugin/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-
-java -fullversion
-bazelisk version
-bazelisk build $TARGETS
-for target in $TARGETS
-do
-    bazelisk test $target/... //tools/bzl:always_pass_test
-done
-
-for JAR in $(find bazel-bin/plugins/ -name {name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-build-owners-plugin.sh b/jenkins/gerrit-bazel-build-owners-plugin.sh
deleted file mode 100644
index 333e83b..0000000
--- a/jenkins/gerrit-bazel-build-owners-plugin.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-git checkout -fb {branch} gerrit/{branch}
-git submodule update --init
-git read-tree -u --prefix=plugins/{name}-plugin origin/{branch}
-git fetch --tags origin
-ln -s plugins/{name}-plugin/owners-common .
-pushd plugins && ln -s owners-plugin/owners owners-plugin/owners-a* . && popd
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/{name}-plugin/$file ]
-  then
-    cp -f plugins/{name}-plugin/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-
-java -fullversion
-bazelisk version
-bazelisk build $TARGETS
-
-for target in $TARGETS
-do
-    bazelisk test $target/... //tools/bzl:always_pass_test
-done
-
-for JAR in $(find bazel-bin/plugins/ -name {name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-build-plugin-branch.sh b/jenkins/gerrit-bazel-build-plugin-branch.sh
deleted file mode 100644
index 2927aab..0000000
--- a/jenkins/gerrit-bazel-build-plugin-branch.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-echo "Building plugin {name}/{branch} with Gerrit/{gerrit-branch}"
-
-git remote show gerrit > /dev/null 2>&1 || git remote add gerrit https://gerrit.googlesource.com/a/gerrit
-git fetch gerrit {gerrit-branch}
-git checkout -fb {gerrit-branch} gerrit/{gerrit-branch}
-git submodule update --init
-git read-tree -u --prefix=plugins/{name} origin/{branch}
-git fetch --tags origin
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/{name}/$file ]
-  then
-    cp -f plugins/{name}/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS $TARGETS
-
-BAZEL_OPTS="$BAZEL_OPTS --flaky_test_attempts 3 \
-                   --test_timeout 3600 \
-                   --test_tag_filters=-flaky \
-                   --test_env DOCKER_HOST=$DOCKER_HOST"
-bazelisk test $BAZEL_OPTS //tools/bzl:always_pass_test plugins/{name}/...
-
-for JAR in $(find bazel-bin/plugins/{name} -maxdepth 1 -name {name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-build-plugin.sh b/jenkins/gerrit-bazel-build-plugin.sh
deleted file mode 100644
index f6f5556..0000000
--- a/jenkins/gerrit-bazel-build-plugin.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-git checkout -fb {branch} gerrit/{branch}
-git submodule update --init
-rm -rf plugins/{name}
-git read-tree -u --prefix=plugins/{name} origin/{branch}
-git fetch --tags origin
-
-for file in external_plugin_deps.bzl package.json
-do
-  if [ -f plugins/{name}/$file ]
-  then
-    cp -f plugins/{name}/$file plugins/
-  fi
-done
-
-TARGETS=$(echo "{targets}" | sed -e 's/{{name}}/{name}/g')
-
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS $TARGETS
-bazelisk test $BAZEL_OPTS --test_env DOCKER_HOST=$DOCKER_HOST //tools/bzl:always_pass_test plugins/{name}/...
-
-for JAR in $(find bazel-bin/plugins/{name} -maxdepth 1 -name {name}*.jar)
-do
-    PLUGIN_VERSION=$(git describe  --always origin/{branch})
-    echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-    jar ufm $JAR MANIFEST.MF && rm MANIFEST.MF
-    DEST_JAR=bazel-bin/plugins/{name}/$(basename $JAR)
-    [ "$JAR" -ef "$DEST_JAR" ] || mv $JAR $DEST_JAR
-    echo "$PLUGIN_VERSION" > bazel-bin/plugins/{name}/$(basename $JAR-version)
-done
diff --git a/jenkins/gerrit-bazel-cat-test-log.sh b/jenkins/gerrit-bazel-cat-test-log.sh
old mode 100755
new mode 100644
diff --git a/jenkins/gerrit-bazel-get-its-plugin-info.sh b/jenkins/gerrit-bazel-get-its-plugin-info.sh
deleted file mode 100755
index 574b902..0000000
--- a/jenkins/gerrit-bazel-get-its-plugin-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-curl -L https://gerrit-review.googlesource.com/projects/plugins%2Fits-{name}/config | \
-     tail -n +2 > bazel-bin/plugins/its-{name}/its-{name}.json
-
diff --git a/jenkins/gerrit-bazel-get-project-info.sh b/jenkins/gerrit-bazel-get-project-info.sh
deleted file mode 100755
index 0d73696..0000000
--- a/jenkins/gerrit-bazel-get-project-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-curl -L https://gerrit-review.googlesource.com/projects/{class}%2F{name}/config | \
-     tail -n +2 > bazel-bin/plugins/{name}/{name}.json
-
diff --git a/jenkins/gerrit-bazel-get-scripting-plugin-info.sh b/jenkins/gerrit-bazel-get-scripting-plugin-info.sh
deleted file mode 100755
index d928dd4..0000000
--- a/jenkins/gerrit-bazel-get-scripting-plugin-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-curl -L https://gerrit-review.googlesource.com/projects/plugins%2Fscripting%2F{name}/config | \
-     tail -n +2 > bazel-bin/plugins/{name}/{name}.json
-
diff --git a/jenkins/gerrit-bazel-gh-get-plugin-info.sh b/jenkins/gerrit-bazel-gh-get-plugin-info.sh
deleted file mode 100755
index f5f06f0..0000000
--- a/jenkins/gerrit-bazel-gh-get-plugin-info.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-curl -L https://api.github.com/repos/{organization}/{name} \
-     > bazel-bin/plugins/{name}/{name}.json
-
diff --git a/jenkins/gerrit-bazel-lib-global-refdb.yaml b/jenkins/gerrit-bazel-lib-global-refdb.yaml
deleted file mode 100644
index abe6a27..0000000
--- a/jenkins/gerrit-bazel-lib-global-refdb.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- project:
-    name: global-refdb
-    repo: global-refdb
-    organization: GerritForge
-    branch:
-      - master
-      - stable-3.2
-    jobs:
-      - 'plugin-{name}-gh-bazel-{branch}'
diff --git a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml b/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
deleted file mode 100644
index a3d5891..0000000
--- a/jenkins/gerrit-bazel-module-cache-chroniclemap.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: cache-chroniclemap
-    jobs:
-      - 'module-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-      - 'module-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-events-broker.yaml b/jenkins/gerrit-bazel-module-events-broker.yaml
deleted file mode 100644
index f08f4f3..0000000
--- a/jenkins/gerrit-bazel-module-events-broker.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: events-broker
-    jobs:
-      - 'module-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'module-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-module-git-refs-filter.yaml b/jenkins/gerrit-bazel-module-git-refs-filter.yaml
deleted file mode 100644
index 1b2a6b8..0000000
--- a/jenkins/gerrit-bazel-module-git-refs-filter.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: git-refs-filter
-    jobs:
-      - 'module-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-      - 'module-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-module-virtualhost.yaml b/jenkins/gerrit-bazel-module-virtualhost.yaml
deleted file mode 100644
index e9771b3..0000000
--- a/jenkins/gerrit-bazel-module-virtualhost.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: virtualhost
-    jobs:
-      - 'module-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-account.yaml b/jenkins/gerrit-bazel-plugin-account.yaml
deleted file mode 100644
index bdf6768..0000000
--- a/jenkins/gerrit-bazel-plugin-account.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job-template:
-    name: 'plugin-account-bazel-{branch}'
-    description: 'Plugin account {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    node: bazel-debian
-    class: plugins
-    project-name: plugins%2Faccount
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    wrappers:
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-account-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/account/account.jar*,bazel-bin/plugins/account/account.json
-
-- project:
-    name: account
-    jobs:
-      - 'plugin-account-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-admin-console.yaml b/jenkins/gerrit-bazel-plugin-admin-console.yaml
deleted file mode 100644
index 8393205..0000000
--- a/jenkins/gerrit-bazel-plugin-admin-console.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: admin-console
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml b/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
deleted file mode 100644
index 15e68af..0000000
--- a/jenkins/gerrit-bazel-plugin-audit-sl4j.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: audit-sl4j
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-automerger.yaml b/jenkins/gerrit-bazel-plugin-automerger.yaml
deleted file mode 100644
index d68bd2e..0000000
--- a/jenkins/gerrit-bazel-plugin-automerger.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: automerger
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml b/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
deleted file mode 100644
index b52dd96..0000000
--- a/jenkins/gerrit-bazel-plugin-autosubmitter.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: autosubmitter
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-avatars-external.yaml b/jenkins/gerrit-bazel-plugin-avatars-external.yaml
deleted file mode 100644
index d87496f..0000000
--- a/jenkins/gerrit-bazel-plugin-avatars-external.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: avatars-external
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - '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
deleted file mode 100644
index 883df3b..0000000
--- a/jenkins/gerrit-bazel-plugin-avatars-gravatar.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: avatars-gravatar
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-batch.yaml b/jenkins/gerrit-bazel-plugin-batch.yaml
deleted file mode 100644
index c101d88..0000000
--- a/jenkins/gerrit-bazel-plugin-batch.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- project:
-    name: batch
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-branch-network.yaml b/jenkins/gerrit-bazel-plugin-branch-network.yaml
deleted file mode 100644
index b58d8a8..0000000
--- a/jenkins/gerrit-bazel-plugin-branch-network.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: branch-network
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-cfoauth.yaml b/jenkins/gerrit-bazel-plugin-cfoauth.yaml
deleted file mode 100644
index 2dbd33b..0000000
--- a/jenkins/gerrit-bazel-plugin-cfoauth.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- project:
-    name: cfoauth
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-changemessage.yaml b/jenkins/gerrit-bazel-plugin-changemessage.yaml
deleted file mode 100644
index 3f82960..0000000
--- a/jenkins/gerrit-bazel-plugin-changemessage.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: changemessage
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-checks.yaml b/jenkins/gerrit-bazel-plugin-checks.yaml
deleted file mode 100644
index c0843f1..0000000
--- a/jenkins/gerrit-bazel-plugin-checks.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: checks
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-cloud-notifications.yaml b/jenkins/gerrit-bazel-plugin-cloud-notifications.yaml
deleted file mode 100644
index b6ede64..0000000
--- a/jenkins/gerrit-bazel-plugin-cloud-notifications.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: cloud-notifications
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-code-owners.yaml b/jenkins/gerrit-bazel-plugin-code-owners.yaml
deleted file mode 100644
index 28fb3a3..0000000
--- a/jenkins/gerrit-bazel-plugin-code-owners.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: code-owners
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-delete-project.yaml b/jenkins/gerrit-bazel-plugin-delete-project.yaml
deleted file mode 100644
index 3bf94ec..0000000
--- a/jenkins/gerrit-bazel-plugin-delete-project.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: delete-project
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-egit.yaml b/jenkins/gerrit-bazel-plugin-egit.yaml
deleted file mode 100644
index 7f2fdd4..0000000
--- a/jenkins/gerrit-bazel-plugin-egit.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- project:
-    name: egit
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-emoticons.yaml b/jenkins/gerrit-bazel-plugin-emoticons.yaml
deleted file mode 100644
index 46a8676..0000000
--- a/jenkins/gerrit-bazel-plugin-emoticons.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: emoticons
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml b/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
deleted file mode 100644
index 43381c8..0000000
--- a/jenkins/gerrit-bazel-plugin-events-aws-kinesis.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: events-aws-kinesis
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml b/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
deleted file mode 100644
index 9642903..0000000
--- a/jenkins/gerrit-bazel-plugin-events-gcloud-pubsub.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: events-gcloud-pubsub
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-kafka.yaml b/jenkins/gerrit-bazel-plugin-events-kafka.yaml
deleted file mode 100644
index 6a02fd8..0000000
--- a/jenkins/gerrit-bazel-plugin-events-kafka.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- project:
-    name: events-kafka
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-events-log.yaml b/jenkins/gerrit-bazel-plugin-events-log.yaml
deleted file mode 100644
index 7ffe766..0000000
--- a/jenkins/gerrit-bazel-plugin-events-log.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: events-log
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-events-rabbitmq.yaml b/jenkins/gerrit-bazel-plugin-events-rabbitmq.yaml
deleted file mode 100644
index 455f39e..0000000
--- a/jenkins/gerrit-bazel-plugin-events-rabbitmq.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: events-rabbitmq
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-examples.yaml b/jenkins/gerrit-bazel-plugin-examples.yaml
deleted file mode 100644
index 7bdc834..0000000
--- a/jenkins/gerrit-bazel-plugin-examples.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- job-template:
-    name: 'plugin-examples-bazel-{branch}'
-    description: 'Plugin examples {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    targets: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/examples
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          skip-tag: true
-    wrappers:
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-examples-plugin.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/all.zip
-
-- project:
-    name: examples
-    jobs:
-      - 'plugin-examples-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-find-owners.yaml b/jenkins/gerrit-bazel-plugin-find-owners.yaml
deleted file mode 100644
index e6eb9bf..0000000
--- a/jenkins/gerrit-bazel-plugin-find-owners.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: find-owners
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml b/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
deleted file mode 100644
index 2827585..0000000
--- a/jenkins/gerrit-bazel-plugin-gc-conductor.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: gc-conductor
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-gh-template.yaml b/jenkins/gerrit-bazel-plugin-gh-template.yaml
deleted file mode 100644
index 14bb521..0000000
--- a/jenkins/gerrit-bazel-plugin-gh-template.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- defaults:
-    name: plugin-gh-template
-    targets: 'plugins/{name}:{name}'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://github.com/{organization}/{repo}
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            disable: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- job-template:
-    name: 'plugin-{name}-gh-bazel-{branch}'
-    description: >
-      Plugin {name} {branch} branch build with Bazel owned by {organization}
-      and hosted on GitHub
-    defaults: plugin-gh-template
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-gh-get-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
-
-- job-template:
-    name: 'plugin-{name}-gh-bazel-{branch}-{gerrit-branch}'
-    description: >
-      Plugin {name} {branch} branch owned by {organization}
-      and hosted on GitHub and built with Bazel for Gerrit {gerrit-branch}
-    defaults: plugin-gh-template
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-gh-get-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-bazel-plugin-gitblit.yaml b/jenkins/gerrit-bazel-plugin-gitblit.yaml
deleted file mode 100644
index d41be4e..0000000
--- a/jenkins/gerrit-bazel-plugin-gitblit.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- defaults:
-    name: 'plugin-gitblit'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/gitblit
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-            - gitblit:
-                url: https://gerrit.googlesource.com/a/gitblit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- job-template:
-    name: 'plugin-gitblit-bazel-{branch}'
-    description: 'GitBlit plugin Bazel build for Gerrit {branch}'
-    defaults: plugin-gitblit
-    project-name: plugins%2Fgitblit
-    class: plugins
-    node: bazel-debian
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/gitblit
-                credentials-id: gerrit.googlesource.com
-            - gitblit:
-                url: https://gerrit.googlesource.com/a/gitblit
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-          skip-tag: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gitblit-ant-build.sh
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/gitblit/*gitblit*.jar*,
-            bazel-bin/plugins/gitblit/*gitblit*.json
-
-- project:
-    name: gitblit
-    jobs:
-      - 'plugin-gitblit-bazel-{branch}':
-          targets: plugins/gitblit
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-gitiles.yaml b/jenkins/gerrit-bazel-plugin-gitiles.yaml
deleted file mode 100644
index 614601e..0000000
--- a/jenkins/gerrit-bazel-plugin-gitiles.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: gitiles
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-go-import.yaml b/jenkins/gerrit-bazel-plugin-go-import.yaml
deleted file mode 100644
index 86b4385..0000000
--- a/jenkins/gerrit-bazel-plugin-go-import.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: go-import
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml b/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
deleted file mode 100644
index 5211889..0000000
--- a/jenkins/gerrit-bazel-plugin-groovy-provider.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: groovy-provider
-    jobs:
-      - 'plugin-scripting-{name}-bazel-{branch}':
-          branch:
-            - master
-      - 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-healthcheck.yaml b/jenkins/gerrit-bazel-plugin-healthcheck.yaml
deleted file mode 100644
index e53052f..0000000
--- a/jenkins/gerrit-bazel-plugin-healthcheck.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: healthcheck
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-heartbeat.yaml b/jenkins/gerrit-bazel-plugin-heartbeat.yaml
deleted file mode 100644
index daed4ed..0000000
--- a/jenkins/gerrit-bazel-plugin-heartbeat.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: heartbeat
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-high-availability.yaml b/jenkins/gerrit-bazel-plugin-high-availability.yaml
deleted file mode 100644
index b382679..0000000
--- a/jenkins/gerrit-bazel-plugin-high-availability.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-- project:
-    name: high-availability
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-            - stable-2.15
-            - stable-2.14
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-      - plugin-{name}-verifier
diff --git a/jenkins/gerrit-bazel-plugin-imagare.yaml b/jenkins/gerrit-bazel-plugin-imagare.yaml
deleted file mode 100644
index 6b0cd9b..0000000
--- a/jenkins/gerrit-bazel-plugin-imagare.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: imagare
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-image-diff.yaml b/jenkins/gerrit-bazel-plugin-image-diff.yaml
deleted file mode 100644
index fbe1bd1..0000000
--- a/jenkins/gerrit-bazel-plugin-image-diff.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: image-diff
-    jobs:
-      - 'ui-plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-importer.yaml b/jenkins/gerrit-bazel-plugin-importer.yaml
deleted file mode 100644
index 8695eb0..0000000
--- a/jenkins/gerrit-bazel-plugin-importer.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: importer
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-its-base.yaml b/jenkins/gerrit-bazel-plugin-its-base.yaml
deleted file mode 100644
index 3c12a85..0000000
--- a/jenkins/gerrit-bazel-plugin-its-base.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- project:
-    name: its-base
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-          targets: 'plugins/its-base:its-base plugins/its-base:its_base_tests'
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
-          targets: 'plugins/its-base:its-base plugins/its-base:its_base_tests'
diff --git a/jenkins/gerrit-bazel-plugin-its-bugzilla.yaml b/jenkins/gerrit-bazel-plugin-its-bugzilla.yaml
deleted file mode 100644
index 3a61c13..0000000
--- a/jenkins/gerrit-bazel-plugin-its-bugzilla.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: bugzilla
-    jobs:
-      - 'plugin-its-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
-          targets: 'plugins/its-bugzilla:its-bugzilla plugins/its-bugzilla:its_bugzilla_tests'
diff --git a/jenkins/gerrit-bazel-plugin-its-jira.yaml b/jenkins/gerrit-bazel-plugin-its-jira.yaml
deleted file mode 100644
index 437437c..0000000
--- a/jenkins/gerrit-bazel-plugin-its-jira.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- project:
-    name: jira
-    jobs:
-      - 'plugin-its-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-          targets: 'plugins/its-jira:its-jira plugins/its-jira:its_jira_tests'
-      - 'plugin-its-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - 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
deleted file mode 100644
index 66f209e..0000000
--- a/jenkins/gerrit-bazel-plugin-its-phabricator.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: phabricator
-    jobs:
-      - 'plugin-its-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-its-rtc.yaml b/jenkins/gerrit-bazel-plugin-its-rtc.yaml
deleted file mode 100644
index 30a0a50..0000000
--- a/jenkins/gerrit-bazel-plugin-its-rtc.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: rtc
-    jobs:
-      - 'plugin-its-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-its-storyboard.yaml b/jenkins/gerrit-bazel-plugin-its-storyboard.yaml
deleted file mode 100644
index 32d4190..0000000
--- a/jenkins/gerrit-bazel-plugin-its-storyboard.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: storyboard
-    jobs:
-      - 'plugin-its-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-its-template.yaml b/jenkins/gerrit-bazel-plugin-its-template.yaml
deleted file mode 100644
index c550731..0000000
--- a/jenkins/gerrit-bazel-plugin-its-template.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-- defaults:
-    name: plugin-its-template
-    targets: 'plugins/its-{name}:its-{name}'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
-    scm:
-      - git:
-          remotes:
-            - plugin:
-                url: https://gerrit.googlesource.com/a/plugins/its-{name}
-                credentials-id: gerrit.googlesource.com
-            - origin:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-            - base:
-                url: https://gerrit.googlesource.com/a/plugins/its-base
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - plugin/{branch}
-          submodule:
-            recursive: false
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- job-template:
-    name: 'plugin-its-{name}-bazel-{branch}'
-    description: 'Plugin its-{name} {branch} branch build with Bazel'
-    defaults: plugin-its-template
-    node: bazel-debian
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-its-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-its-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/its-{name}/its-{name}.jar*,
-            bazel-bin/plugins/its-{name}/its-{name}.json
-
-- job-template:
-    name: 'plugin-its-{name}-bazel-{branch}-{gerrit-branch}'
-    description: 'Plugin its-{name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
-    defaults: plugin-its-template
-    node: bazel-debian
-    scm:
-      - git:
-          remotes:
-            - plugin:
-                url: https://gerrit.googlesource.com/a/plugins/its-{name}
-                credentials-id: gerrit.googlesource.com
-            - base:
-                url: https://gerrit.googlesource.com/a/plugins/its-base
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - plugin/{branch}
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-its-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-its-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/its-{name}/its-{name}.jar*,
-            bazel-bin/plugins/its-{name}/its-{name}.json
diff --git a/jenkins/gerrit-bazel-plugin-javamelody.yaml b/jenkins/gerrit-bazel-plugin-javamelody.yaml
deleted file mode 100644
index 18b73e8..0000000
--- a/jenkins/gerrit-bazel-plugin-javamelody.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job-template:
-    name: 'plugin-javamelody-bazel-{branch}'
-    description: 'JavaMelody plugin {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/javamelody/javamelody.jar*,bazel-bin/plugins/javamelody/javamelody-deps_deploy.jar
-
-- project:
-    name: javamelody
-    jobs:
-      - 'plugin-javamelody-bazel-{branch}':
-          branch:
-            - stable-2.16
-          targets: >
-            plugins/javamelody:javamelody-deps_deploy.jar
-            plugins/javamelody:javamelody \
-      - 'plugin-javamelody-bazel-{branch}':
-          branch:
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
diff --git a/jenkins/gerrit-bazel-plugin-kafka-events.yaml b/jenkins/gerrit-bazel-plugin-kafka-events.yaml
deleted file mode 100644
index b8af9b9..0000000
--- a/jenkins/gerrit-bazel-plugin-kafka-events.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-- project:
-    name: kafka-events
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          targets: 'plugins/kafka-events plugins/kafka-events:kafka_events_tests'
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          targets: 'plugins/kafka-events plugins/kafka-events:kafka_events_tests'
-          branch:
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-labelui.yaml b/jenkins/gerrit-bazel-plugin-labelui.yaml
deleted file mode 100644
index 109e7d3..0000000
--- a/jenkins/gerrit-bazel-plugin-labelui.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: labelui
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-lfs.yaml b/jenkins/gerrit-bazel-plugin-lfs.yaml
deleted file mode 100644
index c1cd4e3..0000000
--- a/jenkins/gerrit-bazel-plugin-lfs.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: lfs
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-log-level.yaml b/jenkins/gerrit-bazel-plugin-log-level.yaml
deleted file mode 100644
index c568077..0000000
--- a/jenkins/gerrit-bazel-plugin-log-level.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- project:
-    name: log-level
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-login-redirect.yaml b/jenkins/gerrit-bazel-plugin-login-redirect.yaml
deleted file mode 100644
index e56ea09..0000000
--- a/jenkins/gerrit-bazel-plugin-login-redirect.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: login-redirect
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-menuextender.yaml b/jenkins/gerrit-bazel-plugin-menuextender.yaml
deleted file mode 100644
index 1ca6ef6..0000000
--- a/jenkins/gerrit-bazel-plugin-menuextender.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: menuextender
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-messageoftheday.yaml b/jenkins/gerrit-bazel-plugin-messageoftheday.yaml
deleted file mode 100644
index 2c39bc3..0000000
--- a/jenkins/gerrit-bazel-plugin-messageoftheday.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: messageoftheday
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
deleted file mode 100644
index 082d859..0000000
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-cloudwatch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: metrics-reporter-cloudwatch
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-elasticsearch.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-elasticsearch.yaml
deleted file mode 100644
index 0937979..0000000
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-elasticsearch.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: metrics-reporter-elasticsearch
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
deleted file mode 100644
index d8a0326..0000000
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-graphite.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: metrics-reporter-graphite
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
deleted file mode 100644
index ad929b7..0000000
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-jmx.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: metrics-reporter-jmx
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml b/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
deleted file mode 100644
index 8054984..0000000
--- a/jenkins/gerrit-bazel-plugin-metrics-reporter-prometheus.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: metrics-reporter-prometheus
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-motd.yaml b/jenkins/gerrit-bazel-plugin-motd.yaml
deleted file mode 100644
index e8a3f3d..0000000
--- a/jenkins/gerrit-bazel-plugin-motd.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- project:
-    name: motd
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-multi-site.yaml b/jenkins/gerrit-bazel-plugin-multi-site.yaml
deleted file mode 100644
index 4b4593c..0000000
--- a/jenkins/gerrit-bazel-plugin-multi-site.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: multi-site
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-oauth.yaml b/jenkins/gerrit-bazel-plugin-oauth.yaml
deleted file mode 100644
index 630bec9..0000000
--- a/jenkins/gerrit-bazel-plugin-oauth.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: oauth
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
diff --git a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml b/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
deleted file mode 100644
index 400c31a..0000000
--- a/jenkins/gerrit-bazel-plugin-out-of-the-box.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: out-of-the-box
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-owners.yaml b/jenkins/gerrit-bazel-plugin-owners.yaml
deleted file mode 100644
index 68e43a9..0000000
--- a/jenkins/gerrit-bazel-plugin-owners.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job-template:
-    name: 'plugin-owners-bazel-{branch}'
-    description: 'Plugin owners {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-owners-plugin.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-a*.jar*
-          excludes: >
-            **/*non_stamped*
-
-- job-template:
-    name: 'plugin-owners-bazel-{branch}-{gerrit-branch}'
-    class: plugins
-    description: 'Plugin owners {branch} branch Bazel build for Gerrit {gerrit-branch}'
-    defaults: plugin-template-bazel
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    project-name: plugins%2Fowners
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-owners-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/owners/owners.jar*,bazel-bin/plugins/owners/owners-a*.jar*
-          excludes: >
-            **/*non_stamped*
-
-- project:
-    name: owners
-    jobs:
-      - 'plugin-owners-bazel-{branch}':
-          targets: 'plugins/owners plugins/owners-a*'
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-plugin-manager.yaml b/jenkins/gerrit-bazel-plugin-plugin-manager.yaml
deleted file mode 100644
index d7bc1ea..0000000
--- a/jenkins/gerrit-bazel-plugin-plugin-manager.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: plugin-manager
-    targets: 'plugins/plugin-manager plugins/plugin-manager:plugin_manager_tests'
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-project-download-commands.yaml b/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
deleted file mode 100644
index 64b47da..0000000
--- a/jenkins/gerrit-bazel-plugin-project-download-commands.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: project-download-commands
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml b/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
deleted file mode 100644
index 25d77fb..0000000
--- a/jenkins/gerrit-bazel-plugin-project-group-structure.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: project-group-structure
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-bazel-plugin-pull-replication.yaml b/jenkins/gerrit-bazel-plugin-pull-replication.yaml
deleted file mode 100644
index 31410e4..0000000
--- a/jenkins/gerrit-bazel-plugin-pull-replication.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: pull-replication
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-quota.yaml b/jenkins/gerrit-bazel-plugin-quota.yaml
deleted file mode 100644
index 8c3d6cd..0000000
--- a/jenkins/gerrit-bazel-plugin-quota.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: quota
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-rabbitmq.yaml b/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
deleted file mode 100644
index 40e03b7..0000000
--- a/jenkins/gerrit-bazel-plugin-rabbitmq.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: rabbitmq
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml b/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
deleted file mode 100644
index a4c2250..0000000
--- a/jenkins/gerrit-bazel-plugin-rate-limiter.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: rate-limiter
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-readonly.yaml b/jenkins/gerrit-bazel-plugin-readonly.yaml
deleted file mode 100644
index 46f3cec..0000000
--- a/jenkins/gerrit-bazel-plugin-readonly.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: readonly
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-ref-protection.yaml b/jenkins/gerrit-bazel-plugin-ref-protection.yaml
deleted file mode 100644
index 158750b..0000000
--- a/jenkins/gerrit-bazel-plugin-ref-protection.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: ref-protection
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml b/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
deleted file mode 100644
index 063c1ab..0000000
--- a/jenkins/gerrit-bazel-plugin-reject-private-submit.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: reject-private-submit
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
diff --git a/jenkins/gerrit-bazel-plugin-rename-project.yaml b/jenkins/gerrit-bazel-plugin-rename-project.yaml
deleted file mode 100644
index dc3f7fb..0000000
--- a/jenkins/gerrit-bazel-plugin-rename-project.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: rename-project
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reparent.yaml b/jenkins/gerrit-bazel-plugin-reparent.yaml
deleted file mode 100644
index 6ab26d4..0000000
--- a/jenkins/gerrit-bazel-plugin-reparent.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: reparent
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-review-strategy.yaml b/jenkins/gerrit-bazel-plugin-review-strategy.yaml
deleted file mode 100644
index a6ab7e1..0000000
--- a/jenkins/gerrit-bazel-plugin-review-strategy.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: review-strategy
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml b/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
deleted file mode 100644
index becaaa4..0000000
--- a/jenkins/gerrit-bazel-plugin-reviewassistant.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: reviewassistant
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml b/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
deleted file mode 100644
index 62a4be8..0000000
--- a/jenkins/gerrit-bazel-plugin-reviewers-by-blame.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: reviewers-by-blame
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
diff --git a/jenkins/gerrit-bazel-plugin-reviewers.yaml b/jenkins/gerrit-bazel-plugin-reviewers.yaml
deleted file mode 100644
index 6607362..0000000
--- a/jenkins/gerrit-bazel-plugin-reviewers.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: reviewers
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-            - stable-3.3
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-scala-provider.yaml b/jenkins/gerrit-bazel-plugin-scala-provider.yaml
deleted file mode 100644
index bdb7115..0000000
--- a/jenkins/gerrit-bazel-plugin-scala-provider.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: scala-provider
-    jobs:
-      - 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-scripting-template.yaml b/jenkins/gerrit-bazel-plugin-scripting-template.yaml
deleted file mode 100644
index ade2ef4..0000000
--- a/jenkins/gerrit-bazel-plugin-scripting-template.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- defaults:
-    name: plugin-scripting-template
-    targets: 'plugins/{name}:{name}'
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/scripting/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- job-template:
-    name: 'plugin-scripting-{name}-bazel-{branch}'
-    description: 'Plugin scripting/{name}/{branch} Bazel build for Gerrit'
-    defaults: plugin-scripting-template
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/scripting/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          skip-tag: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-scripting-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
-
-- job-template:
-    name: 'plugin-scripting-{name}-bazel-{branch}-{gerrit-branch}'
-    description: 'Plugin scripting/{name}/{branch} Bazel build for Gerrit/{gerrit-branch}'
-    defaults: plugin-scripting-template
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/scripting/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          skip-tag: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-scripting-plugin-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar*,bazel-bin/plugins/{name}/{name}.json
diff --git a/jenkins/gerrit-bazel-plugin-secure-config.yaml b/jenkins/gerrit-bazel-plugin-secure-config.yaml
deleted file mode 100644
index a8cc49d..0000000
--- a/jenkins/gerrit-bazel-plugin-secure-config.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: secure-config
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-server-config.yaml b/jenkins/gerrit-bazel-plugin-server-config.yaml
deleted file mode 100644
index 9be7bae..0000000
--- a/jenkins/gerrit-bazel-plugin-server-config.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: server-config
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-serviceuser.yaml b/jenkins/gerrit-bazel-plugin-serviceuser.yaml
deleted file mode 100644
index dd9930c..0000000
--- a/jenkins/gerrit-bazel-plugin-serviceuser.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: serviceuser
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml b/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
deleted file mode 100644
index f879c9d..0000000
--- a/jenkins/gerrit-bazel-plugin-simple-submit-rules.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: simple-submit-rules
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
diff --git a/jenkins/gerrit-bazel-plugin-slack-integration.yaml b/jenkins/gerrit-bazel-plugin-slack-integration.yaml
deleted file mode 100644
index 7054a6d..0000000
--- a/jenkins/gerrit-bazel-plugin-slack-integration.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: slack-integration
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-supermanifest.yaml b/jenkins/gerrit-bazel-plugin-supermanifest.yaml
deleted file mode 100644
index 2a05533..0000000
--- a/jenkins/gerrit-bazel-plugin-supermanifest.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: supermanifest
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-task.yaml b/jenkins/gerrit-bazel-plugin-task.yaml
deleted file mode 100644
index 0514dff..0000000
--- a/jenkins/gerrit-bazel-plugin-task.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- project:
-    name: task
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
deleted file mode 100644
index 20b610a..0000000
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ /dev/null
@@ -1,288 +0,0 @@
-- defaults:
-    name: plugin-template-bazel
-    targets: 'plugins/{name}:{name}'
-    wrappers:
-      - timeout:
-          timeout: 60
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-- defaults:
-    name: verifier-template-bazel
-    node: master
-    days-to-keep: 90
-    number-to-keep: 500
-    prune-dead-branches: true
-    periodic-folder-trigger: 10m
-
-- job-template:
-    name: 'plugin-{name}-verifier'
-    description: 'Plugin {name} change verification build'
-    defaults: verifier-template-bazel
-    project-type: multibranch
-    scm:
-      - gerrit:
-          url: https://gerrit-review.googlesource.com/a/plugins/{name}
-          credentials-id: gerrit.googlesource.com
-          refspecs:
-            - '+refs/heads/*:refs/remotes/origin/*'
-          filter-checks:
-            query-operator: 'SCHEME'
-            query-string: 'gerritforge'
-          property-strategies:
-            all-branches:
-              - suppress-scm-triggering: false
-              - pipeline-branch-durability-override: max-survivability
-
-- job-template:
-    name: 'module-{name}-verifier'
-    description: 'Module {name} change verification build'
-    defaults: verifier-template-bazel
-    project-type: multibranch
-    scm:
-      - gerrit:
-          url: https://gerrit-review.googlesource.com/a/modules/{name}
-          credentials-id: gerrit.googlesource.com
-          refspecs:
-            - '+refs/heads/*:refs/remotes/origin/*'
-          filter-checks:
-            query-operator: 'SCHEME'
-            query-string: 'gerritforge'
-          property-strategies:
-            all-branches:
-              - suppress-scm-triggering: false
-              - pipeline-branch-durability-override: max-survivability
-
-- job-template:
-    name: 'plugin-{name}-bazel-{branch}'
-    description: 'Plugin {name} {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    node: bazel-debian
-    class: plugins
-    project-name: plugins%2F{name}
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar,
-            bazel-bin/plugins/{name}/{name}.jar-version,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- job-template:
-    name: 'ui-plugin-{name}-bazel-{branch}'
-    description: 'UI Plugin {name} {branch} branch build with Bazel'
-    defaults: plugin-template-bazel
-    node: bazel-debian
-    class: plugins
-    project-name: plugins%2F{name}
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.js,
-            bazel-bin/plugins/{name}/{name}.html,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- job-template:
-    name: 'ui-plugin-{name}-bazel-{branch}-{gerrit-branch}'
-    description: 'UI Plugin {name} {branch} branch build with Bazel for Gerrit {gerrit-branch}'
-    defaults: plugin-template-bazel
-    node: bazel-debian
-    class: plugins
-    project-name: plugins%2F{name}
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.js,
-            bazel-bin/plugins/{name}/{name}.html,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- job-template:
-    name: 'plugin-{name}-bazel-{branch}-{gerrit-branch}'
-    class: plugins
-    node: bazel-debian
-    description: 'Plugin {name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
-    defaults: plugin-template-bazel
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - '*/{branch}'
-          skip-tag: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar,
-            bazel-bin/plugins/{name}/{name}.jar-version,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- job-template:
-    name: 'module-{name}-bazel-{branch}-{gerrit-branch}'
-    class: modules
-    node: bazel-debian
-    description: 'Lib module {name} {branch} branch Bazel build for Gerrit {gerrit-branch}'
-    defaults: plugin-template-bazel
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/modules/{name}
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - '*/{branch}'
-          skip-tag: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin-branch.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar,
-            bazel-bin/plugins/{name}/{name}.jar-version,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- job-template:
-    name: 'module-{name}-bazel-{branch}'
-    class: modules
-    node: bazel-debian
-    description: 'Lib module {name} {branch} branch Bazel build'
-    defaults: plugin-template-bazel
-    extra-artifacts: ''
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/modules/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - '*/{branch}'
-          skip-tag: true
-          do-not-fetch-tags: true
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build-plugin.sh
-      - shell: !include-raw: gerrit-bazel-get-project-info.sh
-    publishers:
-      - archive:
-          artifacts: >
-            bazel-bin/plugins/{name}/{name}.jar,
-            bazel-bin/plugins/{name}/{name}.jar-version,
-            bazel-bin/plugins/{name}/{name}.json,
-            {extra-artifacts}
-
-- view-template:
-    name: 'Plugins-{branch}'
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-    regex: '(ui-plugin|plugin|module)-.+-{branch}'
-
-- project:
-    name: 'plugin-views'
-    views:
-      - 'Plugins-{branch}'
-    branch:
-      - master
-      - stable-3.4
-      - stable-3.3
-      - stable-3.2
-      - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml b/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
deleted file mode 100644
index 3c5603a..0000000
--- a/jenkins/gerrit-bazel-plugin-uploadvalidator.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: uploadvalidator
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-verify-status.yaml b/jenkins/gerrit-bazel-plugin-verify-status.yaml
deleted file mode 100644
index 3dcca86..0000000
--- a/jenkins/gerrit-bazel-plugin-verify-status.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: verify-status
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
diff --git a/jenkins/gerrit-bazel-plugin-webhooks.yaml b/jenkins/gerrit-bazel-plugin-webhooks.yaml
deleted file mode 100644
index b80210e..0000000
--- a/jenkins/gerrit-bazel-plugin-webhooks.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: webhooks
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-websession-broker.yaml b/jenkins/gerrit-bazel-plugin-websession-broker.yaml
deleted file mode 100644
index 9a5fe79..0000000
--- a/jenkins/gerrit-bazel-plugin-websession-broker.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- project:
-    name: websession-broker
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-3.3
-            - stable-3.2
diff --git a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml b/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
deleted file mode 100644
index ffabaf1..0000000
--- a/jenkins/gerrit-bazel-plugin-websession-flatfile.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-- project:
-    name: websession-flatfile
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - stable-2.15
-            - stable-2.14
diff --git a/jenkins/gerrit-bazel-plugin-x-docs.yaml b/jenkins/gerrit-bazel-plugin-x-docs.yaml
deleted file mode 100644
index e25fe92..0000000
--- a/jenkins/gerrit-bazel-plugin-x-docs.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: x-docs
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml b/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
deleted file mode 100644
index d307347..0000000
--- a/jenkins/gerrit-bazel-plugin-zookeeper-refdb.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: zookeeper-refdb
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          targets: "plugins/{name}:{name} plugins/{name}:{name}-zk-3.5"
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-          extra-artifacts: 'bazel-bin/plugins/{name}/{name}-zk-3.5.jar'
-      - 'plugin-{name}-verifier'
diff --git a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml b/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
deleted file mode 100644
index 23403a0..0000000
--- a/jenkins/gerrit-bazel-plugin-zuul-results-summary.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: zuul-results-summary
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - main
-          gerrit-branch:
-            - master
-            - stable-3.4
-            - stable-3.3
diff --git a/jenkins/gerrit-bazel-plugin-zuul-status.yaml b/jenkins/gerrit-bazel-plugin-zuul-status.yaml
deleted file mode 100644
index 8fc988e..0000000
--- a/jenkins/gerrit-bazel-plugin-zuul-status.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- project:
-    name: zuul-status
-    jobs:
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-2.16
diff --git a/jenkins/gerrit-bazel-plugin-zuul.yaml b/jenkins/gerrit-bazel-plugin-zuul.yaml
deleted file mode 100644
index 8982f95..0000000
--- a/jenkins/gerrit-bazel-plugin-zuul.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: zuul
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-bazel-template.yaml b/jenkins/gerrit-bazel-template.yaml
deleted file mode 100644
index 8b28a14..0000000
--- a/jenkins/gerrit-bazel-template.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-- defaults:
-    name: gerrit-bazel-defaults
-    node: bazel-debian
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          url: https://gerrit.googlesource.com/a/gerrit
-          credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          basedir: gerrit
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    wrappers:
-      - timeout:
-          timeout: 120
-          type: absolute
-          fail: false
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    builders:
-      - set-git-credentials
-      - shell: !include-raw: gerrit-bazel-build.sh
-      - shell: !include-raw-escape: set-docker-host.sh
-      - shell: !include-raw: gerrit-bazel-test.sh
-      - shell: !include-raw-escape: gerrit-bazel-cat-test-log.sh
-      - shell: !include-raw: gerrit-deploy-api.sh
-    publishers:
-      - archive:
-          artifacts: >
-            gerrit/bazel-bin/*.war,gerrit/bazel-bin/plugins/*/*.jar,
-            gerrit/bazel-bin/*api/*api.jar,
-            gerrit/bazel-bin/gerrit-acceptance-framework/*.jar
-          excludes: 'gerrit/bazel-bin/plugins/core*/**/*.jar'
-
-- job-template:
-    name: 'Gerrit-bazel-{branch}'
-    description: '{name} {branch} branch build with Bazel'
-    defaults: gerrit-bazel-defaults
-    node: bazel-debian
-    properties:
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
-
-- job-template:
-    name: 'Gerrit-bazel-java11-stable-{ver}'
-    branch: stable-3.2
-    description: '{name} stable-{ver} branch build with Bazel and Java 11'
-    defaults: gerrit-bazel-defaults
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--host_javabase=@bazel_tools//tools/jdk:remote_jdk11
-            --javabase=@bazel_tools//tools/jdk:remote_jdk11
-            --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
-            --java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
-
-- job-template:
-    name: 'Gerrit-bazel-java11-{branch}'
-    description: '{name} {branch} branch build with Bazel'
-    defaults: gerrit-bazel-defaults
-    node: bazel-debian
-    properties:
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--host_javabase=@bazel_tools//tools/jdk:remote_jdk11
-            --javabase=@bazel_tools//tools/jdk:remote_jdk11
-            --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_java11
-
-- project:
-    name: Gerrit-bazel
-    branch:
-      - stable-3.2
-      - stable-2.16
-    jobs:
-      - 'Gerrit-bazel-{branch}'
-
-- project:
-    name: Gerrit-bazel-java11
-    branch:
-      - master
-      - stable-3.4
-      - stable-3.3
-    jobs:
-      - 'Gerrit-bazel-java11-{branch}'
-
-- project:
-    name: Gerrit-bazel-java11-stable-3.2
-    ver:
-      - 3.2
-    jobs:
-      - 'Gerrit-bazel-java11-stable-{ver}'
-
-- view:
-    name: Gerrit
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-    regex: 'Gerrit-.*'
diff --git a/jenkins/gerrit-bazel-test.sh b/jenkins/gerrit-bazel-test.sh
deleted file mode 100755
index c474c98..0000000
--- a/jenkins/gerrit-bazel-test.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash -e
-
-. set-java.sh 8
-
-cd gerrit
-
-if git show --diff-filter=AM --name-only --pretty="" HEAD | grep -q .bazelversion
-then
-  export BAZEL_OPTS=""
-fi
-
-export BAZEL_OPTS="$BAZEL_OPTS \
-                   --flaky_test_attempts 3 \
-                   --test_timeout 3600 \
-                   --test_tag_filters=-flaky \
-                   --test_env DOCKER_HOST=$DOCKER_HOST"
-export WCT_HEADLESS_MODE=1
-
-java -fullversion
-bazelisk version
-
-if [ "{branch}" == "stable-2.16" ]
-then
-  echo 'Test in ReviewDb mode'
-  echo '----------------------------------------------'
-  bazelisk test --test_env=GERRIT_NOTEDB=OFF $BAZEL_OPTS //...
-fi
-
-echo 'Test in NoteDb mode'
-echo '----------------------------------------------'
-bazelisk test --test_env=GERRIT_NOTEDB=ON $BAZEL_OPTS //...
-
-echo "Test PolyGerrit locally in $(google-chrome --version)"
-echo '----------------------------------------------'
-bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
-
-if [ -z "$SAUCE_USERNAME" ] || [ -z "$SAUCE_ACCESS_KEY" ]
-then
-  echo 'Not running on Sauce Labs because env vars are not set.'
-else
-  echo 'Test PolyGerrit on Sauce Labs'
-  echo '----------------------------------------------'
-  WCT_ARGS='--plugin sauce' bash ./polygerrit-ui/app/run_test.sh || touch ~/polygerrit-failed
-fi
-
-exit 0
diff --git a/jenkins/gerrit-bazel-verifier-test.sh b/jenkins/gerrit-bazel-verifier-test.sh
old mode 100755
new mode 100644
index d1da4e6..673cc78
--- a/jenkins/gerrit-bazel-verifier-test.sh
+++ b/jenkins/gerrit-bazel-verifier-test.sh
@@ -8,7 +8,7 @@
 echo '----------------------------------------------'
 
 case $TARGET_BRANCH$MODE in
-  masterrbe|stable-3.4rbe)
+  masterrbe|stable-3.4rbe|stable-3.4-2021-07.sticky-approvalsrbe)
     TEST_TAG_FILTER="-flaky,-elastic,-git-protocol-v2"
     BAZEL_OPTS="--config=remote --remote_instance_name=projects/api-project-164060093628/instances/default_instance"
     ;;
diff --git a/jenkins/gerrit-ci-scripts.yaml b/jenkins/gerrit-ci-scripts.yaml
index 3c815bc..65649dd 100644
--- a/jenkins/gerrit-ci-scripts.yaml
+++ b/jenkins/gerrit-ci-scripts.yaml
@@ -7,7 +7,7 @@
           url: https://gerrit.googlesource.com/a/gerrit-ci-scripts
           credentials-id: gerrit.googlesource.com
           branches:
-            - '*/master'
+            - '*/private'
           skip-tag: true
     triggers:
       - pollscm:
@@ -24,7 +24,7 @@
           url: https://gerrit.googlesource.com/a/gerrit-ci-scripts
           credentials-id: gerrit.googlesource.com
           branches:
-            - '*/master'
+            - '*/private'
           skip-tag: true
     triggers:
       - timed: '@midnight'
@@ -83,21 +83,3 @@
           else
             jenkins-jobs update --delete-old jenkins
           fi
-
-- job:
-    name: gerrit-ci-scripts-pipeline
-    description: Multi-branch pipeline to validate Gerrit's Jenkins Job Builder Scripts
-    project-type: multibranch
-    node: master
-    scm:
-      - gerrit:
-          url: https://gerrit-review.googlesource.com/a/gerrit-ci-scripts
-          credentials-id: gerrit.googlesource.com
-          refspecs:
-            - '+refs/heads/*:refs/remotes/@{remote}/*'
-            - '+refs/changes/*:refs/remotes/@{remote}/*'
-          property-strategies:
-            all-branches:
-              - suppress-scm-triggering: false
-              - pipeline-branch-durability-override: max-survivability
-    periodic-folder-trigger: 10m
diff --git a/jenkins/gerrit-deploy-api.sh b/jenkins/gerrit-deploy-api.sh
deleted file mode 100644
index c34ddae..0000000
--- a/jenkins/gerrit-deploy-api.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -xe
-
-cd gerrit 
-
-VERSION=$(([ -f VERSION ] && grep VERSION VERSION) || ([ -f version.bzl ] && \
-          grep VERSION version.bzl) || echo "")
-if ! expr "$VERSION" : '.*SNAPSHOT.*'
-then
-  echo "Release build: not publishing the API to Snapshot Repository"
-  exit 0
-fi
-
-#if [ -f ~/.m2/settings.xml ]
-#then
-#  if grep -q sonatype-nexus-staging ~/.m2/settings.xml
-#  then
-#    echo "Deploying artifacts to Maven ..."
-#    ./tools/maven/api.sh deploy
-#    echo "DONE"
-#  fi
-#fi
diff --git a/jenkins/gerrit-mvn-build-plugin.sh b/jenkins/gerrit-mvn-build-plugin.sh
deleted file mode 100644
index ace9e1d..0000000
--- a/jenkins/gerrit-mvn-build-plugin.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-git checkout -f -b gerrit-master gerrit/{branch}
-git submodule update --init
-java -fullversion
-bazelisk version
-bazelisk build $BAZEL_OPTS api
-./tools/maven/api.sh install
-
-git checkout -f origin/{branch}
-mvn package
-
-# Extract version information
-PLUGIN_JARS=$(find . -name '{repo}*jar')
-for jar in $PLUGIN_JARS
-do
-  PLUGIN_VERSION=$(git describe  --always origin/{branch})
-  echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-  jar ufm $jar MANIFEST.MF && rm MANIFEST.MF
-
-  echo "$PLUGIN_VERSION" > $jar-version
-
-  curl -L https://gerrit-review.googlesource.com/projects/plugins%2F{repo}/config | \
-     tail -n +2 > $(dirname $jar)/$(basename $jar .jar).json
-
-done
diff --git a/jenkins/gerrit-mvn-plugin-github.yaml b/jenkins/gerrit-mvn-plugin-github.yaml
deleted file mode 100644
index 3d58ff5..0000000
--- a/jenkins/gerrit-mvn-plugin-github.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- project:
-    name: github-mvn
-    repo: github
-    branch:
-      - master
-      - stable-3.4
-      - stable-3.3
-      - stable-3.2
-      - stable-2.16
-    jobs:
-      - 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-mvn-plugin-maintainer.yaml b/jenkins/gerrit-mvn-plugin-maintainer.yaml
deleted file mode 100644
index 8341dd3..0000000
--- a/jenkins/gerrit-mvn-plugin-maintainer.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: maintainer-mvn
-    repo: maintainer
-    branch:
-      - master
-    jobs:
-      - 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-mvn-plugin-manifest-subscription.yaml b/jenkins/gerrit-mvn-plugin-manifest-subscription.yaml
deleted file mode 100644
index 6b4d580..0000000
--- a/jenkins/gerrit-mvn-plugin-manifest-subscription.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-- project:
-    name: manifest-subscription-mvn
-    repo: manifest-subscription
-    branch:
-      - master
-    jobs:
-      - 'plugin-{repo}-mvn-{branch}'
diff --git a/jenkins/gerrit-mvn-plugin-template.yaml b/jenkins/gerrit-mvn-plugin-template.yaml
deleted file mode 100644
index 5f2fdbc..0000000
--- a/jenkins/gerrit-mvn-plugin-template.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job-template:
-    name: 'plugin-{repo}-mvn-{branch}'
-    description: 'Plugin {repo} {branch} branch build with Maven'
-    node: mvn
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-      - inject:
-          properties-content: >
-            BAZEL_OPTS=--java_toolchain=//tools:error_prone_warnings_toolchain
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{repo}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - set-git-credentials
-      - shell:
-          !include-raw: gerrit-mvn-build-plugin.sh
-    publishers:
-      - archive:
-          artifacts: '**/target/{repo}*.jar*,**/target/{repo}*.json'
diff --git a/jenkins/gerrit-plugin-saml.yaml b/jenkins/gerrit-plugin-saml.yaml
deleted file mode 100644
index fb5fe64..0000000
--- a/jenkins/gerrit-plugin-saml.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- project:
-    name: saml
-    jobs:
-      - 'plugin-{name}-bazel-{branch}':
-          branch:
-            - master
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
-      - 'plugin-{name}-bazel-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - stable-3.4
diff --git a/jenkins/gerrit-sbt-build-app.sh b/jenkins/gerrit-sbt-build-app.sh
deleted file mode 100644
index 6ceb8a9..0000000
--- a/jenkins/gerrit-sbt-build-app.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-sbt -no-colors {targets}
-
-# Extract version information
-JARS=$(find . -name '{name}*jar')
-for jar in $JARS
-do
-  VERSION=$(git describe  --always origin/{branch})
-  echo -e "Implementation-Version: $VERSION" > MANIFEST.MF
-  jar ufm $jar MANIFEST.MF && rm MANIFEST.MF
-
-  echo "$VERSION" > $jar-version
-
-  curl -L https://gerrit-review.googlesource.com/projects/apps%2F{name}/config | \
-     tail -n +2 > $(dirname $jar)/$(basename $jar .jar).json
-done
diff --git a/jenkins/gerrit-sbt-build-branch-plugin.sh b/jenkins/gerrit-sbt-build-branch-plugin.sh
deleted file mode 100644
index 5f59c7d..0000000
--- a/jenkins/gerrit-sbt-build-branch-plugin.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -e
-
-. set-java.sh 8
-
-java -fullversion
-bazelisk version
-
-git checkout -f -b gerrit-master gerrit/{gerrit-branch}
-git submodule update --init
-git fetch --tags origin
-bazelisk build api
-./tools/maven/api.sh install
-
-git checkout -f origin/{branch}
-sbt -no-colors compile test assembly
-
-# Extract version information
-PLUGIN_JARS=$(find . -name '{name}*jar')
-for jar in $PLUGIN_JARS
-do
-  PLUGIN_VERSION=$(git describe  --always origin/{branch})
-  echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-  jar ufm $jar MANIFEST.MF && rm MANIFEST.MF
-
-  echo "$PLUGIN_VERSION" > $jar-version
-
-  curl -L https://gerrit-review.googlesource.com/projects/plugins%2F{name}/config | \
-     tail -n +2 > $(dirname $jar)/$(basename $jar .jar).json
-done
diff --git a/jenkins/gerrit-sbt-build-plugin.sh b/jenkins/gerrit-sbt-build-plugin.sh
deleted file mode 100644
index c65edd0..0000000
--- a/jenkins/gerrit-sbt-build-plugin.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -e
-
-case "{branch}" in
-  stable-2.16|stable-3.2)
-    . set-java.sh 8
-    ;;
-  *)
-    . set-java.sh 11
-    ;;
-esac
-
-java -fullversion
-bazelisk version
-
-git checkout -f -b gerrit-master gerrit/{branch}
-git submodule update --init
-bazelisk build api
-./tools/maven/api.sh install
-
-git checkout -f origin/{branch}
-sbt -no-colors compile test assembly
-
-# Extract version information
-PLUGIN_JARS=$(find . -name '{name}*jar')
-for jar in $PLUGIN_JARS
-do
-  PLUGIN_VERSION=$(git describe  --always origin/{branch})
-  echo -e "Implementation-Version: $PLUGIN_VERSION" > MANIFEST.MF
-  jar ufm $jar MANIFEST.MF && rm MANIFEST.MF
-
-  echo "$PLUGIN_VERSION" > $jar-version
-
-  curl -L https://gerrit-review.googlesource.com/projects/plugins%2F{name}/config | \
-     tail -n +2 > $(dirname $jar)/$(basename $jar .jar).json
-done
diff --git a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml b/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
deleted file mode 100644
index 7b43878..0000000
--- a/jenkins/gerrit-sbt-plugin-analytics-wizard.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: analytics-wizard
-    jobs:
-      - 'plugin-{name}-sbt-{branch}-{gerrit-branch}':
-          branch:
-            - master
-          gerrit-branch:
-            - master
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-sbt-plugin-analytics.yaml b/jenkins/gerrit-sbt-plugin-analytics.yaml
deleted file mode 100644
index 368427b..0000000
--- a/jenkins/gerrit-sbt-plugin-analytics.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    name: analytics
-    jobs:
-      - 'plugin-{name}-sbt-{branch}':
-          branch:
-            - master
-            - stable-3.4
-            - stable-3.3
-            - stable-3.2
-            - stable-2.16
diff --git a/jenkins/gerrit-sbt-plugin-gerrit-support.yaml b/jenkins/gerrit-sbt-plugin-gerrit-support.yaml
deleted file mode 100644
index 04b940e..0000000
--- a/jenkins/gerrit-sbt-plugin-gerrit-support.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- project:
-    name: gerrit-support
-    jobs:
-      - 'plugin-{name}-sbt-{branch}':
-          branch:
-            - master
diff --git a/jenkins/gerrit-sbt-plugin-template.yaml b/jenkins/gerrit-sbt-plugin-template.yaml
deleted file mode 100644
index c865e09..0000000
--- a/jenkins/gerrit-sbt-plugin-template.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-- defaults:
-    name: sbt-build-defaults
-    node: sbt
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-      - credentials-binding:
-          - username-password-separated:
-              credential-id: gerrit.googlesource.com
-              username: GS_GIT_USER
-              password: GS_GIT_PASS
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          remotes:
-            - origin:
-                url: https://gerrit.googlesource.com/a/plugins/{name}
-                credentials-id: gerrit.googlesource.com
-            - gerrit:
-                url: https://gerrit.googlesource.com/a/gerrit
-                credentials-id: gerrit.googlesource.com
-          branches:
-            - origin/{branch}
-          submodule:
-            recursive: true
-            parent-credentials: true
-          skip-tag: true
-          do-not-fetch-tags: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - set-git-credentials
-      - shell:
-          !include-raw: gerrit-sbt-build-branch-plugin.sh
-    publishers:
-      - archive:
-          artifacts: '**/target/**/*{name}*.jar*,**/target/**/*{name}*.json'
-
-- job-template:
-    name: 'plugin-{name}-sbt-{branch}-{gerrit-branch}'
-    description: 'Plugin {name} {branch} branch build with Sbt on top of Gerrit {gerrit-branch}'
-    defaults: sbt-build-defaults
-    builders:
-      - set-git-credentials
-      - shell:
-          !include-raw: gerrit-sbt-build-branch-plugin.sh
-
-- job-template:
-    name: 'plugin-{name}-sbt-{branch}'
-    description: 'Plugin {name} build with Sbt on top of Gerrit {branch}'
-    defaults: sbt-build-defaults
-    builders:
-      - set-git-credentials
-      - shell:
-          !include-raw: gerrit-sbt-build-plugin.sh
diff --git a/jenkins/gerrit-verifier-postbuild.groovy b/jenkins/gerrit-verifier-postbuild.groovy
deleted file mode 100644
index ce2ad81..0000000
--- a/jenkins/gerrit-verifier-postbuild.groovy
+++ /dev/null
@@ -1,5 +0,0 @@
-def timedOut = manager.logContains("timed out")
-if (timedOut)
-{
-  manager.buildAborted()
-}
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 81b5739..ecb07ab 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -80,7 +80,7 @@
             --java_toolchain=//tools:error_prone_warnings_toolchain
     scm:
       - git:
-          url: https://gerrit.googlesource.com/a/gerrit
+          url: https://gerrit.googlesource.com/a/gerrit-security-fixes
           credentials-id: gerrit.googlesource.com
           refspec: $REFSPEC
           branches:
@@ -185,7 +185,7 @@
     prune-dead-branches: true
     scm:
       - gerrit:
-          url: https://gerrit-review.googlesource.com/a/gerrit
+          url: https://gerrit-review.googlesource.com/a/gerrit-security-fixes
           credentials-id: gerrit.googlesource.com
           refspecs:
             - '+refs/heads/*:refs/remotes/@{remote}/*'
diff --git a/jenkins/gitblit-ant-build.sh b/jenkins/gitblit-ant-build.sh
deleted file mode 100755
index eae45fe..0000000
--- a/jenkins/gitblit-ant-build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -ex
-
-git checkout origin/{branch}
-
-GITBLIT_LINE=$(grep com.gitblit external_plugin_deps.bzl)
-if expr "$GITBLIT_LINE" : '.*[0-9\.]*-SNAPSHOT.*'
-then
-  GITBLIT_REF=refs/heads/master
-else
-  GITBLIT_REF=refs/tags/v$(expr "$GITBLIT_LINE" : '[^:]*:[^:]*:\([0-9\.]*\)')
-fi
-
-git fetch gitblit $GITBLIT_REF && git checkout FETCH_HEAD
-ant -DresourceFolderPrefix=static installMaven
diff --git a/jenkins/gitiles-webapp.yaml b/jenkins/gitiles-webapp.yaml
deleted file mode 100644
index 386d06d..0000000
--- a/jenkins/gitiles-webapp.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-- job:
-    name: gitiles-webapp
-    description: Builds gitiles webapp from master
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          credentials-id: gerrit.googlesource.com
-          url: https://gerrit.googlesource.com/a/gitiles
-          branches:
-            - master
-          skip-tag: true
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-    builders:
-      - shell: |
-          set +x
-          . set-java.sh 8
-          echo "Building gitiles webapp master"
-          echo '=============================='
-          bazelisk version
-          bazelisk build //...
-          bazelisk test //...
-    publishers:
-      - archive:
-          artifacts: 'bazel-bin/gitiles.war'
diff --git a/jenkins/homepage.yaml b/jenkins/homepage.yaml
deleted file mode 100644
index 6b3f38d..0000000
--- a/jenkins/homepage.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- job:
-    name: homepage
-    project-type: pipeline
-    pipeline-scm:
-      scm:
-        - git:
-            credentials-id: gerrit.googlesource.com
-            url: https://gerrit.googlesource.com/a/homepage
-            branches:
-              - master
-    triggers:
-      - pollscm:
-          cron: "H/20 * * * *"
-      - timed: "@midnight"
diff --git a/jenkins/jgit.yaml b/jenkins/jgit.yaml
deleted file mode 100644
index 0c4ab86..0000000
--- a/jenkins/jgit.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: 'jgit-master'
-    description: 'JGit Bazel build on master'
-    node: bazel-debian
-    wrappers:
-      - timeout:
-          timeout: 30
-          fail: true
-      - timestamps
-    properties:
-      - build-discarder:
-          days-to-keep: 20
-          artifact-days-to-keep: 20
-      - authorization:
-          anonymous:
-            - job-discover
-            - job-read
-            - job-extended-read
-    scm:
-      - git:
-          url: git://git.eclipse.org/gitroot/jgit/jgit
-          branches:
-            - 'master'
-          skip-tag: true
-
-    triggers:
-      - pollscm:
-          cron: 'H/50 * * * *'
-
-    builders:
-      - shell: |
-          set +x
-          . set-java.sh 8
-          echo 'Building jgit on master'
-          echo '======================='
-          bazelisk version
-          bazelisk build all
-          bazelisk test //...
-    publishers:
-      - archive:
-          artifacts: 'bazel-bin/all.zip'
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index 11090fc..a30c24b 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.4") {
+    if (env.GERRIT_BRANCH == "master" || env.GERRIT_BRANCH == "stable-3.4" || env.GERRIT_BRANCH == "stable-3.4-2021-07.sticky-approvals") {
         Builds.modes = ["notedb", "rbe"]
     } else if (env.GERRIT_BRANCH ==~ /stable-3.[0-3]/) {
         Builds.modes = ["notedb"]