Commit 58e8d8c6 authored by Simon Que's avatar Simon Que Committed by Commit Bot

infra: Add and use mixins for Goma RBE server settings

R=tikuta@chromium.org, ukai@chromium.org, yyanagisawa@chromium.org

Bug: 945701
Change-Id: I98b2a8a2d644eccde84224171bbe7e9885041046
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1539416
Commit-Queue: Simon Que <sque@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644219}
parent 23467233
...@@ -135,6 +135,46 @@ builder_mixins { ...@@ -135,6 +135,46 @@ builder_mixins {
} }
} }
# Enables use of Goma RBE ToT backend in a builder.
builder_mixins {
name: "goma-rbe-tot"
recipe {
properties_j: <<END
$build/goma: {
"server_host": "rbe-tot.endpoints.cxx-compiler-service.cloud.goog"
}
END
}
}
# Enables use of Goma RBE Mixer Staging backend in a builder.
builder_mixins {
name: "goma-rbe-mixer-staging"
recipe {
properties_j: <<END
$build/goma: {
"server_host": "staging-goma.chromium.org",
"rpc_extra_params": "?staging"
}
END
}
}
# TODO(ukai): add goma-rbe-mixer-prod
# Enables use of Goma RBE Prod backend in a builder.
builder_mixins {
name: "goma-rbe-prod"
recipe {
properties_j: <<END
$build/goma: {
"server_host": "goma.chromium.org",
"rpc_extra_params": "?prod"
}
END
}
}
builder_mixins { builder_mixins {
name: "android" name: "android"
dimensions: "os:Android" dimensions: "os:Android"
...@@ -2527,6 +2567,7 @@ buckets { ...@@ -2527,6 +2567,7 @@ buckets {
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Linux Goma RBE ToT (ATS)" name: "Chromium Linux Goma RBE ToT (ATS)"
...@@ -2534,54 +2575,63 @@ buckets { ...@@ -2534,54 +2575,63 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ats" mixins: "goma-ats"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Linux Goma RBE Staging" name: "Chromium Linux Goma RBE Staging"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Linux Goma RBE Staging (clobber)" name: "Chromium Linux Goma RBE Staging (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Linux Goma RBE Staging (dbg)" name: "Chromium Linux Goma RBE Staging (dbg)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Linux Goma RBE Staging (dbg) (clobber)" name: "Chromium Linux Goma RBE Staging (dbg) (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Linux Goma RBE Prod" name: "Chromium Linux Goma RBE Prod"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Linux Goma RBE Prod (clobber)" name: "Chromium Linux Goma RBE Prod (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Linux Goma RBE Prod (dbg)" name: "Chromium Linux Goma RBE Prod (dbg)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Linux Goma RBE Prod (dbg) (clobber)" name: "Chromium Linux Goma RBE Prod (dbg) (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Mac Goma RBE ToT" name: "Chromium Mac Goma RBE ToT"
...@@ -2590,6 +2640,7 @@ buckets { ...@@ -2590,6 +2640,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-j80" mixins: "goma-j80"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Mac Goma RBE Staging (clobber)" name: "Chromium Mac Goma RBE Staging (clobber)"
...@@ -2598,6 +2649,7 @@ buckets { ...@@ -2598,6 +2649,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-j80" mixins: "goma-j80"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Mac Goma RBE Staging" name: "Chromium Mac Goma RBE Staging"
...@@ -2606,6 +2658,7 @@ buckets { ...@@ -2606,6 +2658,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-j80" mixins: "goma-j80"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Mac Goma RBE Staging (dbg)" name: "Chromium Mac Goma RBE Staging (dbg)"
...@@ -2614,6 +2667,7 @@ buckets { ...@@ -2614,6 +2667,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-j80" mixins: "goma-j80"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Win Goma RBE ToT" name: "Chromium Win Goma RBE ToT"
...@@ -2621,6 +2675,7 @@ buckets { ...@@ -2621,6 +2675,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ats" mixins: "goma-ats"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Win Goma RBE Staging" name: "Chromium Win Goma RBE Staging"
...@@ -2628,6 +2683,7 @@ buckets { ...@@ -2628,6 +2683,7 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ats" mixins: "goma-ats"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Win Goma RBE Staging (clobber)" name: "Chromium Win Goma RBE Staging (clobber)"
...@@ -2635,12 +2691,14 @@ buckets { ...@@ -2635,12 +2691,14 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ats" mixins: "goma-ats"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE ToT" name: "Chromium Android ARM 32-bit Goma RBE ToT"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)" name: "Chromium Android ARM 32-bit Goma RBE ToT (ATS)"
...@@ -2648,36 +2706,42 @@ buckets { ...@@ -2648,36 +2706,42 @@ buckets {
mixins: "experimental" mixins: "experimental"
mixins: "goma-ats" mixins: "goma-ats"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-tot"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE Staging" name: "Chromium Android ARM 32-bit Goma RBE Staging"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-mixer-staging"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE Prod" name: "Chromium Android ARM 32-bit Goma RBE Prod"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)" name: "Chromium Android ARM 32-bit Goma RBE Prod (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)" name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)" name: "Chromium Android ARM 32-bit Goma RBE Prod (dbg) (clobber)"
dimensions: "os:Ubuntu-14.04" dimensions: "os:Ubuntu-14.04"
mixins: "experimental" mixins: "experimental"
mixins: "goma-ci" mixins: "goma-ci"
mixins: "goma-rbe-prod"
} }
builders { builders {
name: "Chromium Mac Goma Staging" name: "Chromium Mac Goma Staging"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment