Merge "Add .bazelrc and force color"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index bacd823..37c9a2e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -5,9 +5,6 @@
         - test-gerrit-setup
         - test-gerrit-plugin-build
         - test-gerrit-build-master
-        - test-gerrit-build-stable-3.5
-        - test-gerrit-build-stable-3.6
-        - test-gerrit-build-stable-3.7
         - test-gerrit-build-stable-3.8
         - test-gerrit-build-stable-3.9
         - test-gerrit-build-stable-3.10
diff --git a/zuul.d/test-jobs.yaml b/zuul.d/test-jobs.yaml
index 503bb26..b6a608f 100644
--- a/zuul.d/test-jobs.yaml
+++ b/zuul.d/test-jobs.yaml
@@ -64,22 +64,6 @@
       - roles/copy-plugin-deps/.*
       - playbooks/gerrit/.*
 
-# TODO remove unsupported stable gerrit builds.
-- 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.6
-    parent: test-gerrit-build-master
-    override-checkout: stable-3.6
-
-- job:
-    name: test-gerrit-build-stable-3.7
-    parent: test-gerrit-build-master
-    override-checkout: stable-3.7
-
 - job:
     name: test-gerrit-build-stable-3.8
     parent: test-gerrit-build-master