1 files changed, 29 insertions, 26 deletions
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 96063359..5ff8b9ad 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -77,12 +77,18 @@ builder_mixins {
 }
 
 builder_mixins {
-  name: "linux"
-  dimensions: "os:Ubuntu-16.04"
+  name: "cast_standalone"
+  recipe {
+    properties_j: "have_ffmpeg:true"
+    properties_j: "have_libsdl2:true"
+    properties_j: "have_libopus:true"
+    properties_j: "have_libvpx:true"
+    properties_j: "cast_allow_developer_certificate:true"
+  }
 }
 
 builder_mixins {
-  name: "linux1804"
+  name: "linux"
   dimensions: "os:Ubuntu-18.04"
 }
 
@@ -193,16 +199,6 @@ buckets {
           }
         EOF
         properties_j: <<EOF
-          $recipe_engine/isolated: {
-            "server": "https://isolateserver.appspot.com"
-          }
-        EOF
-        properties_j: <<EOF
-          $recipe_engine/cas: {
-            "instance": "chromium-swarm"
-          }
-        EOF
-        properties_j: <<EOF
           $recipe_engine/swarming: {
             "server": "https://chromium-swarm.appspot.com"
           }
@@ -223,7 +219,7 @@ buckets {
 
     builders {
       name: "linux64_gcc_debug"
-      mixins: "linux1804"
+      mixins: "linux"
       mixins: "debug"
       mixins: "x64"
       mixins: "gcc"
@@ -290,6 +286,15 @@ buckets {
       mixins: "ci"
       mixins: "goma_rbe_ats"
     }
+
+    builders {
+      name: "linux64_cast_e2e"
+      mixins: "linux"
+      mixins: "debug"
+      mixins: "x64"
+      mixins: "cast_standalone"
+      mixins: "goma_rbe_ats"
+    }
   }
 }
 
@@ -311,16 +316,6 @@ buckets: {
           }
         EOF
         properties_j: <<EOF
-          $recipe_engine/isolated: {
-            "server": "https://isolateserver.appspot.com"
-          }
-        EOF
-        properties_j: <<EOF
-          $recipe_engine/cas: {
-            "instance": "chromium-swarm"
-          }
-        EOF
-        properties_j: <<EOF
           $recipe_engine/swarming: {
             "server": "https://chromium-swarm.appspot.com"
           }
@@ -340,7 +335,7 @@ buckets: {
 
     builders {
       name: "linux64_gcc_debug"
-      mixins: "linux1804"
+      mixins: "linux"
       mixins: "debug"
       mixins: "x64"
       mixins: "gcc"
@@ -411,6 +406,14 @@ buckets: {
       mixins: "code_coverage"
       mixins: "goma_rbe_ats"
     }
+
+    builders {
+      name: "linux64_cast_e2e"
+      mixins: "linux"
+      mixins: "debug"
+      mixins: "x64"
+      mixins: "cast_standalone"
+      mixins: "goma_rbe_ats"
+    }
   }
 }
-