Skip to content

Commit d595b34

Browse files
dmitshurgopherbot
authored andcommitted
main.star: include longtest and race in pre-submit on release branches
Given release branches only get backports and true development should be happening on the main branch, release branches prioritize catching more problems before submission over pre-submit completion speed, and so they choose not to skip longtest and race builders. This is a part of the current trybot policy implemented in x/build, and seems to be generally working well. For golang/go#37827. Change-Id: I1c9bcf600a7ea5da32296a8ddfcda083da839c29 Reviewed-on: https://go-review.googlesource.com/c/build/+/522175 Reviewed-by: Heschi Kreinick <[email protected]> TryBot-Bypass: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 1358cb4 commit d595b34

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

generated/commit-queue.cfg

-24
Original file line numberDiff line numberDiff line change
@@ -6700,7 +6700,6 @@ config_groups {
67006700
}
67016701
builders {
67026702
name: "golang/security-try/go1.20-linux-386-longtest"
6703-
includable_only: true
67046703
}
67056704
builders {
67066705
name: "golang/security-try/go1.20-linux-amd64"
@@ -6710,18 +6709,15 @@ config_groups {
67106709
}
67116710
builders {
67126711
name: "golang/security-try/go1.20-linux-amd64-longtest"
6713-
includable_only: true
67146712
}
67156713
builders {
67166714
name: "golang/security-try/go1.20-linux-amd64-longtest-race"
6717-
includable_only: true
67186715
}
67196716
builders {
67206717
name: "golang/security-try/go1.20-linux-amd64-misccompile"
67216718
}
67226719
builders {
67236720
name: "golang/security-try/go1.20-linux-amd64-race"
6724-
includable_only: true
67256721
}
67266722
builders {
67276723
name: "golang/security-try/go1.20-linux-arm64"
@@ -6738,11 +6734,9 @@ config_groups {
67386734
}
67396735
builders {
67406736
name: "golang/security-try/go1.20-windows-amd64-longtest"
6741-
includable_only: true
67426737
}
67436738
builders {
67446739
name: "golang/security-try/go1.20-windows-amd64-race"
6745-
includable_only: true
67466740
}
67476741
builders {
67486742
name: "golang/try/tricium"
@@ -7045,7 +7039,6 @@ config_groups {
70457039
}
70467040
builders {
70477041
name: "golang/security-try/go1.21-linux-386-longtest"
7048-
includable_only: true
70497042
}
70507043
builders {
70517044
name: "golang/security-try/go1.21-linux-amd64"
@@ -7055,18 +7048,15 @@ config_groups {
70557048
}
70567049
builders {
70577050
name: "golang/security-try/go1.21-linux-amd64-longtest"
7058-
includable_only: true
70597051
}
70607052
builders {
70617053
name: "golang/security-try/go1.21-linux-amd64-longtest-race"
7062-
includable_only: true
70637054
}
70647055
builders {
70657056
name: "golang/security-try/go1.21-linux-amd64-misccompile"
70667057
}
70677058
builders {
70687059
name: "golang/security-try/go1.21-linux-amd64-race"
7069-
includable_only: true
70707060
}
70717061
builders {
70727062
name: "golang/security-try/go1.21-linux-arm64"
@@ -7083,11 +7073,9 @@ config_groups {
70837073
}
70847074
builders {
70857075
name: "golang/security-try/go1.21-windows-amd64-longtest"
7086-
includable_only: true
70877076
}
70887077
builders {
70897078
name: "golang/security-try/go1.21-windows-amd64-race"
7090-
includable_only: true
70917079
}
70927080
builders {
70937081
name: "golang/try/tricium"
@@ -7733,7 +7721,6 @@ config_groups {
77337721
}
77347722
builders {
77357723
name: "golang/try/go1.20-linux-386-longtest"
7736-
includable_only: true
77377724
}
77387725
builders {
77397726
name: "golang/try/go1.20-linux-amd64"
@@ -7743,18 +7730,15 @@ config_groups {
77437730
}
77447731
builders {
77457732
name: "golang/try/go1.20-linux-amd64-longtest"
7746-
includable_only: true
77477733
}
77487734
builders {
77497735
name: "golang/try/go1.20-linux-amd64-longtest-race"
7750-
includable_only: true
77517736
}
77527737
builders {
77537738
name: "golang/try/go1.20-linux-amd64-misccompile"
77547739
}
77557740
builders {
77567741
name: "golang/try/go1.20-linux-amd64-race"
7757-
includable_only: true
77587742
}
77597743
builders {
77607744
name: "golang/try/go1.20-linux-arm64"
@@ -7771,11 +7755,9 @@ config_groups {
77717755
}
77727756
builders {
77737757
name: "golang/try/go1.20-windows-amd64-longtest"
7774-
includable_only: true
77757758
}
77767759
builders {
77777760
name: "golang/try/go1.20-windows-amd64-race"
7778-
includable_only: true
77797761
}
77807762
builders {
77817763
name: "golang/try/tricium"
@@ -8103,7 +8085,6 @@ config_groups {
81038085
}
81048086
builders {
81058087
name: "golang/try/go1.21-linux-386-longtest"
8106-
includable_only: true
81078088
}
81088089
builders {
81098090
name: "golang/try/go1.21-linux-amd64"
@@ -8113,18 +8094,15 @@ config_groups {
81138094
}
81148095
builders {
81158096
name: "golang/try/go1.21-linux-amd64-longtest"
8116-
includable_only: true
81178097
}
81188098
builders {
81198099
name: "golang/try/go1.21-linux-amd64-longtest-race"
8120-
includable_only: true
81218100
}
81228101
builders {
81238102
name: "golang/try/go1.21-linux-amd64-misccompile"
81248103
}
81258104
builders {
81268105
name: "golang/try/go1.21-linux-amd64-race"
8127-
includable_only: true
81288106
}
81298107
builders {
81308108
name: "golang/try/go1.21-linux-arm64"
@@ -8141,11 +8119,9 @@ config_groups {
81418119
}
81428120
builders {
81438121
name: "golang/try/go1.21-windows-amd64-longtest"
8144-
includable_only: true
81458122
}
81468123
builders {
81478124
name: "golang/try/go1.21-windows-amd64-race"
8148-
includable_only: true
81498125
}
81508126
builders {
81518127
name: "golang/try/tricium"

main.star

+5-1
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,10 @@ def enabled(low_capacity_hosts, project, go_branch_short, builder_type):
632632
pt = PROJECTS[project]
633633
os, arch, _, run_mods = split_builder_type(builder_type)
634634

635+
presubmit_skip_run_mods = ["longtest", "race"]
636+
if project == "go" and go_branch_short != "gotip":
637+
presubmit_skip_run_mods = [] # See go.dev/issue/37827.
638+
635639
enable_types = None
636640
if pt == PT.TOOL:
637641
enable_types = ["linux-amd64", "windows-amd64", "darwin-amd64"]
@@ -641,7 +645,7 @@ def enabled(low_capacity_hosts, project, go_branch_short, builder_type):
641645
fail("unhandled SPECIAL project: %s" % project)
642646
postsubmit = enable_types == None or any([x == "%s-%s" % (os, arch) for x in enable_types])
643647
presubmit = postsubmit \
644-
and not any([x in run_mods for x in ["longtest", "race"]]) \
648+
and not any([x in run_mods for x in presubmit_skip_run_mods]) \
645649
and not is_capacity_constrained(low_capacity_hosts, builder_type)
646650
return presubmit, postsubmit
647651

0 commit comments

Comments
 (0)