Partially restore LUCI dev service configs for chromium.swarm builders.

Bug: 868525
Change-Id: I2e10e438ad41c862a434e8181b5754b6d17e53f2
Reviewed-on: https://chromium-review.googlesource.com/1173502
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582807}

infra/config/global/cr-buildbucket-dev.cfg

+# Defines buckets on cr-buildbucket-dev.appspot.com, used by to schedule builds
+# on buildbot. In particular, CQ uses some of these buckets to schedule tryjobs.
+#
+# See http://luci-config.appspot.com/schemas/projects:buildbucket.cfg for
+# schema of this file and documentation. Also see README.md in this dir.
+#
+# Please keep this list sorted by bucket name.
+
+acl_sets {
+  # This is pure-LUCI CI w/o buildbot.
+  name: "ci"
+  acls {
+    role: READER
+    group: "all"
+  }
+  acls {
+    role: SCHEDULER
+    identity: "luci-scheduler-dev@appspot.gserviceaccount.com"
+  }
+  acls {
+    role: SCHEDULER
+    # Support builder triggering other builders in the same bucket.
+    identity: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acls {
+    # Allow task force to bump next build number.
+    role: WRITER
+    group: "google/luci-task-force@google.com"
+  }
+}
+
+builder_mixins {
+  name: "swarm-ci"
+  recipe {
+    name: "swarming/staging"
+    properties: "mastername:chromium.swarm"
+  }
+}
+
+buckets {
+  name: "luci.chromium.ci"
+
+  acl_sets: "ci"
+
+  swarming {
+    hostname: "chromium-swarm-dev.appspot.com"
+
+    builder_defaults {
+      category: "Chromium"
+      dimensions: "cpu:x86-64"
+      execution_timeout_secs: 10800  # 3h
+      service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
+      build_numbers: YES
+      recipe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        name: "chromium"
+      }
+    }
+    builders {
+      name: "Android N5 Swarm"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "swarm-ci"
+    }
+    builders {
+      name: "Android N5X Swarm"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "swarm-ci"
+    }
+    builders {
+      name: "ChromeOS Swarm"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "swarm-ci"
+    }
+    builders {
+      name: "Linux Swarm"
+      dimensions: "os:Ubuntu-14.04"
+      mixins: "swarm-ci"
+    }
+    builders {
+      name: "Mac Swarm"
+      dimensions: "os:Mac-10.13"
+      mixins: "swarm-ci"
+    }
+    builders {
+      name: "Windows Swarm"
+      dimensions: "os:Windows-10"
+      mixins: "swarm-ci"
+    }
+  }
+}

infra/config/global/luci-milo-dev.cfg

+logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
+
+headers: {
+  id: "chromium"
+  oncalls: {
+    name: "Chromium"
+    url: "https://build.chromium.org/p/chromium/sheriff.json"
+  }
+  oncalls: {
+    name: "Android"
+    url: "https://build.chromium.org/p/chromium/sheriff_android.json"
+  }
+  oncalls: {
+    name: "iOS"
+    url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
+  }
+  oncalls: {
+    name: "CrOS MTV"
+    url: "https://build.chromium.org/p/chromium/sheriff_cros_mtv.json"
+  }
+  oncalls: {
+    name: "CrOS non-MTV"
+    url: "https://build.chromium.org/p/chromium/sheriff_cros_nonmtv.json"
+  }
+  oncalls: {
+    name: "ChromeOS Gardener"
+    url: "https://build.chromium.org/p/chromium/sheriff_cr_cros_gardeners.json"
+  }
+  oncalls: {
+    name: "GPU"
+    url: "https://build.chromium.org/p/chromium/sheriff_gpu.json"
+  }
+  oncalls: {
+    name: "Angle"
+    url: "https://build.chromium.org/p/chromium/sheriff_angle.json"
+  }
+  oncalls: {
+    name: "Perf"
+    url: "https://build.chromium.org/p/chromium/sheriff_perf.json"
+  }
+  oncalls: {
+    name: "Perfbot"
+    url: "https://build.chromium.org/p/chromium/sheriff_perfbot.json"
+  }
+  oncalls: {
+    name: "V8"
+    url: "https://build.chromium.org/p/chromium/sheriff_v8.json"
+  }
+  oncalls: {
+    name: "Trooper"
+    url: "https://build.chromium.org/p/chromium/trooper.json"
+  }
+
+  links: {
+    name: "Builds"
+    links: {
+      text: "continuous"
+      url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
+      alt: "Continuous browser snapshots"
+    }
+    links: {
+      text: "symbols"
+      url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
+      alt: "Windows Symbols"
+    }
+    links: {
+      text: "status"
+      url: "https://chromium-status.appspot.com/"
+      alt: "Current tree status"
+    }
+  }
+
+  links: {
+    name: "Dashboards"
+    links: {
+      text: "perf"
+      url: "https://chromeperf.appspot.com/"
+      alt: "Chrome perf dashboard"
+    }
+    links: {
+      text: "flakiness"
+      url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
+      alt: "Flakiness dashboard"
+    }
+  }
+
+  links: {
+    name: "Chromium"
+    links: {
+      text: "source"
+      url: "https://chromium.googlesource.com/chromium/src"
+      alt: "Chromium source code repository"
+    }
+    links: {
+      text: "reviews"
+      url: "https://chromium-review.googlesource.com"
+      alt: "Chromium code review tool"
+    }
+    links: {
+      text: "bugs"
+      url: "https://crbug.com"
+      alt: "Chromium bug tracker"
+    }
+    links: {
+      text: "dev"
+      url: "https://dev.chromium.org/Home"
+      alt: "Chromium developer home page"
+    }
+    links: {
+      text: "support"
+      url: "https://support.google.com/chrome/#topic=7438008"
+      alt: "Google Chrome help center"
+    }
+  }
+
+  links: {
+    name: "Consoles"
+    links: {
+      text: "swarm"
+      url: "/p/chromium/g/chromium.swarm"
+      alt: "Chromium Swarm console"
+    }
+    links: {
+      text: "prod"
+      url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
+      alt: "Main luci-milo console"
+    }
+  }
+
+  links: {
+    name: "Navigate"
+    links: {
+      text: "about"
+      url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
+      alt: "Tour of the console"
+    }
+    links: {
+      text: "customize"
+      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-milo-dev.cfg"
+      alt: "Customize this console"
+    }
+  }
+
+  tree_status_host: "chromium-status.appspot.com"
+}
+
+consoles {
+  header_id: "chromium"
+  id: "chromium.swarm"
+  name: "chromium.swarm"
+  repo_url: "https://chromium.googlesource.com/chromium/src"
+  refs: "refs/heads/master"
+  manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android N5 Swarm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Android N5X Swarm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/ChromeOS Swarm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Linux Swarm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Mac Swarm"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Windows Swarm"
+  }
+}

infra/config/global/luci-milo.cfg

@@ -209,7 +209,7 @@ headers {
     }
     links {
       text: "customize"
-      url: "https://chromium.googlesource.com/infra/experimental/+/infra/config/luci-milo.cfg"
+      url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/global/luci-milo.cfg"
       alt: "Customize this console"
     }
   }
@@ -3326,33 +3326,6 @@ consoles {
   }
 }
 
-consoles {
-  header_id: "chromium"
-  id: "chromium.swarm"
-  name: "chromium.swarm"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android N5 Swarm"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android N5X Swarm"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ChromeOS Swarm"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Linux Swarm"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Mac Swarm"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Windows Swarm"
-  }
-}
-
 consoles {
   header_id: "chromium"
   id: "chromium.tools.build"

infra/config/global/luci-scheduler-dev.cfg

+# Defines jobs on luci-scheduler-dev.appspot.com.
+#
+# For schema of this file and documentation see ProjectConfig message in
+#
+# https://chromium.googlesource.com/infra/luci/luci-go/+/master/scheduler/appengine/messages/cron.proto
+
+
+acl_sets {
+  name: "default"
+  acls {
+    role: READER
+    granted_to: "group:all"
+  }
+  acls {
+    role: OWNER
+    granted_to: "group:project-chromium-admins"
+  }
+}
+
+################################################################################
+# Master branch
+
+trigger {
+  id: "master-gitiles-trigger"
+  acl_sets: "default"
+
+  gitiles: {
+    repo: "https://chromium.googlesource.com/chromium/src.git"
+    refs: "refs/heads/master"
+  }
+
+  triggers: "Android N5 Swarm"
+  triggers: "Android N5X Swarm"
+  triggers: "ChromeOS Swarm"
+  triggers: "Linux Swarm"
+  triggers: "Mac Swarm"
+  triggers: "Windows Swarm"
+}
+
+job {
+  id: "Android N5 Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android N5 Swarm"
+  }
+}
+
+job {
+  id: "Android N5X Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android N5X Swarm"
+  }
+}
+
+job {
+  id: "ChromeOS Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "ChromeOS Swarm"
+  }
+}
+
+job {
+  id: "Linux Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Linux Swarm"
+  }
+}
+job {
+  id: "Mac Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Mac Swarm"
+  }
+}
+job {
+  id: "Windows Swarm"
+  acl_sets: "default"
+  buildbucket: {
+    server: "cr-buildbucket-dev.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Windows Swarm"
+  }
+}