commit ba1be22bb842e8879ea1ced3ed204e8835e494e7
author Patrick Hiesel <hiesel@google.com> Thu Mar 24 13:48:16 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 24 13:48:16 2022 +0000
tree 4321e9b9cbd480cfd4e49928b40670a8a8d447f2
parent d4b632aebd032ebf9526c3b24d5f66022f61721a
parent 4ab3dc9a3c9dd332e2b9e38424417f70e052b021

Merge "README: rename to markdown"

roles/bazelisk-build/tasks/main.yaml

diff --git a/roles/bazelisk-build/tasks/main.yaml b/roles/bazelisk-build/tasks/main.yaml
index c65f54e..3bc6c7f 100644
--- a/roles/bazelisk-build/tasks/main.yaml
+++ b/roles/bazelisk-build/tasks/main.yaml
@@ -2,14 +2,14 @@
   shell: |
     java -fullversion
     {{ bazelisk_executable }} version
-    {{ bazelisk_executable }} build --java_toolchain=//tools:error_prone_warnings_toolchain {{ bazelisk_targets }}
+    {{ bazelisk_executable }} build {{ bazelisk_targets }}
   args:
     executable: /bin/bash
     chdir: "{{ zuul_work_dir }}"
 - name: Run bazelisk test
   when: "bazelisk_test_targets != ''"
   shell: |
-    {{ bazelisk_executable }} test --java_toolchain=//tools:error_prone_warnings_toolchain --test_output=errors --test_summary=detailed --flaky_test_attempts=3 {{ bazelisk_test_targets }}
+    {{ bazelisk_executable }} test --test_output=errors --test_summary=detailed --flaky_test_attempts=3 {{ bazelisk_test_targets }}
   args:
     executable: /bin/bash
     chdir: "{{ zuul_work_dir }}"

zuul.d/project.yaml

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 41c8331..12c9c7c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,8 +7,6 @@
         - test-install-build-essential
         - test-gerrit-plugin-build
         - test-gerrit-build-master
+        - test-gerrit-build-stable-3.5
+        - test-gerrit-build-stable-3.4
         - test-gerrit-build-stable-3.3
-        - test-gerrit-build-stable-3.2
-        - test-gerrit-build-stable-3.1
-        - test-gerrit-build-stable-3.0
-        - test-gerrit-build-stable-2.16

zuul.d/test-jobs.yaml

diff --git a/zuul.d/test-jobs.yaml b/zuul.d/test-jobs.yaml
index 7015165..9f082ee 100644
--- a/zuul.d/test-jobs.yaml
+++ b/zuul.d/test-jobs.yaml
@@ -71,26 +71,16 @@
       - playbooks/gerrit/.*
 
 - job:
+    name: test-gerrit-build-stable-3.5
+    parent: test-gerrit-build-master
+    override-checkout: stable-3.5
+
+- job:
+    name: test-gerrit-build-stable-3.4
+    parent: test-gerrit-build-master
+    override-checkout: stable-3.4
+
+- job:
     name: test-gerrit-build-stable-3.3
     parent: test-gerrit-build-master
     override-checkout: stable-3.3
-
-- job:
-    name: test-gerrit-build-stable-3.2
-    parent: test-gerrit-build-master
-    override-checkout: stable-3.2
-
-- job:
-    name: test-gerrit-build-stable-3.1
-    parent: test-gerrit-build-master
-    override-checkout: stable-3.1
-
-- job:
-    name: test-gerrit-build-stable-3.0
-    parent: test-gerrit-build-master
-    override-checkout: stable-3.0
-
-- job:
-    name: test-gerrit-build-stable-2.16
-    parent: test-gerrit-build-master
-    override-checkout: stable-2.16