luci: compile+test+luci configurations for android-marshmallow-arm64-…

…rel. Bug: 731985,790706 Change-Id: I3a0e3de9e5fbc883e6a42035b4aa9cf10f9e6814 Reviewed-on: https://chromium-review.googlesource.com/1066180 Commit-Queue: John Budorick <jbudorick@chromium.org> Reviewed-by: Ben Pastene <bpastene@chromium.org> Cr-Commit-Position: refs/heads/master@{#560193}
Denger-Network · May 20, 2018 · 8c4a989 · 8c4a989
1 parent a368c70
commit 8c4a989
Show file tree

Hide file tree

Showing 7 changed files with 2,185 additions and 11 deletions.
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
@@ -628,6 +628,12 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
     }
 
+    builders {
+      name: "android-marshmallow-arm64-rel"
+      mixins: "android-ci"
+      dimensions: "os:Ubuntu-14.04"
+    }
+
     builders {
       name: "Cast Android (dbg)"
       mixins: "android-ci"
@@ -1428,11 +1434,6 @@ buckets {
       dimensions: "os:Windows-7"
       mixins: "webkit-ci"
     }
-    builders {
-      name: "Marshmallow Phone Tester (rel)"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-ci"
-    }
     builders {
       name: "Mac ASAN Release"
       dimensions: "os:Mac-10.13"
@@ -2176,6 +2177,7 @@ buckets {
       name: "android-kitkat-arm-rel"
       dimensions: "os:Ubuntu-14.04"
     }
+    # TODO(jbudorick): Remove this after fully migrating LARNG.
     builders {
       mixins: "android-try"
       name: "linux_android_rel_ng"
@@ -2186,6 +2188,22 @@ buckets {
         properties: "buildername:android-kitkat-arm-rel"
       }
     }
+    builders {
+      mixins: "android-try"
+      name: "android-marshmallow-arm64-rel"
+      dimensions: "os:Ubuntu-14.04"
+    }
+    # TODO(jbudorick): Remove this after fully migrating ANSR.
+    builders {
+      mixins: "android-try"
+      name: "android_n5x_swarming_rel"
+      auto_builder_dimension: NO
+      dimensions: "builder:android-marshmallow-arm64-rel"
+      dimensions: "os:Ubuntu-14.04"
+      recipe {
+        properties: "buildername:android-marshmallow-arm64-rel"
+      }
+    }
     builders {
       mixins: "android-try"
       name: "android_arm64_dbg_recipe"
@@ -2544,11 +2562,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-try"
     }
-    builders {
-      name: "android_n5x_swarming_rel"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-try"
-    }
     builders {
       name: "layout_test_leak_detection"
       dimensions: "os:Ubuntu-14.04"

diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
@@ -1618,6 +1618,16 @@ consoles {
     category: "android|arm|rel"
     short_name: "bb"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm-rel"
+    category: "android|arm64|rel"
+    short_name: "ci"
+  }
+  builders {
+    name: "buildbot/chromium.android/Marshmallow Phone Tester (rel)"
+    category: "android|arm64|rel"
+    short_name: "bb"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/GPU Win Builder"
     category: "gpu|win|release|builder"
@@ -1891,7 +1901,7 @@ consoles {
   }
   builders {
     name: "buildbot/chromium.android/Marshmallow Phone Tester (rel)"
-    name: "buildbucket/luci.chromium.ci/Marshmallow Phone Tester (rel)"
+    name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
     short_name: "M"
   }
@@ -4015,6 +4025,7 @@ consoles {
   }
   builders {
     name: "buildbot/tryserver.chromium.android/android_n5x_swarming_rel"
+    name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/android_optional_gpu_tests_rel"

diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
@@ -71,6 +71,7 @@ trigger {
   triggers: "Android x64 Builder (dbg)"
   triggers: "Android x86 Builder (dbg)"
   triggers: "android-kitkat-arm-rel"
+  triggers: "android-marshmallow-arm64-rel"
   triggers: "Cast Android (dbg)"
   triggers: "Deterministic Android"
   triggers: "Deterministic Android (dbg)"
@@ -412,6 +413,16 @@ job {
   }
 }
 
+job {
+  id: "android-marshmallow-arm64-rel"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "android-marshmallow-arm64-rel"
+  }
+}
+
 job {
   id: "Cast Android (dbg)"
   acl_sets: "default"