Commit 17d1dbc4 authored by Haiyang Pan's avatar Haiyang Pan Committed by Chromium LUCI CQ

chromium_3pp: Add initial linux-arm64 CI and try bots.

Introduced packager_vars.star so that properties will be the shared
between CI and matching try builders.

Also reorg the following builder to use a similar starlark structure:
* android-androidx-packager
* android-avd-packager
* android-sdk-packager

Bug: 1132368
Change-Id: I8001cfa818c2e647cc513e46a2f166fbe1e253df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625271
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843125}
parent 36d2cb43
...@@ -185,6 +185,10 @@ config_groups { ...@@ -185,6 +185,10 @@ config_groups {
name: "chromium/codesearch/gen-win-try" name: "chromium/codesearch/gen-win-try"
includable_only: true includable_only: true
} }
builders {
name: "chromium/try/3pp-linux-amd64-packager"
includable_only: true
}
builders { builders {
name: "chromium/try/android-10-arm64-rel" name: "chromium/try/android-10-arm64-rel"
includable_only: true includable_only: true
......
This diff is collapsed.
This diff is collapsed.
...@@ -4,6 +4,17 @@ ...@@ -4,6 +4,17 @@
# For the schema of this file, see ProjectConfig message: # For the schema of this file, see ProjectConfig message:
# https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg # https://luci-config.appspot.com/schemas/projects:luci-scheduler.cfg
job {
id: "3pp-linux-amd64-packager"
realm: "ci"
schedule: "0 7 * * 0 *"
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "3pp-linux-amd64-packager"
}
}
job { job {
id: "ASAN Debug" id: "ASAN Debug"
realm: "ci" realm: "ci"
......
...@@ -207,6 +207,7 @@ realms { ...@@ -207,6 +207,7 @@ realms {
name: "try" name: "try"
bindings { bindings {
role: "role/buildbucket.builderServiceAccount" role: "role/buildbucket.builderServiceAccount"
principals: "user:chromium-cipd-try-builder@chops-service-accounts.iam.gserviceaccount.com"
principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com" principals: "user:chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com" principals: "user:chromium-try-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
} }
......
...@@ -234,6 +234,23 @@ def angle_windows_builder(*, name, **kwargs): ...@@ -234,6 +234,23 @@ def angle_windows_builder(*, name, **kwargs):
**kwargs **kwargs
) )
def cipd_builder(*, name, **kwargs):
return ci_builder(
name = name,
builder_group = "chromium.packager",
service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs
)
def cipd_3pp_builder(*, name, os, properties, **kwargs):
return cipd_builder(
name = name,
executable = "recipe:chromium_3pp",
os = os,
properties = properties,
**kwargs
)
def chromium_builder(*, name, tree_closing = True, **kwargs): def chromium_builder(*, name, tree_closing = True, **kwargs):
return ci_builder( return ci_builder(
name = name, name = name,
...@@ -759,6 +776,8 @@ ci = struct( ...@@ -759,6 +776,8 @@ ci = struct(
angle_windows_builder = angle_windows_builder, angle_windows_builder = angle_windows_builder,
chromium_builder = chromium_builder, chromium_builder = chromium_builder,
chromiumos_builder = chromiumos_builder, chromiumos_builder = chromiumos_builder,
cipd_3pp_builder = cipd_3pp_builder,
cipd_builder = cipd_builder,
clang_builder = clang_builder, clang_builder = clang_builder,
clang_mac_builder = clang_mac_builder, clang_mac_builder = clang_mac_builder,
dawn_linux_builder = dawn_linux_builder, dawn_linux_builder = dawn_linux_builder,
......
...@@ -414,6 +414,23 @@ def chromium_win_builder( ...@@ -414,6 +414,23 @@ def chromium_win_builder(
**kwargs **kwargs
) )
def cipd_builder(*, name, **kwargs):
return try_builder(
name = name,
service_account = "chromium-cipd-try-builder@chops-service-accounts.iam.gserviceaccount.com",
**kwargs
)
def cipd_3pp_builder(*, name, os, properties, **kwargs):
return cipd_builder(
name = name,
builder_group = "tryserver.chromium.packager",
executable = "recipe:chromium_3pp",
os = os,
properties = properties,
**kwargs
)
def gpu_try_builder(*, name, builderless = False, execution_timeout = 6 * time.hour, **kwargs): def gpu_try_builder(*, name, builderless = False, execution_timeout = 6 * time.hour, **kwargs):
return try_builder( return try_builder(
name = name, name = name,
...@@ -485,6 +502,8 @@ try_ = struct( ...@@ -485,6 +502,8 @@ try_ = struct(
chromium_updater_mac_builder = chromium_updater_mac_builder, chromium_updater_mac_builder = chromium_updater_mac_builder,
chromium_updater_win_builder = chromium_updater_win_builder, chromium_updater_win_builder = chromium_updater_win_builder,
chromium_win_builder = chromium_win_builder, chromium_win_builder = chromium_win_builder,
cipd_3pp_builder = cipd_3pp_builder,
cipd_builder = cipd_builder,
gpu_chromium_android_builder = gpu_chromium_android_builder, gpu_chromium_android_builder = gpu_chromium_android_builder,
gpu_chromium_linux_builder = gpu_chromium_linux_builder, gpu_chromium_linux_builder = gpu_chromium_linux_builder,
gpu_chromium_mac_builder = gpu_chromium_mac_builder, gpu_chromium_mac_builder = gpu_chromium_mac_builder,
......
...@@ -63,6 +63,10 @@ build_recipe( ...@@ -63,6 +63,10 @@ build_recipe(
name = "recipe:chromium", name = "recipe:chromium",
) )
build_recipe(
name = "recipe:chromium_3pp",
)
build_recipe( build_recipe(
name = "recipe:chromium_afl", name = "recipe:chromium_afl",
) )
......
This diff is collapsed.
# Copyright 2020 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
def _chromium_3pp_properties(*, package_paths, platform):
"""Declares the properties of a builder that use the recipe chromium_3pp.
See https://chromium.googlesource.com/chromium/tools/build/+/master/recipes/recipes/chromium_3pp.proto
for the proto definitions.
"""
return {
"package_path": package_paths,
"platform": platform,
}
# Define the properties of chromium 3pp packagers and should be shared between
# CI and matching try builders.
CHROMIUM_3PP_PROPERTIES = {
"3pp-linux-amd64-packager": _chromium_3pp_properties(
platform = "linux-amd64",
package_paths = [],
),
}
...@@ -7,6 +7,7 @@ load("//lib/builders.star", "cpu", "goma", "os", "xcode") ...@@ -7,6 +7,7 @@ load("//lib/builders.star", "cpu", "goma", "os", "xcode")
load("//lib/consoles.star", "consoles") load("//lib/consoles.star", "consoles")
load("//lib/try.star", "try_") load("//lib/try.star", "try_")
load("//project.star", "settings") load("//project.star", "settings")
load("./packager_vars.star", "CHROMIUM_3PP_PROPERTIES")
try_.defaults.set( try_.defaults.set(
bucket = "try", bucket = "try",
...@@ -147,6 +148,10 @@ consoles.list_view( ...@@ -147,6 +148,10 @@ consoles.list_view(
branch_selector = branches.STANDARD_MILESTONE, branch_selector = branches.STANDARD_MILESTONE,
) )
consoles.list_view(
name = "tryserver.chromium.packager",
)
consoles.list_view( consoles.list_view(
name = "tryserver.chromium.swangle", name = "tryserver.chromium.swangle",
) )
...@@ -1579,6 +1584,12 @@ try_.chromium_win_builder( ...@@ -1579,6 +1584,12 @@ try_.chromium_win_builder(
), ),
) )
try_.cipd_3pp_builder(
name = "3pp-linux-amd64-packager",
os = os.LINUX_DEFAULT,
properties = CHROMIUM_3PP_PROPERTIES["3pp-linux-amd64-packager"],
)
try_.gpu_chromium_android_builder( try_.gpu_chromium_android_builder(
name = "android_optional_gpu_tests_rel", name = "android_optional_gpu_tests_rel",
branch_selector = branches.STANDARD_MILESTONE, branch_selector = branches.STANDARD_MILESTONE,
......
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