Touch ups to cr-buildbucket-dev.cfg.

These changes simplify migrating to starlark by removing spurious diffs
from the semantic diff.

The names of the buckets have been switched to short names rather than
long names of the form luci.<project>.<bucket>. These are treated
equivalently by buildbucket, but lucicfg does not allow long bucket
names.

The category field is ignored by buildbucket, so the category field has
been removed from the build definitions.

Change-Id: If80a00385cb7a39539472295a51b7fd8713eaf55
Bug: 1011908
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1852411Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706538}

infra/config/cr-buildbucket-dev.cfg

@@ -68,7 +68,7 @@ builder_mixins {
 }
 
 buckets {
-  name: "luci.chromium.ci"
+  name: "ci"
 
   acl_sets: "default"
   acls {
@@ -86,7 +86,6 @@ buckets {
     hostname: "chromium-swarm-dev.appspot.com"
 
     builder_defaults {
-      category: "Chromium"
       execution_timeout_secs: 10800  # 3h
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -131,7 +130,7 @@ buckets {
 }
 
 buckets {
-    name: "luci.chromium.cron"
+    name: "cron"
     acl_sets: "default"
     acls {
       role: SCHEDULER
@@ -174,7 +173,6 @@ buckets {
     hostname: "chromium-swarm-dev.appspot.com"
 
     builder_defaults {
-      category: "Chromium CQ"
       service_account: "chromium-try-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
       # Max. pending time for builds. CQ considers builds pending >2h as timed
       # out: http://shortn/_8PaHsdYmlq. Keep this in sync.

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

@@ -68,7 +68,7 @@ builder_mixins {
 }
 
 buckets {
-  name: "luci.chromium.ci"
+  name: "ci"
 
   acl_sets: "default"
   acls {
@@ -86,7 +86,6 @@ buckets {
     hostname: "chromium-swarm-dev.appspot.com"
 
     builder_defaults {
-      category: "Chromium"
       execution_timeout_secs: 10800  # 3h
       service_account: "chromium-ci-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
       swarming_tags: "vpython:native-python-wrapper"
@@ -131,7 +130,7 @@ buckets {
 }
 
 buckets {
-    name: "luci.chromium.cron"
+    name: "cron"
     acl_sets: "default"
     acls {
       role: SCHEDULER
@@ -174,7 +173,6 @@ buckets {
     hostname: "chromium-swarm-dev.appspot.com"
 
     builder_defaults {
-      category: "Chromium CQ"
       service_account: "chromium-try-builder-dev@chops-service-accounts.iam.gserviceaccount.com"
       # Max. pending time for builds. CQ considers builds pending >2h as timed
       # out: http://shortn/_8PaHsdYmlq. Keep this in sync.