Register Mac Builder and 4 of its testers in LUCI.

* Mac10.10 Tests * Mac10.11 Tests * Mac10.12 Tests * Mac10.13 Tests No-Try: True Bug: 790162, 790157, 790160, 818391, 790164 Change-Id: I9bc62e97f97012ca147f09e7ddb82b96169588ed Reviewed-on: https://chromium-review.googlesource.com/982002Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Cr-Commit-Position: refs/heads/master@{#546100}

Register Mac Builder and 4 of its testers in LUCI.
* Mac10.10 Tests * Mac10.11 Tests * Mac10.12 Tests * Mac10.13 Tests No-Try: True Bug: 790162, 790157, 790160, 818391, 790164 Change-Id: I9bc62e97f97012ca147f09e7ddb82b96169588ed Reviewed-on: https://chromium-review.googlesource.com/982002Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Cr-Commit-Position: refs/heads/master@{#546100}
7a7ae0b2 · Andrii Shyshkalov · Commit Bot · ca4f14df · 7a7ae0b2 · 7a7ae0b2
Commit 7a7ae0b2 authored Mar 27, 2018 by Andrii Shyshkalov Committed by Commit Bot Mar 27, 2018
3 changed files
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -590,6 +590,30 @@ buckets {
    }

    # Mac bots.
+    builders {
+      name: "Mac Builder"
+      mixins: "mac-ci"
+    }
+    builders {
+      name: "Mac10.10 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.10"
+    }
+    builders {
+      name: "Mac10.11 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.11"
+    }
+    builders {
+      name: "Mac10.12 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.12"
+    }
+    builders {
+      name: "Mac10.13 Tests"
+      mixins: "mac-ci"
+      dimensions:"os:Mac-10.13"
+    }
    builders {
      name: "Mac Builder (dbg)"
      mixins: "mac-ci"

--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -340,29 +340,34 @@ consoles: {

  builders: {
    name: "buildbot/chromium.mac/Mac Builder"
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
    category: "chromium.mac|release"
    short_name: "bld"
  }
-  builders: {
-    name: "buildbot/chromium.mac/Mac10.13 Tests"
-    category: "chromium.mac|release|tester"
-    short_name: "13"
-  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.10 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
    category: "chromium.mac|release|tester"
    short_name: "10"
  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
    category: "chromium.mac|release|tester"
    short_name: "11"
  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
    category: "chromium.mac|release|tester"
    short_name: "12"
  }
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "chromium.mac|release|tester"
+    short_name: "13"
+  }
  builders: {
    name: "buildbot/chromium.mac/Mac Builder (dbg)"
    name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
@@ -804,29 +809,34 @@ consoles: {

  builders: {
    name: "buildbot/chromium.mac/Mac Builder"
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
    category: "release"
    short_name: "bld"
  }
-  builders: {
-    name: "buildbot/chromium.mac/Mac10.13 Tests"
-    category: "release|tester"
-    short_name: "13"
-  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.10 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
    category: "release|tester"
    short_name: "10"
  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.11 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
    category: "release|tester"
    short_name: "11"
  }
  builders: {
    name: "buildbot/chromium.mac/Mac10.12 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
    category: "release|tester"
    short_name: "12"
  }
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.13 Tests"
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    category: "release|tester"
+    short_name: "13"
+  }
  builders: {
    name: "buildbot/chromium.mac/Mac Builder (dbg)"
    name: "buildbucket/luci.chromium.ci/Mac Builder (dbg)"
@@ -1872,6 +1882,64 @@ consoles: {

 }

+consoles: {
+  # Additional migration console because the above has too many columns
+  # (builders) as of March 26, 2018.
+  # TODO(tandrii): remove this once https://crbug.com/790157 is complete.
+  id: "migration-side-by-side-of-macs"
+  name: "LUCI CI Mac Migration Comparison Console"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  ref: "refs/heads/master"
+  manifest_name: "REVISION"
+  header_id: "chromium"
+  include_experimental_builds: true
+
+  builders: {
+    name: "buildbot/chromium.mac/Mac Builder"
+    short_name: "old"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Mac Builder"
+    short_name: "new"
+  }
+
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.10 Tests"
+    short_name: "old"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Mac10.10 Tests"
+    short_name: "new"
+  }
+
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.11 Tests"
+    short_name: "old"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Mac10.11 Tests"
+    short_name: "new"
+  }
+
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.12 Tests"
+    short_name: "old"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Mac10.12 Tests"
+    short_name: "new"
+  }
+
+  builders: {
+    name: "buildbot/chromium.mac/Mac10.13 Tests"
+    short_name: "old"
+  }
+  builders: {
+    name: "buildbucket/luci.chromium.ci/Mac10.13 Tests"
+    short_name: "new"
+  }
+}
+
 # Everything below was generated from buildermap.json.
 consoles: {
  id: "chromium"

--- a/infra/config/global/luci-scheduler.cfg
+++ b/infra/config/global/luci-scheduler.cfg
@@ -90,6 +90,7 @@ trigger {
  triggers: "GPU FYI Mac Builder"
  triggers: "GPU FYI Mac Builder (dbg)"
  triggers: "GPU FYI Mac dEQP Builder"
+  triggers: "Mac Builder"
  triggers: "Mac Builder (dbg)"
  triggers: "Mac FYI GPU ASAN Release"
  triggers: "WebKit Mac Builder (dbg)"
@@ -828,6 +829,16 @@ job {
  }
 }

+job {
+  id: "Mac Builder"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Builder"
+  }
+}
+
 job {
  id: "Mac Builder (dbg)"
  acl_sets: "default"
@@ -848,6 +859,50 @@ job {
  }
 }

+job {
+  id: "Mac10.10 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.10 Tests"
+  }
+}
+
+job {
+  id: "Mac10.11 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.11 Tests"
+  }
+}
+
+job {
+  id: "Mac10.12 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.12 Tests"
+  }
+}
+
+job {
+  id: "Mac10.13 Tests"
+  # Triggered by "Mac Builder".
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac10.13 Tests"
+  }
+}
+
 job {
  id: "Mac10.13 Tests (dbg)"
  # Triggered by "Mac Builder (dbg)".