Skip to content

GitLab

T
tangled
Commit c0558412 authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by Chromium LUCI CQ
Browse files
Options

Deprecate legacy Goma builder infra/config. 

Bug: b/168080931
Bug: b/147265909
Change-Id: Ib2248ce249427ed4af1cc769416da28089c79c46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2637713
Auto-Submit: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844726}
parent ea6373d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 2155 deletions
infra/config/generated/cr-buildbucket.cfg
View file @ c0558412
This diff is collapsed.
infra/config/generated/luci-milo.cfg
View file @ c0558412
......@@ -6426,69 +6426,6 @@ consoles {
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "regexp:refs/heads/master"
manifest_name: "REVISION"
builders {
name: "buildbucket/luci.chromium.goma/Win Builder Goma Canary"
category: "win|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Win Builder (dbg) Goma Canary"
category: "win|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/win32-archive-rel-goma-canary-localoutputcache"
category: "win|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder Goma Canary"
category: "mac|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Canary"
category: "mac|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-canary"
category: "mac|rel"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Canary (clobber)"
category: "mac|dbg"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-canary-localoutputcache"
category: "mac|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-canary"
category: "cros|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Linux Builder Goma Canary"
category: "linux|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-canary"
category: "linux|rel"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-canary-localoutputcache"
category: "linux|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-canary"
category: "android|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/ios-device-goma-canary-clobber"
category: "ios|rel"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-canary"
category: "rbe|linux|rel"
......@@ -11468,69 +11405,6 @@ consoles {
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "regexp:refs/heads/master"
manifest_name: "REVISION"
builders {
name: "buildbucket/luci.chromium.goma/Win Builder Goma Latest Client"
category: "win|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Win Builder (dbg) Goma Latest Client"
category: "win|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/win32-archive-rel-goma-latest-localoutputcache"
category: "win|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder Goma Latest Client"
category: "mac|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Latest Client"
category: "mac|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-latest"
category: "mac|rel"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/Mac Builder (dbg) Goma Latest Client (clobber)"
category: "mac|dbg"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/mac-archive-rel-goma-latest-localoutputcache"
category: "mac|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/chromeos-amd64-generic-rel-goma-latest"
category: "cros|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/Linux Builder Goma Latest Client"
category: "linux|rel"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-latest"
category: "linux|rel"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-latest-localoutputcache"
category: "linux|rel"
short_name: "loc"
}
builders {
name: "buildbucket/luci.chromium.goma/android-archive-dbg-goma-latest"
category: "android|dbg"
}
builders {
name: "buildbucket/luci.chromium.goma/ios-device-goma-latest-clobber"
category: "ios"
short_name: "clb"
}
builders {
name: "buildbucket/luci.chromium.goma/linux-archive-rel-goma-rbe-latest"
category: "rbe|linux|rel"
......
infra/config/generated/luci-scheduler.cfg
View file @ c0558412
This diff is collapsed.
infra/config/subprojects/goma/consoles/chromium.goma.fyi.star
View file @ c0558412
......@@ -10,70 +10,6 @@ luci.console_view(
include_experimental_builds = True,
repo = "https://chromium.googlesource.com/chromium/src",
entries = [
luci.console_view_entry(
builder = "goma/Win Builder Goma Canary",
category = "win|rel",
),
luci.console_view_entry(
builder = "goma/Win Builder (dbg) Goma Canary",
category = "win|dbg",
),
luci.console_view_entry(
builder = "goma/win32-archive-rel-goma-canary-localoutputcache",
category = "win|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/Mac Builder Goma Canary",
category = "mac|rel",
),
luci.console_view_entry(
builder = "goma/Mac Builder (dbg) Goma Canary",
category = "mac|dbg",
),
luci.console_view_entry(
builder = "goma/mac-archive-rel-goma-canary",
category = "mac|rel",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/Mac Builder (dbg) Goma Canary (clobber)",
category = "mac|dbg",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/mac-archive-rel-goma-canary-localoutputcache",
category = "mac|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/chromeos-amd64-generic-rel-goma-canary",
category = "cros|rel",
),
luci.console_view_entry(
builder = "goma/Linux Builder Goma Canary",
category = "linux|rel",
),
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-canary",
category = "linux|rel",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-canary-localoutputcache",
category = "linux|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/android-archive-dbg-goma-canary",
category = "android|dbg",
),
luci.console_view_entry(
builder = "goma/ios-device-goma-canary-clobber",
category = "ios|rel",
short_name = "clb",
),
# RBE
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-rbe-canary",
category = "rbe|linux|rel",
......
infra/config/subprojects/goma/consoles/goma.latest.star
View file @ c0558412
......@@ -9,70 +9,6 @@ luci.console_view(
header = HEADER,
repo = "https://chromium.googlesource.com/chromium/src",
entries = [
luci.console_view_entry(
builder = "goma/Win Builder Goma Latest Client",
category = "win|rel",
),
luci.console_view_entry(
builder = "goma/Win Builder (dbg) Goma Latest Client",
category = "win|dbg",
),
luci.console_view_entry(
builder = "goma/win32-archive-rel-goma-latest-localoutputcache",
category = "win|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/Mac Builder Goma Latest Client",
category = "mac|rel",
),
luci.console_view_entry(
builder = "goma/Mac Builder (dbg) Goma Latest Client",
category = "mac|dbg",
),
luci.console_view_entry(
builder = "goma/mac-archive-rel-goma-latest",
category = "mac|rel",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/Mac Builder (dbg) Goma Latest Client (clobber)",
category = "mac|dbg",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/mac-archive-rel-goma-latest-localoutputcache",
category = "mac|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/chromeos-amd64-generic-rel-goma-latest",
category = "cros|rel",
),
luci.console_view_entry(
builder = "goma/Linux Builder Goma Latest Client",
category = "linux|rel",
),
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-latest",
category = "linux|rel",
short_name = "clb",
),
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-latest-localoutputcache",
category = "linux|rel",
short_name = "loc",
),
luci.console_view_entry(
builder = "goma/android-archive-dbg-goma-latest",
category = "android|dbg",
),
luci.console_view_entry(
builder = "goma/ios-device-goma-latest-clobber",
category = "ios",
short_name = "clb",
),
# RBE
luci.console_view_entry(
builder = "goma/linux-archive-rel-goma-rbe-latest",
category = "rbe|linux|rel",
......
infra/config/subprojects/goma/goma.star
View file @ c0558412
......@@ -47,89 +47,6 @@ defaults.triggered_by.set(["chromium-gitiles-trigger"])
# latest client, etc.): XXX_YYY_builder where XXX is the part after the last dot
# in the builder group and YYY is the OS or goma grouping
def fyi_goma_canary_builder(*, name, **kwargs):
return builder(
name = name,
builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour,
**kwargs
)
fyi_goma_canary_builder(
name = "Linux Builder Goma Canary",
# keep to use trusty for this until chrome drops support of development
# on trusty.
os = os.LINUX_TRUSTY,
)
fyi_goma_canary_builder(
name = "Mac Builder (dbg) Goma Canary",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_canary_builder(
name = "Mac Builder (dbg) Goma Canary (clobber)",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_canary_builder(
name = "Mac Builder Goma Canary",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_canary_builder(
name = "Win Builder (dbg) Goma Canary",
os = os.WINDOWS_DEFAULT,
)
fyi_goma_canary_builder(
name = "Win Builder Goma Canary",
os = os.WINDOWS_DEFAULT,
)
fyi_goma_canary_builder(
name = "android-archive-dbg-goma-canary",
)
fyi_goma_canary_builder(
name = "chromeos-amd64-generic-rel-goma-canary",
)
fyi_goma_canary_builder(
name = "ios-device-goma-canary-clobber",
cores = None,
os = os.MAC_10_15,
xcode = xcode.x12a7209,
)
fyi_goma_canary_builder(
name = "linux-archive-rel-goma-canary",
)
fyi_goma_canary_builder(
name = "linux-archive-rel-goma-canary-localoutputcache",
)
fyi_goma_canary_builder(
name = "mac-archive-rel-goma-canary",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_canary_builder(
name = "mac-archive-rel-goma-canary-localoutputcache",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_canary_builder(
name = "win32-archive-rel-goma-canary-localoutputcache",
os = os.WINDOWS_DEFAULT,
)
def fyi_goma_rbe_canary_builder(
*,
name,
......@@ -193,87 +110,6 @@ fyi_goma_rbe_canary_builder(
os = os.MAC_DEFAULT,
)
def fyi_goma_latest_client_builder(*, name, os = os.LINUX_DEFAULT, **kwargs):
return builder(
name = name,
builder_group = "chromium.goma.fyi",
execution_timeout = 10 * time.hour,
os = os,
**kwargs
)
fyi_goma_latest_client_builder(
name = "Linux Builder Goma Latest Client",
)
fyi_goma_latest_client_builder(
name = "Mac Builder (dbg) Goma Latest Client",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "Mac Builder (dbg) Goma Latest Client (clobber)",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "Mac Builder Goma Latest Client",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "Win Builder (dbg) Goma Latest Client",
os = os.WINDOWS_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "Win Builder Goma Latest Client",
os = os.WINDOWS_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "android-archive-dbg-goma-latest",
)
fyi_goma_latest_client_builder(
name = "chromeos-amd64-generic-rel-goma-latest",
)
fyi_goma_latest_client_builder(
name = "ios-device-goma-latest-clobber",
cores = None,
os = os.MAC_10_15,
xcode = xcode.x12a7209,
)
fyi_goma_latest_client_builder(
name = "linux-archive-rel-goma-latest",
)
fyi_goma_latest_client_builder(
name = "linux-archive-rel-goma-latest-localoutputcache",
)
fyi_goma_latest_client_builder(
name = "mac-archive-rel-goma-latest",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "mac-archive-rel-goma-latest-localoutputcache",
cores = 4,
os = os.MAC_DEFAULT,
)
fyi_goma_latest_client_builder(
name = "win32-archive-rel-goma-latest-localoutputcache",
os = os.WINDOWS_DEFAULT,
)
def fyi_goma_rbe_latest_client_builder(
*,
name,
......
testing/buildbot/chromium.goma.fyi.json
View file @ c0558412
This diff is collapsed.
testing/buildbot/waterfalls.pyl
View file @ c0558412
......@@ -3403,33 +3403,6 @@
'name': 'chromium.goma.fyi',
'mixins': ['chromium-tester-service-account'],
'machines': {
'Linux Builder Goma Canary': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'Mac Builder (dbg) Goma Canary': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'Mac Builder (dbg) Goma Canary (clobber)': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'Mac Builder (dbg) Goma RBE Canary (clobber)': {
'additional_compile_targets': [
'all',
......@@ -3446,44 +3419,6 @@
'gtest_tests': 'goma_mac_gtests',
},
},
'Mac Builder Goma Canary': {
'additional_compile_targets': [
'all',
'pdf_fuzzers',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'Win Builder (dbg) Goma Canary': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'Win Builder Goma Canary': {
'additional_compile_targets': [
'all',
'pdf_fuzzers',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'android-archive-dbg-goma-canary': {
'additional_compile_targets': [
'all',
# This was copied over from recipe config, 'all' was already present
'chromedriver_webview_shell_apk',
],
},
'android-archive-dbg-goma-latest': {
'additional_compile_targets': [
'chromedriver_webview_shell_apk',
],
},
'android-archive-dbg-goma-rbe-ats-canary': {
'additional_compile_targets': [
'chromedriver_webview_shell_apk',
......@@ -3507,16 +3442,6 @@
# Note:
# chromeos-amd64-generic-rel-goma-* builders mirror targets of
# chromeos-amd64-generic-rel.
'chromeos-amd64-generic-rel-goma-canary': {
'additional_compile_targets': [
'chromiumos_preflight',
],
},
'chromeos-amd64-generic-rel-goma-latest': {
'additional_compile_targets': [
'chromiumos_preflight',
],
},
'chromeos-amd64-generic-rel-goma-rbe-canary': {
'additional_compile_targets': [
'chromiumos_preflight',
......@@ -3527,16 +3452,6 @@
'chromiumos_preflight',
],
},
'ios-device-goma-canary-clobber': {
'additional_compile_targets': [
'all',
]
},
'ios-device-goma-latest-clobber': {
'additional_compile_targets': [
'all',
]
},
'ios-device-goma-rbe-canary-clobber': {
'additional_compile_targets': [
'all',
......@@ -3547,28 +3462,6 @@
'all',
]
},
'linux-archive-rel-goma-canary': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'linux-archive-rel-goma-canary-localoutputcache': {
'additional_compile_targets': [
'all',
],
'mixins': [
'linux-xenial',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
'linux-archive-rel-goma-rbe-ats-canary': {
'additional_compile_targets': [
'all',
......@@ -3613,31 +3506,6 @@
'gtest_tests': 'goma_gtests',
},
},
'mac-archive-rel-goma-canary': {
'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'.
# See crbug.com/899425
'chrome',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'mac-archive-rel-goma-canary-localoutputcache': {
'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'.
# See crbug.com/825536
'chrome',
],
'test_suites': {
'gtest_tests': 'goma_mac_gtests',
},
},
'mac-archive-rel-goma-latest-localoutputcache': {
'additional_compile_targets': [
'chrome',
],
},
'mac-archive-rel-goma-rbe-canary': {
'additional_compile_targets': [
# Due to disk shortage, we build 'chrome' instead of 'all'.
......@@ -3658,14 +3526,6 @@
'gtest_tests': 'goma_mac_gtests',
},
},
'win32-archive-rel-goma-canary-localoutputcache': {
'additional_compile_targets': [
'all',
],
'test_suites': {
'gtest_tests': 'goma_gtests',
},
},
},
},
{
......
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