android/fuchsia-official to main console

Moved android-official and fuchsia-official to main console since their
builds are consistently green now.

Changed the android-official timeout back to the default 3 hours since
they're now taking around 1-2 hours to complete.

Bug: 1072012
Change-Id: I031225052ddc2bffa7f5e53458d2ac8137e1d36e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285075
Auto-Submit: Stephanie Kim <kimstephanie@google.com>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#785964}

infra/config/generated/cr-buildbucket.cfg

@@ -9009,7 +9009,7 @@ buckets {
         cmd: "recipes"
       }
       properties: "{\"$build/chromium_tests\":{\"bucketed_triggers\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"mastername\":\"chromium\",\"recipe\":\"chromium\"}"
-      execution_timeout_secs: 21600
+      execution_timeout_secs: 10800
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       resultdb {

infra/config/generated/luci-milo.cfg

@@ -20,6 +20,16 @@ consoles {
     category: "chromium|android"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-official"
+    category: "chromium|android"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-official"
+    category: "chromium|fuchsia"
+    short_name: "off"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-archive-dbg"
     category: "chromium|linux"
@@ -2097,6 +2107,16 @@ consoles {
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-official"
+    category: "chromium|android"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-official"
+    category: "chromium|fuchsia"
+    short_name: "off"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
@@ -2493,11 +2513,6 @@ consoles {
     category: "chromium.fyi|mac"
     short_name: "beta"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/fuchsia-official"
-    category: "chromium.fyi|fuchsia"
-    short_name: "off"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "chromium.fyi|linux"
@@ -2526,11 +2541,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
     category: "chromium.fyi|win10|1803"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-official"
-    category: "chromium.fyi|android"
-    short_name: "off"
-  }
   header {
     oncalls {
       name: "Chromium"
@@ -5263,6 +5273,16 @@ consoles {
     category: "android"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/android-official"
+    category: "android"
+    short_name: "off"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/fuchsia-official"
+    category: "fuchsia"
+    short_name: "off"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/linux-archive-dbg"
     category: "linux"
@@ -8038,11 +8058,6 @@ consoles {
     category: "deterministic|mac"
     short_name: "dbg"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/fuchsia-official"
-    category: "fuchsia"
-    short_name: "off"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/fuchsia-fyi-arm64-rel"
     category: "fuchsia|a64"
@@ -8253,11 +8268,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/win32-arm64-rel"
     category: "win32|arm64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/android-official"
-    category: "android"
-    short_name: "off"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/win-celab-builder-rel"
     category: "celab"

infra/config/subprojects/chromium/ci.star

@@ -469,24 +469,17 @@ ci.android_builder(
 
 ci.chromium_builder(
     name = 'android-official',
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = 'chromium.fyi',
+    main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = 'android',
         short_name = 'off',
     ),
     cores = 32,
-    # TODO: Change this back down to something reasonable once these builders
-    # have populated their cached by getting through the compile step
-    execution_timeout = 6 * time.hour,
 )
 
 ci.chromium_builder(
     name = 'fuchsia-official',
-    # TODO(https://crbug.com/1072012) Use the default console view and add
-    # main_console_view = settings.main_console_name once the build is green
-    console_view = 'chromium.fyi',
+    main_console_view = settings.main_console_name,
     console_view_entry = ci.console_view_entry(
         category = 'fuchsia',
         short_name = 'off',