Revert "Remove builders from CQ that are affected by network maintenance."

This reverts commit 735eccaa.

Reason for revert: Restoring full functionality
Original change's description:
> Remove builders from CQ that are affected by network maintenance.
>
> Bug: 1108842
> Change-Id: I44ae858ebe99f33a713d814c1257359b49870a1e
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315387
> Reviewed-by: Erik Staab <estaab@chromium.org>
> Reviewed-by: Ben Pastene <bpastene@chromium.org>
> Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
> Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#791254}

TBR=estaab@chromium.org,martiniss@chromium.org,bpastene@chromium.org,gbeaty@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1108842
Change-Id: I81d7c8ca20f0faa19ee7fd7270c930a44b3000df
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317861
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791307}

infra/config/generated/commit-queue.cfg

@@ -202,7 +202,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/android-marshmallow-x86-fyi-rel"
@@ -1193,7 +1194,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/mac-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/mac-swangle-chromium-try-x64"
@@ -1257,7 +1259,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/mac_chromium_compile_dbg_ng"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/mac_chromium_compile_rel_ng"
@@ -1538,7 +1541,8 @@ config_groups {
       }
       builders {
         name: "chromium/try-m84/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/android-pie-arm64-dbg"
@@ -1834,11 +1838,13 @@ config_groups {
       }
       builders {
         name: "chromium/try-m84/mac-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/mac_chromium_compile_dbg_ng"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/mac_optional_gpu_tests_rel"
@@ -1978,7 +1984,8 @@ config_groups {
       }
       builders {
         name: "chromium/try-m85/android-marshmallow-arm64-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/android-marshmallow-x86-rel"
@@ -2295,11 +2302,13 @@ config_groups {
       }
       builders {
         name: "chromium/try-m85/mac-rel"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/mac_chromium_compile_dbg_ng"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/mac_optional_gpu_tests_rel"

infra/config/generated/cq-builders.md

@@ -21,6 +21,8 @@ These builders must pass before a CL may land that affects files outside of
 
 * [android-lollipop-arm-rel](https://ci.chromium.org/p/chromium/builders/try/android-lollipop-arm-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-lollipop-arm-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-lollipop-arm-rel))
 
+* [android-marshmallow-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-marshmallow-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-marshmallow-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-marshmallow-arm64-rel))
+
 * [android-pie-arm64-rel](https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android-pie-arm64-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android-pie-arm64-rel))
 
 * [android_compile_dbg](https://ci.chromium.org/p/chromium/builders/try/android_compile_dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+android_compile_dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+android_compile_dbg))
@@ -61,6 +63,10 @@ These builders must pass before a CL may land that affects files outside of
 
 * [linux_chromium_tsan_rel_ng](https://ci.chromium.org/p/chromium/builders/try/linux_chromium_tsan_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux_chromium_tsan_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux_chromium_tsan_rel_ng))
 
+* [mac-rel](https://ci.chromium.org/p/chromium/builders/try/mac-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac-rel))
+
+* [mac_chromium_compile_dbg_ng](https://ci.chromium.org/p/chromium/builders/try/mac_chromium_compile_dbg_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+mac_chromium_compile_dbg_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+mac_chromium_compile_dbg_ng))
+
 * [win-libfuzzer-asan-rel](https://ci.chromium.org/p/chromium/builders/try/win-libfuzzer-asan-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win-libfuzzer-asan-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win-libfuzzer-asan-rel))
 
 * [win10_chromium_x64_rel_ng](https://ci.chromium.org/p/chromium/builders/try/win10_chromium_x64_rel_ng) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win10_chromium_x64_rel_ng)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win10_chromium_x64_rel_ng))

infra/config/subprojects/chromium/try.star

@@ -122,8 +122,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
@@ -472,16 +471,14 @@ try_.chromium_mac_builder(
     name = 'mac-rel',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_builder(
     name = 'mac_chromium_compile_dbg_ng',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 

infra/config/subprojects/chromium/versioned/m84/buckets/try.star

@@ -101,8 +101,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
@@ -440,16 +439,14 @@ try_.chromium_mac_builder(
     name = 'mac-rel',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_builder(
     name = 'mac_chromium_compile_dbg_ng',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 

infra/config/subprojects/chromium/versioned/m85/buckets/try.star

@@ -94,8 +94,7 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_android_builder(
@@ -449,16 +448,14 @@ try_.chromium_mac_builder(
     name = 'mac-rel',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_builder(
     name = 'mac_chromium_compile_dbg_ng',
     goma_jobs = goma.jobs.J150,
     os = os.MAC_10_13,
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )