[M102] Enable ci/android-cronet-x86-dbg-10-tests for standard milesto…

…nes. try/android-cronet-x86-dbg-10-tests is enabled for standard milestones, so ci/android-cronet-x86-dbg and ci/android-cronet-x86-dbg-10-tests 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 ea6eedf) Bug: 1317095 Change-Id: I3407498012bda3d38508a202311d2b2c277ac4d1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3642740 Commit-Queue: Garrett Beaty <gbeaty@google.com> Auto-Submit: Garrett Beaty <gbeaty@google.com> Reviewed-by: Erik Staab <estaab@chromium.org> Cr-Original-Commit-Position: refs/heads/main@{#1002354} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3642355 Commit-Queue: Erik Staab <estaab@chromium.org> Cr-Commit-Position: refs/branch-heads/5005@{#677} Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
chromium · May 11, 2022 · 4d49d9b · 4d49d9b
1 parent 7b918d7
commit 4d49d9b
Show file tree

Hide file tree

Showing 8 changed files with 279 additions and 0 deletions.
diff --git a/infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json b/infra/config/generated/builders/ci/android-cronet-x86-dbg-10-tests/properties.json
@@ -0,0 +1,21 @@
+{
+  "$build/goma": {
+    "enable_ats": true,
+    "jobs": 150,
+    "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.android",
+  "recipe": "chromium",
+  "sheriff_rotations": [
+    "chrome_browser_release"
+  ]
+}
diff --git a/infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json b/infra/config/generated/builders/ci/android-cronet-x86-dbg/properties.json
@@ -0,0 +1,19 @@
+{
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 500,
+    "metrics_project": "chromium-reclient-metrics"
+  },
+  "$recipe_engine/resultdb/test_presentation": {
+    "column_keys": [],
+    "grouping_keys": [
+      "status",
+      "v.test_suite"
+    ]
+  },
+  "builder_group": "chromium.android",
+  "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
@@ -5187,6 +5187,170 @@ buckets {
         }
       }
     }
+    builders {
+      name: "android-cronet-x86-dbg"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      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/android-cronet-x86-dbg/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/branch-heads/5005",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "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-x86-dbg-10-tests"
+      swarming_host: "chromium-swarm.appspot.com"
+      dimensions: "builderless:1"
+      dimensions: "cores:8"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-18.04"
+      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/android-cronet-x86-dbg-10-tests/properties.json",'
+        '    "top_level_project": {'
+        '      "ref": "refs/branch-heads/5005",'
+        '      "repo": {'
+        '        "host": "chromium.googlesource.com",'
+        '        "project": "chromium/src"'
+        '      }'
+        '    }'
+        '  },'
+        '  "builder_group": "chromium.android",'
+        '  "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-marshmallow-arm64-rel"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -260,6 +260,16 @@ consoles {
     category: "chromium.android|cronet|arm"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/android-cronet-x86-dbg"
+    category: "chromium.android|cronet|x86"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/android-cronet-x86-dbg-10-tests"
+    category: "chromium.android|cronet|test"
+    short_name: "10"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Android arm Builder (dbg)"
     category: "chromium.android|builder|arm"
@@ -1205,6 +1215,16 @@ consoles {
     category: "cronet|arm"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/android-cronet-x86-dbg"
+    category: "cronet|x86"
+    short_name: "dbg"
+  }
+  builders {
+    name: "buildbucket/luci.chromium-m102.ci/android-cronet-x86-dbg-10-tests"
+    category: "cronet|test"
+    short_name: "10"
+  }
   builders {
     name: "buildbucket/luci.chromium-m102.ci/Android arm Builder (dbg)"
     category: "builder|arm"

diff --git a/infra/config/generated/luci/luci-notify.cfg b/infra/config/generated/luci/luci-notify.cfg
@@ -595,6 +595,33 @@ notifiers {
     repository: "https://chromium.googlesource.com/chromium/src"
   }
 }
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_occurrence: INFRA_FAILURE
+    email {
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-x86-dbg"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  }
+}
+notifiers {
+  notifications {
+    on_occurrence: FAILURE
+    on_occurrence: INFRA_FAILURE
+    email {
+      recipients: "cronet-sheriff@grotations.appspotmail.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "android-cronet-x86-dbg-10-tests"
+  }
+}
 notifiers {
   notifications {
     on_new_status: INFRA_FAILURE

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -770,6 +770,30 @@ job {
     builder: "android-cronet-arm-rel"
   }
 }
+job {
+  id: "android-cronet-x86-dbg"
+  realm: "ci"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "ci"
+    builder: "android-cronet-x86-dbg"
+  }
+}
+job {
+  id: "android-cronet-x86-dbg-10-tests"
+  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: "android-cronet-x86-dbg-10-tests"
+  }
+}
 job {
   id: "android-marshmallow-arm64-rel"
   realm: "ci"
@@ -1125,6 +1149,7 @@ trigger {
   triggers: "Win x64 Builder"
   triggers: "android-cronet-arm-dbg"
   triggers: "android-cronet-arm-rel"
+  triggers: "android-cronet-x86-dbg"
   triggers: "android-marshmallow-arm64-rel"
   triggers: "android-marshmallow-x86-rel"
   triggers: "android-official"

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: "android-cronet-x86-dbg-10-tests"
         values: "android-pie-arm64-dbg"
         values: "linux-lacros-tester-rel"
         values: "mac11-arm64-rel-tests"

diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star
@@ -657,6 +657,7 @@ ci.builder(
 
 ci.builder(
     name = "android-cronet-x86-dbg",
+    branch_selector = branches.STANDARD_MILESTONE,
     console_view_entry = consoles.console_view_entry(
         category = "cronet|x86",
         short_name = "dbg",
@@ -709,6 +710,7 @@ ci.builder(
 
 ci.builder(
     name = "android-cronet-x86-dbg-10-tests",
+    branch_selector = branches.STANDARD_MILESTONE,
     console_view_entry = consoles.console_view_entry(
         category = "cronet|test",
         short_name = "10",