Add win7-rel to default CQ for sandbox/win changes.

Also, move win7-rel from master-only to chromium so it will
continue to run on the branches.

BUG=None

Change-Id: I46ee1c2095cccd9ba23332d8a94dc354f3ed3354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2315181Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791042}

infra/config/generated/commit-queue.cfg

@@ -1320,7 +1320,7 @@ config_groups {
       }
       builders {
         name: "chromium/try/win7-rel"
-        includable_only: true
+        location_regexp: ".+/[+]/sandbox/win/.+"
       }
       builders {
         name: "chromium/try/win_archive"

infra/config/generated/cq-builders.md

@@ -310,6 +310,11 @@ builder.
   * [`//tools/clang/scripts/update.py`](https://cs.chromium.org/search?q=package:%5Echromium$+file:tools/clang/scripts/update.py)
   * [`//ui/gl/.+`](https://cs.chromium.org/chromium/src/ui/gl/)
 
+* [win7-rel](https://ci.chromium.org/p/chromium/builders/try/win7-rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win7-rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win7-rel))
+
+  Path regular expressions:
+  * [`//sandbox/win/.+`](https://cs.chromium.org/chromium/src/sandbox/win/)
+
 * [win_optional_gpu_tests_rel](https://ci.chromium.org/p/chromium/builders/try/win_optional_gpu_tests_rel) ([definition](https://cs.chromium.org/search?q=package:%5Echromium$+file:/cq.star$+-file:/beta/+-file:/stable/+win_optional_gpu_tests_rel)) ([matching builders](https://cs.chromium.org/search?q=+file:trybots.py+win_optional_gpu_tests_rel))
 
   Path regular expressions:

infra/config/generated/luci-milo.cfg

@@ -4661,6 +4661,9 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win32-official"
   }
+  builders {
+    name: "buildbucket/luci.chromium.try/win7-rel"
+  }
   builders {
     name: "buildbucket/luci.chromium.try/win_chromium_compile_dbg_ng"
   }

infra/config/subprojects/chromium/master-only/try.star

@@ -700,13 +700,6 @@ try_.chromium_win_builder(
     os = os.WINDOWS_ANY,
 )
 
-try_.chromium_win_builder(
-    name = 'win7-rel',
-    execution_timeout = 4 * time.hour + 30 * time.minute,
-    goma_jobs = goma.jobs.J300,
-    ssd = True,
-)
-
 try_.chromium_win_builder(
     name = 'win_archive',
 )

infra/config/subprojects/chromium/try.star

@@ -539,6 +539,17 @@ try_.chromium_win_builder(
     tryjob = try_.job(cancel_stale = False),
 )
 
+try_.chromium_win_builder(
+    name = 'win7-rel',
+    execution_timeout = 4 * time.hour + 30 * time.minute,
+    goma_jobs = goma.jobs.J300,
+    ssd = True,
+    tryjob = try_.job(
+        location_regexp = [
+            '.+/[+]/sandbox/win/.+',
+        ],
+    ),
+)
 
 try_.gpu_chromium_android_builder(
     name = 'android_optional_gpu_tests_rel',