Skip to content

GitLab

T
tangled
Commit 44174464 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Commit Bot
Browse files
Options

Goma canary/latest builders aligned to the base on CI config. 

The CL also removes unnecessary mb_config.pyl.

Bug: b/137246264
Change-Id: Ib241089a5c6c1a0c67e5effe6ef9efb1f7d30db3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1732095Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686699}
parent 0d137f80
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 62 deletions
infra/config/cr-buildbucket.cfg
View file @ 44174464
...@@ -3371,7 +3371,7 @@ buckets { ...@@ -3371,7 +3371,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Mac Goma Canary (clobber)" name: "mac-archive-rel-goma-canary"
dimensions: "os:Mac-10.13" dimensions: "os:Mac-10.13"
dimensions: "cores:4" dimensions: "cores:4"
mixins: "fyi-ci" mixins: "fyi-ci"
...@@ -3388,13 +3388,13 @@ buckets { ...@@ -3388,13 +3388,13 @@ buckets {
mixins: "builderless" mixins: "builderless"
} }
builders { builders {
name: "Android Builder (dbg) Goma Canary" name: "android-archive-dbg-goma-canary"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless" mixins: "builderless"
} }
builders { builders {
name: "Mac Goma Canary LocalOutputCache" name: "mac-archive-rel-goma-canary-localoutputcache"
dimensions: "os:Mac-10.13" dimensions: "os:Mac-10.13"
dimensions: "cores:4" dimensions: "cores:4"
mixins: "fyi-ci" mixins: "fyi-ci"
...@@ -3416,7 +3416,7 @@ buckets { ...@@ -3416,7 +3416,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Linux x64 Goma Canary LocalOutputCache" name: "linux-archive-rel-goma-canary-localoutputcache"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "builderless" mixins: "builderless"
mixins: "linux-xenial" mixins: "linux-xenial"
...@@ -3440,7 +3440,7 @@ buckets { ...@@ -3440,7 +3440,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Win Goma Canary LocalOutputCache" name: "win32-archive-rel-goma-canary-localoutputcache"
dimensions: "os:Windows-10" dimensions: "os:Windows-10"
mixins: "fyi-ci" mixins: "fyi-ci"
} }
...@@ -3456,7 +3456,7 @@ buckets { ...@@ -3456,7 +3456,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Linux x64 Goma Canary (clobber)" name: "linux-archive-rel-goma-canary"
mixins: "fyi-ci" mixins: "fyi-ci"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless" mixins: "builderless"
...@@ -3469,7 +3469,7 @@ buckets { ...@@ -3469,7 +3469,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Mac Goma Latest Client (clobber)" name: "mac-archive-rel-goma-latest"
dimensions: "os:Mac-10.13" dimensions: "os:Mac-10.13"
dimensions: "cores:4" dimensions: "cores:4"
mixins: "fyi-ci" mixins: "fyi-ci"
...@@ -3480,12 +3480,13 @@ buckets { ...@@ -3480,12 +3480,13 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Android Builder (dbg) Goma Latest Client" name: "android-archive-dbg-goma-latest"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Mac Goma Latest Client LocalOutputCache" name: "mac-archive-rel-goma-latest-localoutputcache"
dimensions: "os:Mac-10.13" dimensions: "os:Mac-10.13"
dimensions: "cores:4" dimensions: "cores:4"
mixins: "fyi-ci" mixins: "fyi-ci"
...@@ -3507,8 +3508,9 @@ buckets { ...@@ -3507,8 +3508,9 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Linux x64 Goma Latest Client LocalOutputCache" name: "linux-archive-rel-goma-latest-localoutputcache"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
...@@ -3527,7 +3529,7 @@ buckets { ...@@ -3527,7 +3529,7 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Win Goma Latest Client LocalOutputCache" name: "win32-archive-rel-goma-latest-localoutputcache"
dimensions: "os:Windows-10" dimensions: "os:Windows-10"
mixins: "fyi-ci" mixins: "fyi-ci"
} }
...@@ -3543,8 +3545,9 @@ buckets { ...@@ -3543,8 +3545,9 @@ buckets {
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
name: "Linux x64 Goma Latest Client (clobber)" name: "linux-archive-rel-goma-latest"
mixins: "linux-xenial" mixins: "linux-xenial"
mixins: "builderless"
mixins: "fyi-ci" mixins: "fyi-ci"
} }
builders { builders {
......
infra/config/luci-scheduler.cfg
View file @ 44174464
...@@ -69,8 +69,8 @@ trigger { ...@@ -69,8 +69,8 @@ trigger {
triggers: "ASan Release Media (32-bit x86 with V8-ARM)" triggers: "ASan Release Media (32-bit x86 with V8-ARM)"
triggers: "Afl Upload Linux ASan" triggers: "Afl Upload Linux ASan"
triggers: "Android ASAN (dbg)" triggers: "Android ASAN (dbg)"
triggers: "Android Builder (dbg) Goma Canary" triggers: "android-archive-dbg-goma-canary"
triggers: "Android Builder (dbg) Goma Latest Client" triggers: "android-archive-dbg-goma-latest"
triggers: "Android CFI" triggers: "Android CFI"
triggers: "Android FYI 32 Vk Release (Pixel 2)" triggers: "Android FYI 32 Vk Release (Pixel 2)"
triggers: "Android FYI 32 dEQP Vk Release (Pixel 2)" triggers: "Android FYI 32 dEQP Vk Release (Pixel 2)"
...@@ -206,10 +206,10 @@ trigger { ...@@ -206,10 +206,10 @@ trigger {
triggers: "Linux TSan Builder" triggers: "Linux TSan Builder"
triggers: "Linux Viz" triggers: "Linux Viz"
triggers: "Linux remote_run Builder" triggers: "Linux remote_run Builder"
triggers: "Linux x64 Goma Canary (clobber)" triggers: "linux-archive-rel-goma-canary"
triggers: "Linux x64 Goma Canary LocalOutputCache" triggers: "linux-archive-rel-goma-canary-localoutputcache"
triggers: "Linux x64 Goma Latest Client (clobber)" triggers: "linux-archive-rel-goma-latest"
triggers: "Linux x64 Goma Latest Client LocalOutputCache" triggers: "linux-archive-rel-goma-latest-localoutputcache"
triggers: "MSAN Release (chained origins)" triggers: "MSAN Release (chained origins)"
triggers: "MSAN Release (no origins)" triggers: "MSAN Release (no origins)"
triggers: "Mac ASAN Release Media" triggers: "Mac ASAN Release Media"
...@@ -224,10 +224,10 @@ trigger { ...@@ -224,10 +224,10 @@ trigger {
triggers: "Mac Builder Goma Latest Client" triggers: "Mac Builder Goma Latest Client"
triggers: "Mac Builder" triggers: "Mac Builder"
triggers: "Mac FYI GPU ASAN Release" triggers: "Mac FYI GPU ASAN Release"
triggers: "Mac Goma Canary (clobber)" triggers: "mac-archive-rel-goma-canary"
triggers: "Mac Goma Canary LocalOutputCache" triggers: "mac-archive-rel-goma-canary-localoutputcache"
triggers: "Mac Goma Latest Client (clobber)" triggers: "mac-archive-rel-goma-latest"
triggers: "Mac Goma Latest Client LocalOutputCache" triggers: "mac-archive-rel-goma-latest-localoutputcache"
triggers: "Mac deterministic (dbg)" triggers: "Mac deterministic (dbg)"
triggers: "Mac deterministic" triggers: "Mac deterministic"
triggers: "Memory Infra Tester" triggers: "Memory Infra Tester"
...@@ -285,8 +285,8 @@ trigger { ...@@ -285,8 +285,8 @@ trigger {
triggers: "Win Builder Goma Canary" triggers: "Win Builder Goma Canary"
triggers: "Win Builder Goma Latest Client" triggers: "Win Builder Goma Latest Client"
triggers: "Win Builder" triggers: "Win Builder"
triggers: "Win Goma Canary LocalOutputCache" triggers: "win32-archive-rel-goma-canary-localoutputcache"
triggers: "Win Goma Latest Client LocalOutputCache" triggers: "win32-archive-rel-goma-latest-localoutputcache"
triggers: "Win cl.exe Goma Canary LocalOutputCache" triggers: "Win cl.exe Goma Canary LocalOutputCache"
triggers: "Win cl.exe Goma Latest Client LocalOutputCache" triggers: "Win cl.exe Goma Latest Client LocalOutputCache"
triggers: "Win x64 Builder (dbg)" triggers: "Win x64 Builder (dbg)"
...@@ -3381,22 +3381,22 @@ job { ...@@ -3381,22 +3381,22 @@ job {
} }
job { job {
id: "Android Builder (dbg) Goma Canary" id: "android-archive-dbg-goma-canary"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Android Builder (dbg) Goma Canary" builder: "android-archive-dbg-goma-canary"
} }
} }
job { job {
id: "Android Builder (dbg) Goma Latest Client" id: "android-archive-dbg-goma-latest"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Android Builder (dbg) Goma Latest Client" builder: "android-archive-dbg-goma-latest"
} }
} }
...@@ -3784,42 +3784,42 @@ job { ...@@ -3784,42 +3784,42 @@ job {
} }
job { job {
id: "Linux x64 Goma Canary (clobber)" id: "linux-archive-rel-goma-canary"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Linux x64 Goma Canary (clobber)" builder: "linux-archive-rel-goma-canary"
} }
} }
job { job {
id: "Linux x64 Goma Canary LocalOutputCache" id: "linux-archive-rel-goma-canary-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Linux x64 Goma Canary LocalOutputCache" builder: "linux-archive-rel-goma-canary-localoutputcache"
} }
} }
job { job {
id: "Linux x64 Goma Latest Client (clobber)" id: "linux-archive-rel-goma-latest"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Linux x64 Goma Latest Client (clobber)" builder: "linux-archive-rel-goma-latest"
} }
} }
job { job {
id: "Linux x64 Goma Latest Client LocalOutputCache" id: "linux-archive-rel-goma-latest-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Linux x64 Goma Latest Client LocalOutputCache" builder: "linux-archive-rel-goma-latest-localoutputcache"
} }
} }
...@@ -3970,22 +3970,22 @@ job { ...@@ -3970,22 +3970,22 @@ job {
} }
job { job {
id: "Mac Goma Canary (clobber)" id: "mac-archive-rel-goma-canary"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Mac Goma Canary (clobber)" builder: "mac-archive-rel-goma-canary"
} }
} }
job { job {
id: "Mac Goma Canary LocalOutputCache" id: "mac-archive-rel-goma-canary-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Mac Goma Canary LocalOutputCache" builder: "mac-archive-rel-goma-canary-localoutputcache"
} }
} }
...@@ -4000,22 +4000,22 @@ job { ...@@ -4000,22 +4000,22 @@ job {
} }
job { job {
id: "Mac Goma Latest Client (clobber)" id: "mac-archive-rel-goma-latest"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Mac Goma Latest Client (clobber)" builder: "mac-archive-rel-goma-latest"
} }
} }
job { job {
id: "Mac Goma Latest Client LocalOutputCache" id: "mac-archive-rel-goma-latest-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Mac Goma Latest Client LocalOutputCache" builder: "mac-archive-rel-goma-latest-localoutputcache"
} }
} }
...@@ -4310,12 +4310,12 @@ job { ...@@ -4310,12 +4310,12 @@ job {
} }
job { job {
id: "Win Goma Canary LocalOutputCache" id: "win32-archive-rel-goma-canary-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Win Goma Canary LocalOutputCache" builder: "win32-archive-rel-goma-canary-localoutputcache"
} }
} }
...@@ -4350,12 +4350,12 @@ job { ...@@ -4350,12 +4350,12 @@ job {
} }
job { job {
id: "Win Goma Latest Client LocalOutputCache" id: "win32-archive-rel-goma-latest-localoutputcache"
acl_sets: "default" acl_sets: "default"
buildbucket: { buildbucket: {
server: "cr-buildbucket.appspot.com" server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci" bucket: "luci.chromium.ci"
builder: "Win Goma Latest Client LocalOutputCache" builder: "win32-archive-rel-goma-latest-localoutputcache"
} }
} }
......
tools/mb/mb_config.pyl
View file @ 44174464
...@@ -242,20 +242,6 @@ ...@@ -242,20 +242,6 @@
'ios-device-goma-canary-clobber': 'ios_error', 'ios-device-goma-canary-clobber': 'ios_error',
'ios-device-goma-latest-clobber': 'ios_error', 'ios-device-goma-latest-clobber': 'ios_error',
# TODO(yyanagisawa): remove when rename finishes.
'Linux x64 Goma Canary (clobber)': 'release_bot',
'Linux x64 Goma Canary LocalOutputCache': 'release_bot',
'Linux x64 Goma Latest Client (clobber)': 'release_bot',
'Linux x64 Goma Latest Client LocalOutputCache': 'release_bot',
'Win Goma Canary LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression',
'Win Goma Latest Client LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression',
'Mac Goma Canary (clobber)': 'release_bot_mac_strip_minimal_symbols',
'Mac Goma Latest Client (clobber)': 'release_bot_mac_strip_minimal_symbols',
'Mac Goma Canary LocalOutputCache': 'release_bot_mac_strip_minimal_symbols',
'Mac Goma Latest Client LocalOutputCache': 'release_bot_mac_strip_minimal_symbols',
'Android Builder (dbg) Goma Canary': 'android_without_codecs_debug_bot',
'Android Builder (dbg) Goma Latest Client': 'android_without_codecs_debug_bot',
# TODO(yyanagisawa): deprecate cl.exe. # TODO(yyanagisawa): deprecate cl.exe.
'Win cl.exe Goma Canary LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression_no_clang', 'Win cl.exe Goma Canary LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression_no_clang',
'Win cl.exe Goma Latest Client LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression_no_clang', 'Win cl.exe Goma Latest Client LocalOutputCache': 'release_bot_x86_minimal_symbols_enable_archive_compression_no_clang',
......
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