Skip to content

GitLab

T
tangled
Commit 17d1dbc4 authored by Haiyang Pan's avatar Haiyang Pan Committed by Chromium LUCI CQ
Browse files
Options

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
Show whitespace changes
Inline Side-by-side
Showing with 2436 additions and 2201 deletions
infra/config/generated/commit-queue.cfg
View file @ 17d1dbc4
......@@ -185,6 +185,10 @@ config_groups {
name: "chromium/codesearch/gen-win-try"
includable_only: true
}
builders {
name: "chromium/try/3pp-linux-amd64-packager"
includable_only: true
}
builders {
name: "chromium/try/android-10-arm64-rel"
includable_only: true
......
infra/config/generated/cr-buildbucket.cfg
View file @ 17d1dbc4
......@@ -18,6 +18,61 @@ buckets {
group: "project-chromium-ci-schedulers"
}
swarming {
builders {
name: "3pp-linux-amd64-packager"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.chromium.ci"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.packager\",\"package_path\":[],\"platform\":\"linux-amd64\",\"recipe\":\"chromium_3pp\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
experiments {
key: "chromium.resultdb.result_sink"
value: 100
}
experiments {
key: "chromium.resultdb.result_sink.gtests_local"
value: 100
}
experiments {
key: "chromium.resultdb.result_sink.junit_tests"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "ci_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_ci_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders {
name: "ASAN Debug"
swarming_host: "chromium-swarm.appspot.com"
......@@ -15604,7 +15659,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"recipe\":\"android/androidx_packager\"}"
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.packager\",\"recipe\":\"android/androidx_packager\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
......@@ -16429,7 +16484,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"avd_configs\":[\"tools/android/avd/proto/creation/generic_android23.textpb\",\"tools/android/avd/proto/creation/generic_android27.textpb\",\"tools/android/avd/proto/creation/generic_android28.textpb\",\"tools/android/avd/proto/creation/generic_android29.textpb\",\"tools/android/avd/proto/creation/generic_android30.textpb\",\"tools/android/avd/proto/creation/generic_playstore_android28.textpb\",\"tools/android/avd/proto/creation/generic_playstore_android30.textpb\"],\"recipe\":\"android/avd_packager\"}"
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"avd_configs\":[\"tools/android/avd/proto/creation/generic_android23.textpb\",\"tools/android/avd/proto/creation/generic_android27.textpb\",\"tools/android/avd/proto/creation/generic_android28.textpb\",\"tools/android/avd/proto/creation/generic_android29.textpb\",\"tools/android/avd/proto/creation/generic_android30.textpb\",\"tools/android/avd/proto/creation/generic_playstore_android28.textpb\",\"tools/android/avd/proto/creation/generic_playstore_android30.textpb\"],\"builder_group\":\"chromium.packager\",\"recipe\":\"android/avd_packager\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
......@@ -18240,7 +18295,7 @@ buckets {
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"packages\":[{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/25.0.2.yaml\",\"sdk_package_name\":\"build-tools;25.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/29.0.2.yaml\",\"sdk_package_name\":\"build-tools;29.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/30.0.1.yaml\",\"sdk_package_name\":\"build-tools;30.0.1\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/cmdline-tools.yaml\",\"sdk_package_name\":\"cmdline-tools;latest\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/emulator.yaml\",\"sdk_package_name\":\"emulator\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/extras/google/gcm.yaml\",\"sdk_package_name\":\"extras;google;gcm\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/patcher/v4.yaml\",\"sdk_package_name\":\"patcher;v4\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-29.yaml\",\"sdk_package_name\":\"platforms;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-30.yaml\",\"sdk_package_name\":\"platforms;android-30\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platform-tools.yaml\",\"sdk_package_name\":\"platform-tools\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-29.yaml\",\"sdk_package_name\":\"sources;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-27/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-27;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-27;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-30;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-30;google_apis_playstore;x86\"}],\"recipe\":\"android/sdk_packager\"}"
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.packager\",\"packages\":[{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/25.0.2.yaml\",\"sdk_package_name\":\"build-tools;25.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/29.0.2.yaml\",\"sdk_package_name\":\"build-tools;29.0.2\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/build-tools/30.0.1.yaml\",\"sdk_package_name\":\"build-tools;30.0.1\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/cmdline-tools.yaml\",\"sdk_package_name\":\"cmdline-tools;latest\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/emulator.yaml\",\"sdk_package_name\":\"emulator\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/extras/google/gcm.yaml\",\"sdk_package_name\":\"extras;google;gcm\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/patcher/v4.yaml\",\"sdk_package_name\":\"patcher;v4\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-29.yaml\",\"sdk_package_name\":\"platforms;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platforms/android-30.yaml\",\"sdk_package_name\":\"platforms;android-30\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/platform-tools.yaml\",\"sdk_package_name\":\"platform-tools\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/sources/android-29.yaml\",\"sdk_package_name\":\"sources;android-29\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-27/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-27;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-27;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-29;google_apis_playstore;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml\",\"sdk_package_name\":\"system-images;android-30;google_apis;x86\"},{\"cipd_yaml\":\"third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml\",\"sdk_package_name\":\"system-images;android-30;google_apis_playstore;x86\"}],\"recipe\":\"android/sdk_packager\"}"
execution_timeout_secs: 10800
build_numbers: YES
service_account: "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com"
......@@ -29902,6 +29957,65 @@ buckets {
identity: "project:v8"
}
swarming {
builders {
name: "3pp-linux-amd64-packager"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
dimensions: "builderless:1"
dimensions: "cores:8"
dimensions: "cpu:x86-64"
dimensions: "os:Ubuntu-16.04"
dimensions: "pool:luci.chromium.try"
dimensions: "ssd:0"
exe {
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master"
cmd: "recipes"
}
properties: "{\"$build/goma\":{\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.packager\",\"package_path\":[],\"platform\":\"linux-amd64\",\"recipe\":\"chromium_3pp\"}"
execution_timeout_secs: 14400
expiration_secs: 7200
caches {
name: "win_toolchain"
path: "win_toolchain"
}
build_numbers: YES
service_account: "chromium-cipd-try-builder@chops-service-accounts.iam.gserviceaccount.com"
task_template_canary_percentage {
value: 5
}
experiments {
key: "chromium.resultdb.result_sink"
value: 100
}
experiments {
key: "chromium.resultdb.result_sink.junit_tests"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
resultdb {
enable: true
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "try_test_results"
test_results {}
}
bq_exports {
project: "luci-resultdb"
dataset: "chromium"
table: "gpu_try_test_results"
test_results {
predicate {
test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
}
}
}
}
}
builders {
name: "android-10-arm64-rel"
swarming_host: "chromium-swarm.appspot.com"
infra/config/generated/luci-milo.cfg
View file @ 17d1dbc4
This source diff could not be displayed because it is too large. You can view the blob instead.
infra/config/generated/luci-scheduler.cfg
View file @ 17d1dbc4
......@@ -4,6 +4,17 @@
# For the schema of this file, see ProjectConfig message:
# 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 {
id: "ASAN Debug"
realm: "ci"
......
infra/config/generated/realms.cfg
View file @ 17d1dbc4
......@@ -207,6 +207,7 @@ realms {
name: "try"
bindings {
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-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
}
......
infra/config/lib/ci.star
View file @ 17d1dbc4
......@@ -234,6 +234,23 @@ def angle_windows_builder(*, name, **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):
return ci_builder(
name = name,
......@@ -759,6 +776,8 @@ ci = struct(
angle_windows_builder = angle_windows_builder,
chromium_builder = chromium_builder,
chromiumos_builder = chromiumos_builder,
cipd_3pp_builder = cipd_3pp_builder,
cipd_builder = cipd_builder,
clang_builder = clang_builder,
clang_mac_builder = clang_mac_builder,
dawn_linux_builder = dawn_linux_builder,
......
infra/config/lib/try.star
View file @ 17d1dbc4
......@@ -414,6 +414,23 @@ def chromium_win_builder(
**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):
return try_builder(
name = name,
......@@ -485,6 +502,8 @@ try_ = struct(
chromium_updater_mac_builder = chromium_updater_mac_builder,
chromium_updater_win_builder = chromium_updater_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_linux_builder = gpu_chromium_linux_builder,
gpu_chromium_mac_builder = gpu_chromium_mac_builder,
......
infra/config/recipes.star
View file @ 17d1dbc4
......@@ -63,6 +63,10 @@ build_recipe(
name = "recipe:chromium",
)
build_recipe(
name = "recipe:chromium_3pp",
)
build_recipe(
name = "recipe:chromium_afl",
)
......
infra/config/subprojects/chromium/ci.star
View file @ 17d1dbc4
......@@ -8,6 +8,7 @@ load("//lib/ci.star", "ci")
load("//lib/consoles.star", "consoles")
load("//console-header.star", "HEADER")
load("//project.star", "settings")
load("./packager_vars.star", "CHROMIUM_3PP_PROPERTIES")
def main_console_if_on_branch():
return branches.value(for_branches = "main")
......@@ -92,10 +93,6 @@ luci.gitiles_poller(
("mirrors", "{} CQ Mirrors Console".format(settings.project_title)),
)]
consoles.console_view(
name = "android.packager",
)
consoles.console_view(
name = "chromium",
branch_selector = branches.STANDARD_MILESTONE,
......@@ -342,6 +339,10 @@ consoles.console_view(
name = "chromium.mojo",
)
consoles.console_view(
name = "chromium.packager",
)
consoles.console_view(
name = "chromium.swangle",
ordering = {
......@@ -439,132 +440,6 @@ consoles.console_view(
# Builders are sorted first lexicographically by the function used to define
# them, then lexicographically by their name
ci.builder(
name = "android-androidx-packager",
console_view_entry = consoles.console_view_entry(
console_view = "android.packager",
short_name = "androidx",
),
executable = "recipe:android/androidx_packager",
schedule = "0 7,14,22 * * * *",
service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
triggered_by = [],
)
ci.builder(
name = "android-avd-packager",
console_view_entry = consoles.console_view_entry(
console_view = "android.packager",
short_name = "avd",
),
executable = "recipe:android/avd_packager",
properties = {
"avd_configs": [
"tools/android/avd/proto/creation/generic_android23.textpb",
"tools/android/avd/proto/creation/generic_android27.textpb",
"tools/android/avd/proto/creation/generic_android28.textpb",
"tools/android/avd/proto/creation/generic_android29.textpb",
"tools/android/avd/proto/creation/generic_android30.textpb",
"tools/android/avd/proto/creation/generic_playstore_android28.textpb",
"tools/android/avd/proto/creation/generic_playstore_android30.textpb",
],
},
schedule = "0 7 * * 0 *",
service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
triggered_by = [],
)
ci.builder(
name = "android-sdk-packager",
console_view_entry = consoles.console_view_entry(
console_view = "android.packager",
short_name = "sdk",
),
executable = "recipe:android/sdk_packager",
schedule = "0 7 * * 0 *",
service_account = "chromium-cipd-builder@chops-service-accounts.iam.gserviceaccount.com",
triggered_by = [],
properties = {
# We still package part of build-tools;25.0.2 to support
# http://bit.ly/2KNUygZ
"packages": [
{
"sdk_package_name": "build-tools;25.0.2",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/25.0.2.yaml",
},
{
"sdk_package_name": "build-tools;29.0.2",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/29.0.2.yaml",
},
{
"sdk_package_name": "build-tools;30.0.1",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/30.0.1.yaml",
},
{
"sdk_package_name": "cmdline-tools;latest",
"cipd_yaml": "third_party/android_sdk/cipd/cmdline-tools.yaml",
},
{
"sdk_package_name": "emulator",
"cipd_yaml": "third_party/android_sdk/cipd/emulator.yaml",
},
{
"sdk_package_name": "extras;google;gcm",
"cipd_yaml": "third_party/android_sdk/cipd/extras/google/gcm.yaml",
},
{
"sdk_package_name": "patcher;v4",
"cipd_yaml": "third_party/android_sdk/cipd/patcher/v4.yaml",
},
{
"sdk_package_name": "platforms;android-29",
"cipd_yaml": "third_party/android_sdk/cipd/platforms/android-29.yaml",
},
{
"sdk_package_name": "platforms;android-30",
"cipd_yaml": "third_party/android_sdk/cipd/platforms/android-30.yaml",
},
{
"sdk_package_name": "platform-tools",
"cipd_yaml": "third_party/android_sdk/cipd/platform-tools.yaml",
},
{
"sdk_package_name": "sources;android-29",
"cipd_yaml": "third_party/android_sdk/cipd/sources/android-29.yaml",
},
# Not yet available as R is not released to AOSP.
#{
# 'sdk_package_name': 'sources;android-30',
# 'cipd_yaml': 'third_party/android_sdk/cipd/sources/android-30.yaml'
#},
{
"sdk_package_name": "system-images;android-27;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-27;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml",
},
{
"sdk_package_name": "system-images;android-29;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-29;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml",
},
{
"sdk_package_name": "system-images;android-30;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-30;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml",
},
],
},
)
ci.android_builder(
name = "Android ASAN (dbg)",
console_view_entry = consoles.console_view_entry(
......@@ -1807,6 +1682,141 @@ ci.chromiumos_builder(
tree_closing = False,
)
ci.cipd_3pp_builder(
name = "3pp-linux-amd64-packager",
os = os.LINUX_DEFAULT,
console_view_entry = consoles.console_view_entry(
category = "3pp|linux",
short_name = "amd64",
),
schedule = "0 7 * * 0 *",
triggered_by = [],
properties = CHROMIUM_3PP_PROPERTIES["3pp-linux-amd64-packager"],
)
ci.cipd_builder(
name = "android-androidx-packager",
console_view_entry = consoles.console_view_entry(
category = "android",
short_name = "androidx",
),
executable = "recipe:android/androidx_packager",
schedule = "0 7,14,22 * * * *",
triggered_by = [],
)
ci.cipd_builder(
name = "android-avd-packager",
console_view_entry = consoles.console_view_entry(
category = "android",
short_name = "avd",
),
executable = "recipe:android/avd_packager",
schedule = "0 7 * * 0 *",
triggered_by = [],
properties = {
"avd_configs": [
"tools/android/avd/proto/creation/generic_android23.textpb",
"tools/android/avd/proto/creation/generic_android27.textpb",
"tools/android/avd/proto/creation/generic_android28.textpb",
"tools/android/avd/proto/creation/generic_android29.textpb",
"tools/android/avd/proto/creation/generic_android30.textpb",
"tools/android/avd/proto/creation/generic_playstore_android28.textpb",
"tools/android/avd/proto/creation/generic_playstore_android30.textpb",
],
},
)
ci.cipd_builder(
name = "android-sdk-packager",
console_view_entry = consoles.console_view_entry(
category = "android",
short_name = "sdk",
),
executable = "recipe:android/sdk_packager",
schedule = "0 7 * * 0 *",
triggered_by = [],
properties = {
# We still package part of build-tools;25.0.2 to support
# http://bit.ly/2KNUygZ
"packages": [
{
"sdk_package_name": "build-tools;25.0.2",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/25.0.2.yaml",
},
{
"sdk_package_name": "build-tools;29.0.2",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/29.0.2.yaml",
},
{
"sdk_package_name": "build-tools;30.0.1",
"cipd_yaml": "third_party/android_sdk/cipd/build-tools/30.0.1.yaml",
},
{
"sdk_package_name": "cmdline-tools;latest",
"cipd_yaml": "third_party/android_sdk/cipd/cmdline-tools.yaml",
},
{
"sdk_package_name": "emulator",
"cipd_yaml": "third_party/android_sdk/cipd/emulator.yaml",
},
{
"sdk_package_name": "extras;google;gcm",
"cipd_yaml": "third_party/android_sdk/cipd/extras/google/gcm.yaml",
},
{
"sdk_package_name": "patcher;v4",
"cipd_yaml": "third_party/android_sdk/cipd/patcher/v4.yaml",
},
{
"sdk_package_name": "platforms;android-29",
"cipd_yaml": "third_party/android_sdk/cipd/platforms/android-29.yaml",
},
{
"sdk_package_name": "platforms;android-30",
"cipd_yaml": "third_party/android_sdk/cipd/platforms/android-30.yaml",
},
{
"sdk_package_name": "platform-tools",
"cipd_yaml": "third_party/android_sdk/cipd/platform-tools.yaml",
},
{
"sdk_package_name": "sources;android-29",
"cipd_yaml": "third_party/android_sdk/cipd/sources/android-29.yaml",
},
# Not yet available as R is not released to AOSP.
#{
# 'sdk_package_name': 'sources;android-30',
# 'cipd_yaml': 'third_party/android_sdk/cipd/sources/android-30.yaml'
#},
{
"sdk_package_name": "system-images;android-27;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-27;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml",
},
{
"sdk_package_name": "system-images;android-29;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-29;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml",
},
{
"sdk_package_name": "system-images;android-30;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml",
},
{
"sdk_package_name": "system-images;android-30;google_apis_playstore;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml",
},
],
},
)
ci.clang_builder(
name = "CFI Linux CF",
goma_backend = goma.backend.RBE_PROD,
......
infra/config/subprojects/chromium/packager_vars.star 0 → 100644
View file @ 17d1dbc4
# 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 = [],
),
}
infra/config/subprojects/chromium/try.star
View file @ 17d1dbc4
......@@ -7,6 +7,7 @@ load("//lib/builders.star", "cpu", "goma", "os", "xcode")
load("//lib/consoles.star", "consoles")
load("//lib/try.star", "try_")
load("//project.star", "settings")
load("./packager_vars.star", "CHROMIUM_3PP_PROPERTIES")
try_.defaults.set(
bucket = "try",
......@@ -147,6 +148,10 @@ consoles.list_view(
branch_selector = branches.STANDARD_MILESTONE,
)
consoles.list_view(
name = "tryserver.chromium.packager",
)
consoles.list_view(
name = "tryserver.chromium.swangle",
)
......@@ -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(
name = "android_optional_gpu_tests_rel",
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