Reland "Change critical builders to try/chromeos-arm64-generic-rel"
This reverts commit 18cfcc18b40ebc01fad14374f661ebaf8ab6c933.
Reason for revert: revert is incorrect. issue is transient on amd64, not arm64.
Original change's description:
> Revert "Change critical builders to try/chromeos-arm64-generic-rel"
>
> This reverts commit e6212595dad2bc7ac504006b1085b12104958042.
>
> Reason for revert: https://ci.chromium.org/ui/p/chromium/builders/ci/chromeos-amd64-generic-rel/88906/overview
>
> Original change's description:
> > Change critical builders to try/chromeos-arm64-generic-rel
> >
> > Recent runs are quite stable:
> > https://ci.chromium.org/ui/p/chromium/builders/try/chromeos-arm64-generic-rel?limit=200
> >
> > Also disable chromeos-arm-generic-rel from default and move
> > chromeos-arm-generic-rel to builderless pool in preparation of bot
> > shutdown.
> >
> > runtime over past week:
> > arm arm64
> > total P90 33m 38m (ci only tests can be enabled on arm64)
> > total P50 11m 13m
> > compile P90 28m 30m
> > compile P50 9m44s 10m
> > test P90 N/A 22m
> > bot_update P90 1m40s 1m40s
> > runhooks P90 22s 19s
> > runtime is comparable and arm64 compile step can be 1-2m longer at P90.
> > Also arm64 may have ci only tests being enabled on per-cl basis, causing
> > extra time.
> > link: https://chrome-infra-stats.googleplex.com/cq-builders?periods=4&period=week&date=2024-09-19&filter=chromeos-arm&metric=P90&metric=P90%20Phase%20Runtime&metric=P50%20Runtime&orderCol=5&order=desc
> >
> > Bug: b/358181912
> > Change-Id: Iac8d56a9778ec5f82172646a43e21502801da4d0
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5868820
> > Commit-Queue: Qijiang Fan <fqj@chromium.org>
> > Reviewed-by: Ben Pastene <bpastene@chromium.org>
> > Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1359248}
>
> Bug: b/358181912
> Change-Id: Iff1081f7187271acde22eca80885586280e071ef
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5890824
> Owners-Override: Morten Stenshorne <mstensho@google.com>
> Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Cr-Commit-Position: refs/heads/main@{#1359833}
Bug: b/358181912
Change-Id: I293784f8e1f9e6adaf05250ef3573e2a1b27b0da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5890708
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Owners-Override: Morten Stenshorne <mstensho@google.com>
Commit-Queue: Qijiang Fan <fqj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1359855}
diff --git a/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json b/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json
index c0be559..c1cd824 100644
--- a/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json
+++ b/infra/config/generated/builders/try/chromeos-arm-generic-rel/properties.json
@@ -47,10 +47,6 @@
]
}
},
- "$build/flakiness": {
- "check_for_flakiness": true,
- "check_for_flakiness_with_resultdb": true
- },
"$build/reclient": {
"instance": "rbe-chromium-untrusted",
"metrics_project": "chromium-reclient-metrics",
@@ -74,6 +70,5 @@
]
},
"builder_group": "tryserver.chromium.chromiumos",
- "cq": "required",
"recipe": "chromium_trybot"
}
\ No newline at end of file
diff --git a/infra/config/generated/cq-builders.md b/infra/config/generated/cq-builders.md
index d5d3adb..30d0104 100644
--- a/infra/config/generated/cq-builders.md
+++ b/infra/config/generated/cq-builders.md
@@ -41,7 +41,7 @@
* Replaced with builder: [chromeos-amd64-generic-rel-gtest-and-tast](https://ci.chromium.org/p/chromium/builders/try/chromeos-amd64-generic-rel-gtest-and-tast) when CL owner is in group [google/chromeos-pa@google.com](https://chrome-infra-auth.appspot.com/auth/lookup?p=google/chromeos-pa@google.com)
-* [chromeos-arm-generic-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-arm-generic-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""chromeos-arm-generic-rel""))
+* [chromeos-arm64-generic-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-arm64-generic-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""chromeos-arm64-generic-rel""))
* [chromium_presubmit](https://ci.chromium.org/p/chromium/builders/try/chromium_presubmit) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""chromium_presubmit""))
@@ -695,9 +695,6 @@
* [`//base/.+`](https://cs.chromium.org/chromium/src/base/)
* [`//net/.+`](https://cs.chromium.org/chromium/src/net/)
-* [chromeos-arm64-generic-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-arm64-generic-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""chromeos-arm64-generic-rel""))
- * Experiment percentage: 100.0
-
* [chromeos-js-coverage-rel](https://ci.chromium.org/p/chromium/builders/try/chromeos-js-coverage-rel) ([definition](https://cs.chromium.org/search?q=+file:/try/.*\.star$+""chromeos-js-coverage-rel""))
* Experiment percentage: 50.0
diff --git a/infra/config/generated/cq-usage/default.cfg b/infra/config/generated/cq-usage/default.cfg
index 81747e37..e7c94d8 100644
--- a/infra/config/generated/cq-usage/default.cfg
+++ b/infra/config/generated/cq-usage/default.cfg
@@ -46,7 +46,7 @@
name: "chromium/try/chromeos-amd64-generic-rel-gtest"
}
builders {
- name: "chromium/try/chromeos-arm-generic-rel"
+ name: "chromium/try/chromeos-arm64-generic-rel"
}
builders {
name: "chromium/try/chromium_presubmit"
diff --git a/infra/config/generated/cq-usage/full.cfg b/infra/config/generated/cq-usage/full.cfg
index 45e31404..e4118f6 100644
--- a/infra/config/generated/cq-usage/full.cfg
+++ b/infra/config/generated/cq-usage/full.cfg
@@ -1088,7 +1088,7 @@
}
}
builders {
- name: "chromium/try/chromeos-arm-generic-rel"
+ name: "chromium/try/chromeos-arm64-generic-rel"
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
@@ -1107,7 +1107,7 @@
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
gerrit_ref_regexp: ".*"
- path_regexp: "infra/config/generated/builders/try/chromeos-arm-generic-rel/.+"
+ path_regexp: "infra/config/generated/builders/try/chromeos-arm64-generic-rel/.+"
}
}
builders {
diff --git a/infra/config/generated/luci/commit-queue.cfg b/infra/config/generated/luci/commit-queue.cfg
index aec6caf..540deb1 100644
--- a/infra/config/generated/luci/commit-queue.cfg
+++ b/infra/config/generated/luci/commit-queue.cfg
@@ -2055,32 +2055,10 @@
}
builders {
name: "chromium/try/chromeos-arm-generic-rel"
- location_filters {
- gerrit_host_regexp: ".*"
- gerrit_project_regexp: ".*"
- gerrit_ref_regexp: ".*"
- path_regexp: "infra/config/.+"
- exclude: true
- }
- location_filters {
- gerrit_host_regexp: ".*"
- gerrit_project_regexp: ".*"
- gerrit_ref_regexp: ".*"
- path_regexp: "docs/.+"
- exclude: true
- }
- location_filters {
- gerrit_host_regexp: ".*"
- gerrit_project_regexp: ".*"
- gerrit_ref_regexp: ".*"
- path_regexp: "infra/config/generated/builders/try/chromeos-arm-generic-rel/.+"
- }
- mode_allowlist: "DRY_RUN"
- mode_allowlist: "FULL_RUN"
+ includable_only: true
}
builders {
name: "chromium/try/chromeos-arm64-generic-rel"
- experiment_percentage: 100
location_filters {
gerrit_host_regexp: ".*"
gerrit_project_regexp: ".*"
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 202ab34..c57dcc0 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -78401,11 +78401,12 @@
builders {
name: "chromeos-arm-generic-rel"
swarming_host: "chromium-swarm.appspot.com"
- dimensions: "builder:chromeos-arm-generic-rel"
+ dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-22.04"
dimensions: "pool:luci.chromium.try"
+ dimensions: "ssd:0"
exe {
cipd_package: "infra/chromium/bootstrapper/${platform}"
cipd_version: "latest"
@@ -78433,7 +78434,6 @@
' }'
' },'
' "builder_group": "tryserver.chromium.chromiumos",'
- ' "cq": "required",'
' "led_builder_is_bootstrapped": true,'
' "recipe": "chromium_trybot"'
'}'
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
index 8b118f6..c5b40a01 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.chromiumos.star
@@ -218,7 +218,6 @@
"dcheck_always_on",
],
),
- builderless = not settings.is_main,
experiments = {
# crbug/940930
"chromium.enable_cleandead": 100,
@@ -226,7 +225,6 @@
"chromium.luci_analysis_v2": 100,
},
main_list_view = "try",
- tryjob = try_.job(),
)
try_.builder(
@@ -247,9 +245,7 @@
"chromium.luci_analysis_v2": 100,
},
main_list_view = "try",
- tryjob = try_.job(
- experiment_percentage = 100,
- ),
+ tryjob = try_.job(),
)
try_.builder(
