Add infra ci and try builders using infra accounts

Change-Id: If902e4de9a30fe7f7b90f01df99d13773ac4ac83
diff --git a/services/cr-buildbucket.cfg b/services/cr-buildbucket.cfg
index 9d8baf5..c6817b5 100644
--- a/services/cr-buildbucket.cfg
+++ b/services/cr-buildbucket.cfg
@@ -119,6 +119,22 @@
 }
 
 builder_mixins {
+  name: "infra-ci"
+  service_account: "infra-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
+  recipe {
+    properties_j: "$kitchen:{\"git_auth\": true, \"devshell\": true}"
+  }
+}
+
+builder_mixins {
+  name: "infra-try"
+  service_account: "infra-try-builder@fuchsia-infra.iam.gserviceaccount.com"
+  recipe {
+    properties_j: "$kitchen:{\"git_auth\": true}"
+  }
+}
+
+builder_mixins {
   name: "ledger"
   dimensions: "os:Linux"
   dimensions: "kvm:1"
@@ -609,6 +625,17 @@
     }
 
     builders {
+      category: "Infra"
+      name: "infra-x64-linux"
+      mixins: "infra-ci"
+      dimensions: "os:Linux"
+      recipe {
+        name: "infra",
+        properties: "remote:https://fuchsia.googlesource.com/infra/infra"
+      }
+    }
+
+    builders {
       category: "Jiri"
       name: "jiri-x86_64-linux"
       mixins: "jiri"
@@ -1121,7 +1148,7 @@
     builders {
       category: "Infra"
       name: "infra-x64-linux"
-      mixins: "tools-ci"
+      mixins: "infra-try"
       dimensions: "os:Linux"
       recipe {
         name: "infra",