[M102][infra] Enable "ci/Win7 Tests (1)" for desktop extended stable.

try/win7-rel is enabled for desktop extended stable, so "ci/Win Builder" and "ci/Win7 Tests (1)" should be as well. For the migration to src-side, the CI builders must be enabled on the same branches as the try builder in order for the try builder to be able to mirror the ci builders. (cherry picked from commit a1c7d03) Bug: 1317284 Change-Id: Iacd40be6125257c33013ad74ce1ce18aae99d93a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3646490 Reviewed-by: Erik Staab <estaab@chromium.org> Commit-Queue: Garrett Beaty <gbeaty@google.com> Cr-Original-Commit-Position: refs/heads/main@{#1002889} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3646557 Auto-Submit: Garrett Beaty <gbeaty@google.com> Commit-Queue: Erik Staab <estaab@chromium.org> Cr-Commit-Position: refs/branch-heads/5005@{#714} Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
chromium · May 13, 2022 · 32753ab · 32753ab
1 parent ddbcc11
commit 32753ab
Show file tree

Hide file tree

Showing 8 changed files with 275 additions and 0 deletions.
diff --git a/infra/config/generated/builders/ci/Win Builder/properties.json b/infra/config/generated/builders/ci/Win Builder/properties.json
@@ -0,0 +1,19 @@
+{
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 250,
+    "metrics_project": "chromium-reclient-metrics"
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "chromium.win",
+  "recipe": "chromium",
+  "sheriff_rotations": [
+    "chrome_browser_release"
+  ]
+}
diff --git a/infra/config/generated/builders/ci/Win7 Tests (1)/properties.json b/infra/config/generated/builders/ci/Win7 Tests (1)/properties.json
@@ -0,0 +1,20 @@
+{
+  "$build/goma": {
+    "enable_ats": true,
+    "rpc_extra_params": "?prod",
+    "server_host": "goma.chromium.org",
+    "use_luci_auth": true
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "chromium.win",
+  "recipe": "chromium",
+  "sheriff_rotations": [
+    "chrome_browser_release"
+  ]
+}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -4698,6 +4698,87 @@ buckets {
         }
       }
     }
+    builders {
+      name: "Win Builder"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builder:Win Builder"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows"
+      dimensions: "pool:luci.chromium.ci"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/ci/Win Builder/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/branch-heads/5005",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "Win Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"
@@ -5023,6 +5104,88 @@ buckets {
         }
       }
     }
+    builders {
+      name: "Win7 Tests (1)"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Windows-10"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:0"
+      exe {
+        cipd_package: "infra/chromium/bootstrapper/${platform}"
+        cipd_version: "latest"
+        cmd: "bootstrapper"
+      }
+      properties:
+        '{'
+        '  "$bootstrap/exe": {'
+        '    "exe": {'
+        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
+        '      "cipd_version": "refs/heads/main",'
+        '      "cmd": ['
+        '        "luciexe"'
+        '      ]'
+        '    }'
+        '  },'
+        '  "$bootstrap/properties": {'
+        '    "properties_file": "infra/config/generated/builders/ci/Win7 Tests (1)/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/branch-heads/5005",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.win",'
+        '  "led_builder_is_bootstrapped": true,'
+        '  "recipe": "chromium",'
+        '  "sheriff_rotations": ['
+        '    "chrome_browser_release"'
+        '  ]'
+        '}'
+      execution_timeout_secs: 10800
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "luci.recipes.use_python3"
+        value: 100
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "gpu_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://chrome/test:telemetry_gpu_integration_test[^/]*/.+"
+            }
+          }
+        }
+        bq_exports {
+          project: "chrome-luci-data"
+          dataset: "chromium"
+          table: "blink_web_tests_ci_test_results"
+          test_results {
+            predicate {
+              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
+            }
+          }
+        }
+        history_options {
+          use_invocation_timestamp: true
+        }
+      }
+    }
     builders {
       name: "android-cronet-arm-dbg"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -40,11 +40,21 @@ consoles {
     category: "chromium|win|off"
     short_name: "64"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/Win Builder"
+    category: "chromium.win|release|builder"
+    short_name: "32"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Win x64 Builder"
     category: "chromium.win|release|builder"
     short_name: "64"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/Win7 Tests (1)"
+    category: "chromium.win|release|tester"
+    short_name: "32"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Win 7 Tests x64 (1)"
     category: "chromium.win|release|tester"
@@ -1850,11 +1860,21 @@ consoles {
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/branch-heads/5005"
   manifest_name: "REVISION"
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/Win Builder"
+    category: "release|builder"
+    short_name: "32"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Win x64 Builder"
     category: "release|builder"
     short_name: "64"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/Win7 Tests (1)"
+    category: "release|tester"
+    short_name: "32"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Win 7 Tests x64 (1)"
     category: "release|tester"

diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg
@@ -514,6 +514,19 @@ notifiers {
     name: "Win 7 Tests x64 (1)"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  builders {
+    bucket: "ci"
+    name: "Win Builder"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE
@@ -567,6 +580,18 @@ notifiers {
     name: "Win10 x64 Release (NVIDIA)"
   }
 }
+notifiers {
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  notifications {
+    on_new_status: INFRA_FAILURE
+  }
+  builders {
+    bucket: "ci"
+    name: "Win7 Tests (1)"
+  }
+}
 notifiers {
   notifications {
     on_occurrence: FAILURE

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -702,6 +702,16 @@ job {
     builder: "Win 7 Tests x64 (1)"
   }
 }
+job {
+  id: "Win Builder"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "Win Builder"
+  }
+}
 job {
   id: "Win Builder (dbg)"
   realm: "ci"
@@ -750,6 +760,20 @@ job {
     builder: "Win10 x64 Release (NVIDIA)"
   }
 }
+job {
+  id: "Win7 Tests (1)"
+  realm: "ci"
+  acls {
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  }
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "Win7 Tests (1)"
+  }
+}
 job {
   id: "android-cronet-arm-dbg"
   realm: "ci"
@@ -1145,6 +1169,7 @@ trigger {
   triggers: "Mac Builder"
   triggers: "Mac Builder (dbg)"
   triggers: "VR Linux"
+  triggers: "Win Builder"
   triggers: "Win Builder (dbg)"
   triggers: "Win x64 Builder"
   triggers: "android-cronet-arm-dbg"

diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg
@@ -105,6 +105,7 @@ realms {
         values: "Win 7 Tests x64 (1)"
         values: "Win10 Tests x64"
         values: "Win10 x64 Release (NVIDIA)"
+        values: "Win7 Tests (1)"
         values: "android-cronet-x86-dbg-10-tests"
         values: "android-pie-arm64-dbg"
         values: "linux-lacros-tester-rel"

diff --git a/infra/config/subprojects/chromium/ci/chromium.win.star b/infra/config/subprojects/chromium/ci/chromium.win.star
@@ -45,6 +45,7 @@ ci.builder(
 
 ci.builder(
     name = "Win Builder",
+    branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
     console_view_entry = consoles.console_view_entry(
         category = "release|builder",
         short_name = "32",
@@ -93,6 +94,7 @@ ci.thin_tester(
 
 ci.builder(
     name = "Win7 Tests (1)",
+    branch_selector = branches.DESKTOP_EXTENDED_STABLE_MILESTONE,
     builderless = True,
     console_view_entry = consoles.console_view_entry(
         category = "release|tester",