snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity
void-packages/srcpkgs/electron19/files/chromium-upstream-patches/0029-M102-infra-add-free_sp...

843 lines
30 KiB
Diff
Raw Blame History

From 2b4864af666871315c7eb8e7a5bf2c59968f62d0 Mon Sep 17 00:00:00 2001
From: Keybo Qian <keybo@google.com>
Date: Tue, 21 Jun 2022 16:43:59 +0000
Subject: [PATCH 29/59] [M102][infra] add "free_space" dimension to Chromium
builderless CI builders.
This dimension is currently only used by these builders, and is
"standard" by default.
(cherry picked from commit 2dfe967762507d2d6757b8e776e4efaea27d46ed)
Bug: 1311317
Change-Id: Id73fb6b2d4af9e072bf3f8b85498191ce5a00718
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3703737
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Commit-Queue: Keybo Qian <keybo@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1015340}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3714800
Cr-Commit-Position: refs/branch-heads/5005@{#1188}
Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738}
---
.../config/generated/luci/cr-buildbucket.cfg | 82 +++++++++++++++++++
infra/config/lib/builders.star | 22 +++++
infra/config/subprojects/chromium/ci.star | 3 +-
.../subprojects/flakiness/flakiness.star | 3 +-
infra/config/subprojects/goma/goma.star | 3 +-
.../config/subprojects/reclient/reclient.star | 3 +-
6 files changed, 112 insertions(+), 4 deletions(-)
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index e784735e10fc..3e6522e93ca2 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -28,6 +28,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -110,6 +111,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -192,6 +194,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -274,6 +277,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -356,6 +360,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -438,6 +443,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -520,6 +526,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -602,6 +609,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -684,6 +692,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -766,6 +775,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -848,6 +858,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -930,6 +941,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -1012,6 +1024,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1094,6 +1107,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1176,6 +1190,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1257,6 +1272,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -1338,6 +1354,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1420,6 +1437,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1502,6 +1520,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1584,6 +1603,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1666,6 +1686,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1748,6 +1769,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1830,6 +1852,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1912,6 +1935,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -1994,6 +2018,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2076,6 +2101,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2158,6 +2184,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2239,6 +2266,7 @@ buckets {
swarming_host: "chromium-swarm.appspot.com"
dimensions: "builderless:1"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Mac"
dimensions: "pool:luci.chromium.gpu.ci"
exe {
@@ -2320,6 +2348,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2402,6 +2431,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:1"
@@ -2484,6 +2514,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2566,6 +2597,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2648,6 +2680,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2730,6 +2763,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2812,6 +2846,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -2894,6 +2929,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -2976,6 +3012,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3058,6 +3095,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3140,6 +3178,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3232,6 +3271,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3314,6 +3354,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3556,6 +3597,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -3638,6 +3680,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -3720,6 +3763,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3802,6 +3846,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3884,6 +3929,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -3966,6 +4012,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4048,6 +4095,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4130,6 +4178,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4212,6 +4261,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4294,6 +4344,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4376,6 +4427,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4458,6 +4510,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4540,6 +4593,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -4622,6 +4676,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5028,6 +5083,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:2"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.gpu.ci"
dimensions: "ssd:0"
@@ -5110,6 +5166,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Windows-10"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5192,6 +5249,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5274,6 +5332,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5356,6 +5415,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5438,6 +5498,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5520,6 +5581,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5602,6 +5664,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5765,6 +5828,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5847,6 +5911,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -5929,6 +5994,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6011,6 +6077,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6093,6 +6160,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6175,6 +6243,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6257,6 +6326,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6339,6 +6409,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6421,6 +6492,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6584,6 +6656,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -6918,6 +6991,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7000,6 +7074,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7082,6 +7157,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7164,6 +7240,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7246,6 +7323,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7328,6 +7406,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7410,6 +7489,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7492,6 +7572,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
@@ -7815,6 +7896,7 @@ buckets {
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
+ dimensions: "free_space:standard"
dimensions: "os:Ubuntu-18.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
index d52370a10a90..226ed51648ba 100644
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -171,6 +171,15 @@ xcode = struct(
x13wk = xcode_enum("13a1030dwk"),
)
+# Free disk space in a machine reserved for build tasks.
+# The values in this enum will be used to populate bot dimension "free_space",
+# and each bot will allocate a corresponding amount of free disk space based on
+# the value of the dimension through "bot_config.py".
+free_space = struct(
+ standard = "standard",
+ high = "high",
+)
+
################################################################################
# Implementation details #
################################################################################
@@ -297,6 +306,7 @@ defaults = args.defaults(
auto_builder_dimension = args.COMPUTE,
builder_group = None,
builderless = args.COMPUTE,
+ free_space = None,
cores = None,
cpu = None,
fully_qualified_builder_dimension = False,
@@ -345,6 +355,7 @@ def builder(
triggered_by = args.DEFAULT,
os = args.DEFAULT,
builderless = args.DEFAULT,
+ free_space = args.DEFAULT,
builder_cache_name = None,
override_builder_dimension = None,
auto_builder_dimension = args.DEFAULT,
@@ -425,6 +436,10 @@ def builder(
builderless: a boolean indicating whether the builder runs on
builderless machines. If True, emits a 'builderless:1' dimension. By
default, considered True iff `os` refers to a linux OS.
+ free_space: an enum that indicates the amount of free disk space reserved
+ in a machine for incoming build tasks. This value is used to create
+ a "free_space" dimension, and this dimension is appended to only
+ builderless builders.
override_builder_dimension: a string to assign to the "builder"
dimension. Ignores any other "builder" and "builderless" dimensions
that would have been assigned.
@@ -600,6 +615,12 @@ def builder(
if builderless:
dimensions["builderless"] = "1"
+ free_space = defaults.get_value("free_space", free_space)
+ if free_space:
+ dimensions["free_space"] = free_space
+ elif free_space and free_space != args.DEFAULT:
+ fail("\'free_space\' dimension can only be specified for builderless builders")
+
auto_builder_dimension = defaults.get_value(
"auto_builder_dimension",
auto_builder_dimension,
@@ -808,4 +829,5 @@ builders = struct(
os = os,
sheriff_rotations = sheriff_rotations,
xcode = xcode,
+ free_space = free_space,
)
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index e11b770d24e7..d19117eff5f4 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/branches.star", "branches")
-load("//lib/builders.star", "cpu")
+load("//lib/builders.star", "builders", "cpu")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//project.star", "settings")
@@ -14,6 +14,7 @@ ci.defaults.set(
build_numbers = True,
cpu = cpu.X86_64,
triggered_by = ["chromium-gitiles-trigger"],
+ free_space = builders.free_space.standard,
)
luci.bucket(
diff --git a/infra/config/subprojects/flakiness/flakiness.star b/infra/config/subprojects/flakiness/flakiness.star
index ee158bc947d3..c2b4fe86cb00 100644
--- a/infra/config/subprojects/flakiness/flakiness.star
+++ b/infra/config/subprojects/flakiness/flakiness.star
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-load("//lib/builders.star", "os")
+load("//lib/builders.star", "builders", "os")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
@@ -15,6 +15,7 @@ ci.defaults.set(
# TODO(jeffyoon): replace with smaller scoped service account, and update
# below for bucket ACL
service_account = "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com",
+ free_space = builders.free_space.standard,
)
luci.bucket(
diff --git a/infra/config/subprojects/goma/goma.star b/infra/config/subprojects/goma/goma.star
index be425023964f..54a585a691a4 100644
--- a/infra/config/subprojects/goma/goma.star
+++ b/infra/config/subprojects/goma/goma.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/builder_config.star", "builder_config")
-load("//lib/builders.star", "builder", "cpu", "defaults", "goma", "os", "xcode")
+load("//lib/builders.star", "builder", "builders", "cpu", "defaults", "goma", "os", "xcode")
load("//lib/structs.star", "structs")
luci.bucket(
@@ -32,6 +32,7 @@ defaults.executable.set("recipe:chromium")
defaults.execution_timeout.set(3 * time.hour)
defaults.os.set(os.LINUX_DEFAULT)
defaults.pool.set("luci.chromium.ci")
+defaults.free_space.set(builders.free_space.standard)
defaults.service_account.set(
"goma-release-testing@chops-service-accounts.iam.gserviceaccount.com",
)
diff --git a/infra/config/subprojects/reclient/reclient.star b/infra/config/subprojects/reclient/reclient.star
index ad898d6cb6cd..fb789ff4b504 100644
--- a/infra/config/subprojects/reclient/reclient.star
+++ b/infra/config/subprojects/reclient/reclient.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
load("//lib/builder_config.star", "builder_config")
-load("//lib/builders.star", "cpu", "os")
+load("//lib/builders.star", "builders", "cpu", "os")
load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//lib/structs.star", "structs")
@@ -41,6 +41,7 @@ ci.defaults.set(
"chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
),
triggered_by = ["chromium-gitiles-trigger"],
+ free_space = builders.free_space.standard,
)
consoles.console_view(
--
2.37.0
Reference in New Issue View Git Blame Copy Permalink