Skip to content

Commit db1846d

Browse files
mknyszekgopherbot
mknyszek
authored and
gopherbot
committed
main.star: enable longtest builders on x/benchmarks for sweet
It's already annoying to have to ask for longtest builders to run the end-to-end test for sweet, but the fact that we also forget to run the Go 1.22 end-to-end test means we get real breakages like golang/go#68555. Resolve this once and for all by enabling longtest in presubmit if any Go file is touched by a CL in the x/benchmarks repository. Change-Id: Ia76258edf9bc93b88501cd64755beddd39186f06 Reviewed-on: https://go-review.googlesource.com/c/build/+/600495 Auto-Submit: Michael Knyszek <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 27c34b8 commit db1846d

File tree

2 files changed

+105
-20
lines changed

2 files changed

+105
-20
lines changed

‎generated/commit-queue.cfg

Lines changed: 100 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3495,8 +3495,12 @@ config_groups {
34953495
}
34963496
builders {
34973497
name: "golang/try/x_benchmarks-go1.21-linux-386-longtest"
3498-
includable_only: true
34993498
disable_reuse: true
3499+
location_filters {
3500+
gerrit_host_regexp: "go-review.googlesource.com"
3501+
gerrit_project_regexp: "^benchmarks$"
3502+
path_regexp: "sweet/.+[.]go"
3503+
}
35003504
}
35013505
builders {
35023506
name: "golang/try/x_benchmarks-go1.21-linux-amd64"
@@ -3508,13 +3512,21 @@ config_groups {
35083512
}
35093513
builders {
35103514
name: "golang/try/x_benchmarks-go1.21-linux-amd64-longtest"
3511-
includable_only: true
35123515
disable_reuse: true
3516+
location_filters {
3517+
gerrit_host_regexp: "go-review.googlesource.com"
3518+
gerrit_project_regexp: "^benchmarks$"
3519+
path_regexp: "sweet/.+[.]go"
3520+
}
35133521
}
35143522
builders {
35153523
name: "golang/try/x_benchmarks-go1.21-linux-amd64-longtest-race"
3516-
includable_only: true
35173524
disable_reuse: true
3525+
location_filters {
3526+
gerrit_host_regexp: "go-review.googlesource.com"
3527+
gerrit_project_regexp: "^benchmarks$"
3528+
path_regexp: "sweet/.+[.]go"
3529+
}
35183530
}
35193531
builders {
35203532
name: "golang/try/x_benchmarks-go1.21-linux-amd64-misccompile"
@@ -3545,8 +3557,12 @@ config_groups {
35453557
}
35463558
builders {
35473559
name: "golang/try/x_benchmarks-go1.21-linux-arm64-longtest"
3548-
includable_only: true
35493560
disable_reuse: true
3561+
location_filters {
3562+
gerrit_host_regexp: "go-review.googlesource.com"
3563+
gerrit_project_regexp: "^benchmarks$"
3564+
path_regexp: "sweet/.+[.]go"
3565+
}
35503566
}
35513567
builders {
35523568
name: "golang/try/x_benchmarks-go1.21-linux-arm64-race"
@@ -3643,8 +3659,12 @@ config_groups {
36433659
}
36443660
builders {
36453661
name: "golang/try/x_benchmarks-go1.21-windows-amd64-longtest"
3646-
includable_only: true
36473662
disable_reuse: true
3663+
location_filters {
3664+
gerrit_host_regexp: "go-review.googlesource.com"
3665+
gerrit_project_regexp: "^benchmarks$"
3666+
path_regexp: "sweet/.+[.]go"
3667+
}
36483668
}
36493669
builders {
36503670
name: "golang/try/x_benchmarks-go1.21-windows-amd64-race"
@@ -4086,8 +4106,12 @@ config_groups {
40864106
}
40874107
builders {
40884108
name: "golang/try/x_benchmarks-go1.22-linux-386-longtest"
4089-
includable_only: true
40904109
disable_reuse: true
4110+
location_filters {
4111+
gerrit_host_regexp: "go-review.googlesource.com"
4112+
gerrit_project_regexp: "^benchmarks$"
4113+
path_regexp: "sweet/.+[.]go"
4114+
}
40914115
}
40924116
builders {
40934117
name: "golang/try/x_benchmarks-go1.22-linux-amd64"
@@ -4099,13 +4123,21 @@ config_groups {
40994123
}
41004124
builders {
41014125
name: "golang/try/x_benchmarks-go1.22-linux-amd64-longtest"
4102-
includable_only: true
41034126
disable_reuse: true
4127+
location_filters {
4128+
gerrit_host_regexp: "go-review.googlesource.com"
4129+
gerrit_project_regexp: "^benchmarks$"
4130+
path_regexp: "sweet/.+[.]go"
4131+
}
41044132
}
41054133
builders {
41064134
name: "golang/try/x_benchmarks-go1.22-linux-amd64-longtest-race"
4107-
includable_only: true
41084135
disable_reuse: true
4136+
location_filters {
4137+
gerrit_host_regexp: "go-review.googlesource.com"
4138+
gerrit_project_regexp: "^benchmarks$"
4139+
path_regexp: "sweet/.+[.]go"
4140+
}
41094141
}
41104142
builders {
41114143
name: "golang/try/x_benchmarks-go1.22-linux-amd64-misccompile"
@@ -4136,8 +4168,12 @@ config_groups {
41364168
}
41374169
builders {
41384170
name: "golang/try/x_benchmarks-go1.22-linux-arm64-longtest"
4139-
includable_only: true
41404171
disable_reuse: true
4172+
location_filters {
4173+
gerrit_host_regexp: "go-review.googlesource.com"
4174+
gerrit_project_regexp: "^benchmarks$"
4175+
path_regexp: "sweet/.+[.]go"
4176+
}
41414177
}
41424178
builders {
41434179
name: "golang/try/x_benchmarks-go1.22-linux-arm64-race"
@@ -4239,8 +4275,12 @@ config_groups {
42394275
}
42404276
builders {
42414277
name: "golang/try/x_benchmarks-go1.22-windows-amd64-longtest"
4242-
includable_only: true
42434278
disable_reuse: true
4279+
location_filters {
4280+
gerrit_host_regexp: "go-review.googlesource.com"
4281+
gerrit_project_regexp: "^benchmarks$"
4282+
path_regexp: "sweet/.+[.]go"
4283+
}
42444284
}
42454285
builders {
42464286
name: "golang/try/x_benchmarks-go1.22-windows-amd64-race"
@@ -4677,8 +4717,12 @@ config_groups {
46774717
}
46784718
builders {
46794719
name: "golang/try/x_benchmarks-go1.23-linux-386-longtest"
4680-
includable_only: true
46814720
disable_reuse: true
4721+
location_filters {
4722+
gerrit_host_regexp: "go-review.googlesource.com"
4723+
gerrit_project_regexp: "^benchmarks$"
4724+
path_regexp: "sweet/.+[.]go"
4725+
}
46824726
}
46834727
builders {
46844728
name: "golang/try/x_benchmarks-go1.23-linux-amd64"
@@ -4690,13 +4734,21 @@ config_groups {
46904734
}
46914735
builders {
46924736
name: "golang/try/x_benchmarks-go1.23-linux-amd64-longtest"
4693-
includable_only: true
46944737
disable_reuse: true
4738+
location_filters {
4739+
gerrit_host_regexp: "go-review.googlesource.com"
4740+
gerrit_project_regexp: "^benchmarks$"
4741+
path_regexp: "sweet/.+[.]go"
4742+
}
46954743
}
46964744
builders {
46974745
name: "golang/try/x_benchmarks-go1.23-linux-amd64-longtest-race"
4698-
includable_only: true
46994746
disable_reuse: true
4747+
location_filters {
4748+
gerrit_host_regexp: "go-review.googlesource.com"
4749+
gerrit_project_regexp: "^benchmarks$"
4750+
path_regexp: "sweet/.+[.]go"
4751+
}
47004752
}
47014753
builders {
47024754
name: "golang/try/x_benchmarks-go1.23-linux-amd64-misccompile"
@@ -4727,8 +4779,12 @@ config_groups {
47274779
}
47284780
builders {
47294781
name: "golang/try/x_benchmarks-go1.23-linux-arm64-longtest"
4730-
includable_only: true
47314782
disable_reuse: true
4783+
location_filters {
4784+
gerrit_host_regexp: "go-review.googlesource.com"
4785+
gerrit_project_regexp: "^benchmarks$"
4786+
path_regexp: "sweet/.+[.]go"
4787+
}
47324788
}
47334789
builders {
47344790
name: "golang/try/x_benchmarks-go1.23-linux-arm64-race"
@@ -4835,8 +4891,12 @@ config_groups {
48354891
}
48364892
builders {
48374893
name: "golang/try/x_benchmarks-go1.23-windows-amd64-longtest"
4838-
includable_only: true
48394894
disable_reuse: true
4895+
location_filters {
4896+
gerrit_host_regexp: "go-review.googlesource.com"
4897+
gerrit_project_regexp: "^benchmarks$"
4898+
path_regexp: "sweet/.+[.]go"
4899+
}
48404900
}
48414901
builders {
48424902
name: "golang/try/x_benchmarks-go1.23-windows-amd64-race"
@@ -5992,8 +6052,12 @@ config_groups {
59926052
}
59936053
builders {
59946054
name: "golang/try/x_benchmarks-gotip-linux-386-longtest"
5995-
includable_only: true
59966055
disable_reuse: true
6056+
location_filters {
6057+
gerrit_host_regexp: "go-review.googlesource.com"
6058+
gerrit_project_regexp: "^benchmarks$"
6059+
path_regexp: "sweet/.+[.]go"
6060+
}
59976061
}
59986062
builders {
59996063
name: "golang/try/x_benchmarks-gotip-linux-amd64"
@@ -6005,13 +6069,21 @@ config_groups {
60056069
}
60066070
builders {
60076071
name: "golang/try/x_benchmarks-gotip-linux-amd64-longtest"
6008-
includable_only: true
60096072
disable_reuse: true
6073+
location_filters {
6074+
gerrit_host_regexp: "go-review.googlesource.com"
6075+
gerrit_project_regexp: "^benchmarks$"
6076+
path_regexp: "sweet/.+[.]go"
6077+
}
60106078
}
60116079
builders {
60126080
name: "golang/try/x_benchmarks-gotip-linux-amd64-longtest-race"
6013-
includable_only: true
60146081
disable_reuse: true
6082+
location_filters {
6083+
gerrit_host_regexp: "go-review.googlesource.com"
6084+
gerrit_project_regexp: "^benchmarks$"
6085+
path_regexp: "sweet/.+[.]go"
6086+
}
60156087
}
60166088
builders {
60176089
name: "golang/try/x_benchmarks-gotip-linux-amd64-misccompile"
@@ -6042,8 +6114,12 @@ config_groups {
60426114
}
60436115
builders {
60446116
name: "golang/try/x_benchmarks-gotip-linux-arm64-longtest"
6045-
includable_only: true
60466117
disable_reuse: true
6118+
location_filters {
6119+
gerrit_host_regexp: "go-review.googlesource.com"
6120+
gerrit_project_regexp: "^benchmarks$"
6121+
path_regexp: "sweet/.+[.]go"
6122+
}
60476123
}
60486124
builders {
60496125
name: "golang/try/x_benchmarks-gotip-linux-arm64-race"
@@ -6150,8 +6226,12 @@ config_groups {
61506226
}
61516227
builders {
61526228
name: "golang/try/x_benchmarks-gotip-windows-amd64-longtest"
6153-
includable_only: true
61546229
disable_reuse: true
6230+
location_filters {
6231+
gerrit_host_regexp: "go-review.googlesource.com"
6232+
gerrit_project_regexp: "^benchmarks$"
6233+
path_regexp: "sweet/.+[.]go"
6234+
}
61556235
}
61566236
builders {
61576237
name: "golang/try/x_benchmarks-gotip-windows-amd64-race"

‎main.star

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,11 @@ RUN_MODS = dict(
810810
test_timeout_scale = 5,
811811
enabled = define_for_presubmit_only_for_projs_or_on_release_branches({
812812
"build": [],
813+
"benchmarks": [
814+
# Enable longtest builders on x/benchmarks if files related to sweet are modified,
815+
# so that the sweet end-to-end test is run.
816+
"sweet/.+[.]go",
817+
],
813818
"go": [
814819
# Enable longtest builders on go against tip if files related to vendored code are modified.
815820
"src(|/.+)/go[.](mod|sum)",

0 commit comments

Comments
 (0)