Skip to content

Commit dec5a27

Browse files
dmitshurgopherbot
authored andcommitted
main.star: triple sharding amount for misc-compile builders
It completes in under 30 minutes as is. Go with a tentative target of 10 minutes for now (via golang/go#17104), we can revisit it later. In comparison, the previous build system currently uses effectively the equivalent of 33 shards (that each handle one port), so even 12 shards is only about a third of that. For golang/go#61698. For golang/go#17104. Change-Id: Ie641e0574127fcb72b081219f540fb5e7a9cf020 Reviewed-on: https://go-review.googlesource.com/c/build/+/515735 TryBot-Bypass: Dmitri Shuralyov <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> Reviewed-by: Michael Knyszek <[email protected]>
1 parent 55f16a4 commit dec5a27

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

generated/cr-buildbucket.cfg

+9-9
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ buckets {
10521052
' "golang/ci/x_vulndb-go1.20-linux-amd64-misccompile",'
10531053
' "golang/ci/x_website-go1.20-linux-amd64-misccompile"'
10541054
' ],'
1055-
' "num_test_shards": 1,'
1055+
' "num_test_shards": 12,'
10561056
' "test_builder": "golang/ci/go1.20-linux-amd64-misccompile-test_only"'
10571057
' },'
10581058
' "env": {},'
@@ -3259,7 +3259,7 @@ buckets {
32593259
' "golang/ci/x_vulndb-go1.21-linux-amd64-misccompile",'
32603260
' "golang/ci/x_website-go1.21-linux-amd64-misccompile"'
32613261
' ],'
3262-
' "num_test_shards": 4,'
3262+
' "num_test_shards": 12,'
32633263
' "test_builder": "golang/ci/go1.21-linux-amd64-misccompile-test_only"'
32643264
' },'
32653265
' "env": {},'
@@ -5471,7 +5471,7 @@ buckets {
54715471
' "golang/ci/x_vulndb-gotip-linux-amd64-misccompile",'
54725472
' "golang/ci/x_website-gotip-linux-amd64-misccompile"'
54735473
' ],'
5474-
' "num_test_shards": 4,'
5474+
' "num_test_shards": 12,'
54755475
' "test_builder": "golang/ci/gotip-linux-amd64-misccompile-test_only"'
54765476
' },'
54775477
' "env": {},'
@@ -48430,7 +48430,7 @@ buckets {
4843048430
' "coord_mode": {'
4843148431
' "build_builder": "golang/try/go1.20-internal-linux-amd64-misccompile-build_go",'
4843248432
' "builders_to_trigger_after_toolchain_build": [],'
48433-
' "num_test_shards": 1,'
48433+
' "num_test_shards": 12,'
4843448434
' "test_builder": "golang/try/go1.20-internal-linux-amd64-misccompile-test_only"'
4843548435
' },'
4843648436
' "env": {},'
@@ -50129,7 +50129,7 @@ buckets {
5012950129
' "coord_mode": {'
5013050130
' "build_builder": "golang/try/go1.20-linux-amd64-misccompile-build_go",'
5013150131
' "builders_to_trigger_after_toolchain_build": [],'
50132-
' "num_test_shards": 1,'
50132+
' "num_test_shards": 12,'
5013350133
' "test_builder": "golang/try/go1.20-linux-amd64-misccompile-test_only"'
5013450134
' },'
5013550135
' "env": {},'
@@ -52064,7 +52064,7 @@ buckets {
5206452064
' "coord_mode": {'
5206552065
' "build_builder": "golang/try/go1.21-internal-linux-amd64-misccompile-build_go",'
5206652066
' "builders_to_trigger_after_toolchain_build": [],'
52067-
' "num_test_shards": 4,'
52067+
' "num_test_shards": 12,'
5206852068
' "test_builder": "golang/try/go1.21-internal-linux-amd64-misccompile-test_only"'
5206952069
' },'
5207052070
' "env": {},'
@@ -53763,7 +53763,7 @@ buckets {
5376353763
' "coord_mode": {'
5376453764
' "build_builder": "golang/try/go1.21-linux-amd64-misccompile-build_go",'
5376553765
' "builders_to_trigger_after_toolchain_build": [],'
53766-
' "num_test_shards": 4,'
53766+
' "num_test_shards": 12,'
5376753767
' "test_builder": "golang/try/go1.21-linux-amd64-misccompile-test_only"'
5376853768
' },'
5376953769
' "env": {},'
@@ -55703,7 +55703,7 @@ buckets {
5570355703
' "coord_mode": {'
5570455704
' "build_builder": "golang/try/gotip-internal-linux-amd64-misccompile-build_go",'
5570555705
' "builders_to_trigger_after_toolchain_build": [],'
55706-
' "num_test_shards": 4,'
55706+
' "num_test_shards": 12,'
5570755707
' "test_builder": "golang/try/gotip-internal-linux-amd64-misccompile-test_only"'
5570855708
' },'
5570955709
' "env": {},'
@@ -57408,7 +57408,7 @@ buckets {
5740857408
' "coord_mode": {'
5740957409
' "build_builder": "golang/try/gotip-linux-amd64-misccompile-build_go",'
5741057410
' "builders_to_trigger_after_toolchain_build": [],'
57411-
' "num_test_shards": 4,'
57411+
' "num_test_shards": 12,'
5741257412
' "test_builder": "golang/try/gotip-linux-amd64-misccompile-test_only"'
5741357413
' },'
5741457414
' "env": {},'

main.star

+6-5
Original file line numberDiff line numberDiff line change
@@ -424,13 +424,13 @@ def define_builder(bucket, project, go_branch_short, builder_type, gerrit_host =
424424

425425
# Emit the builder definitions.
426426
if project == "go":
427-
define_go_builder(name, bucket, go_branch_short, builder_type, base_props, base_dims, emit_builder)
427+
define_go_builder(name, bucket, go_branch_short, builder_type, run_mods, base_props, base_dims, emit_builder)
428428
else:
429429
define_subrepo_builder(name, base_props, base_dims, emit_builder)
430430

431431
return bucket + "/" + name
432432

433-
def define_go_builder(name, bucket, go_branch_short, builder_type, base_props, base_dims, emit_builder):
433+
def define_go_builder(name, bucket, go_branch_short, builder_type, run_mods, base_props, base_dims, emit_builder):
434434
# Create 3 builders: the main entrypoint/coordinator builder,
435435
# a builder just to run make.bash, and a builder to run tests.
436436
#
@@ -446,12 +446,13 @@ def define_go_builder(name, bucket, go_branch_short, builder_type, base_props, b
446446
test_name = name + "-test_only"
447447

448448
# Determine if we should be sharding tests, and how many shards.
449-
#
450-
# TODO(mknyszek): Remove the exception for the go1.20 branch once it
451-
# is no longer supported.
452449
test_shards = 1
453450
if not is_capacity_constrained(builder_type) and go_branch_short != "go1.20":
451+
# TODO(mknyszek): Remove the exception for the go1.20 branch once it
452+
# is no longer supported.
454453
test_shards = 4
454+
if "misccompile" in run_mods:
455+
test_shards = 12
455456

456457
# The main repo builder also triggers subrepo builders of the same builder type.
457458
#

0 commit comments

Comments
 (0)