Revert "[ios] Remove ios builders from the CQ that are affected by network maintenance."

This reverts commit b5a657ac.

Reason for revert: Network outage ending

Original change's description:
> [ios] Remove ios builders from the CQ that are affected by network maintenance.
>
> Bug:1108842
> Change-Id: Icad192ee46c4489972168888fc6c8bd696d5e642
>
> No-Tree-Checks: true
> Change-Id: Icad192ee46c4489972168888fc6c8bd696d5e642
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316325
> Commit-Queue: Lindsay Pasricha <lindsayw@chromium.org>
> Reviewed-by: Erik Staab <estaab@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#791301}

TBR=estaab@chromium.org,lindsayw@chromium.org,gbeaty@chromium.org

Change-Id: I0daeef0d31637808fe24458edbcc3c947eb553a3
No-Tree-Checks: true
No-Try: true
Bug: 1108842
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317808Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791305}

infra/config/generated/commit-queue.cfg

@@ -824,7 +824,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/ios-simulator"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/ios-simulator-code-coverage"
@@ -838,7 +839,11 @@ config_groups {
       }
       builders {
         name: "chromium/try/ios-simulator-cronet"
-        includable_only: true
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
       }
       builders {
         name: "chromium/try/ios-simulator-eg"
@@ -846,7 +851,8 @@ config_groups {
       }
       builders {
         name: "chromium/try/ios-simulator-full-configs"
-        includable_only: true
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try/ios-simulator-multi-window"
@@ -1713,15 +1719,21 @@ config_groups {
       }
       builders {
         name: "chromium/try-m84/ios-simulator"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/ios-simulator-cronet"
-        includable_only: true
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
       }
       builders {
         name: "chromium/try-m84/ios-simulator-full-configs"
-        includable_only: true
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m84/linux-blink-rel"
@@ -2164,15 +2176,21 @@ config_groups {
       }
       builders {
         name: "chromium/try-m85/ios-simulator"
-        includable_only: true
+        location_regexp: ".*"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/ios-simulator-cronet"
-        includable_only: true
+        location_regexp: ".+/[+]/components/cronet/.+"
+        location_regexp: ".+/[+]/components/grpc_support/.+"
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
+        location_regexp_exclude: ".+/[+]/components/cronet/android/.+"
       }
       builders {
         name: "chromium/try-m85/ios-simulator-full-configs"
-        includable_only: true
+        location_regexp: ".+/[+]/ios/.+"
+        location_regexp_exclude: "infra/config/.+"
       }
       builders {
         name: "chromium/try-m85/linux-blink-rel"

infra/config/generated/cq-builders.md

@@ -43,6 +43,8 @@ These builders must pass before a CL may land that affects files outside of
 
 * [fuchsia_x64](https://ci.chromium.org/p/chromium/builders/try/fuchsia_x64) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+fuchsia_x64)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+fuchsia_x64))
 
+* [ios-simulator](https://ci.chromium.org/p/chromium/builders/try/ios-simulator) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator))
+
 * [linux-chromeos-compile-dbg](https://ci.chromium.org/p/chromium/builders/try/linux-chromeos-compile-dbg) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-chromeos-compile-dbg)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-chromeos-compile-dbg))
 
 * [linux-chromeos-rel](https://ci.chromium.org/p/chromium/builders/try/linux-chromeos-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-chromeos-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-chromeos-rel))
@@ -217,6 +219,21 @@ builder.
   Path regular expressions:
   * [`//chromecast/.+`](https://cs.chromium.org/chromium/src/chromecast/)
 
+* [ios-simulator-cronet](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-cronet) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-cronet)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-cronet))
+
+  Path regular expressions:
+  * [`//components/cronet/.+`](https://cs.chromium.org/chromium/src/components/cronet/)
+  * [`//components/grpc_support/.+`](https://cs.chromium.org/chromium/src/components/grpc_support/)
+  * [`//ios/.+`](https://cs.chromium.org/chromium/src/ios/)
+
+  Path exclude regular expressions:
+  * [`//components/cronet/android/.+`](https://cs.chromium.org/chromium/src/components/cronet/android/)
+
+* [ios-simulator-full-configs](https://ci.chromium.org/p/chromium/builders/try/ios-simulator-full-configs) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+ios-simulator-full-configs)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+ios-simulator-full-configs))
+
+  Path regular expressions:
+  * [`//ios/.+`](https://cs.chromium.org/chromium/src/ios/)
+
 * [linux-blink-rel](https://ci.chromium.org/p/chromium/builders/try/linux-blink-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+linux-blink-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+linux-blink-rel))
 
   Path regular expressions:

infra/config/subprojects/chromium/try.star

@@ -491,35 +491,32 @@ try_.chromium_mac_ios_builder(
     properties = {
         'xcode_build_version': '11e146',
     },
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-cronet',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/components/cronet/.+',
-    #        '.+/[+]/components/grpc_support/.+',
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #    location_regexp_exclude = [
-    #        '.+/[+]/components/cronet/android/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/components/cronet/.+',
+            '.+/[+]/components/grpc_support/.+',
+            '.+/[+]/ios/.+',
+        ],
+        location_regexp_exclude = [
+            '.+/[+]/components/cronet/android/.+',
+        ],
+    ),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-full-configs',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/ios/.+',
+        ],
+    ),
 )
 
 

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

@@ -459,35 +459,32 @@ try_.chromium_mac_ios_builder(
     properties = {
         'xcode_build_version': '11e146',
     },
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-cronet',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/components/cronet/.+',
-    #        '.+/[+]/components/grpc_support/.+',
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #    location_regexp_exclude = [
-    #        '.+/[+]/components/cronet/android/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/components/cronet/.+',
+            '.+/[+]/components/grpc_support/.+',
+            '.+/[+]/ios/.+',
+        ],
+        location_regexp_exclude = [
+            '.+/[+]/components/cronet/android/.+',
+        ],
+    ),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-full-configs',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/ios/.+',
+        ],
+    ),
 )
 
 

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

@@ -468,35 +468,32 @@ try_.chromium_mac_ios_builder(
     properties = {
         'xcode_build_version': '11e146',
     },
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(),
+    tryjob = try_.job(),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-cronet',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/components/cronet/.+',
-    #        '.+/[+]/components/grpc_support/.+',
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #    location_regexp_exclude = [
-    #        '.+/[+]/components/cronet/android/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/components/cronet/.+',
+            '.+/[+]/components/grpc_support/.+',
+            '.+/[+]/ios/.+',
+        ],
+        location_regexp_exclude = [
+            '.+/[+]/components/cronet/android/.+',
+        ],
+    ),
 )
 
 try_.chromium_mac_ios_builder(
     name = 'ios-simulator-full-configs',
     executable = 'recipe:chromium_trybot',
-    # TODO(https://crbug.com/1108842) Re-enable once network outage is over
-    # tryjob = try_.job(
-    #    location_regexp = [
-    #        '.+/[+]/ios/.+',
-    #    ],
-    #),
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/ios/.+',
+        ],
+    ),
 )