Skip to content

Commit 7bc018c

Browse files
global-integration-rollercopybara-github
global-integration-roller
authored and
copybara-github
committed
[roll] Roll Global Integration
GitOrigin-RevId: d26d9852f4b8c13729c8fd57b8d2781fa62db375 Change-Id: I5441371b3bd3426ada0fd59e35af748cf36a7a10
1 parent ff15a85 commit 7bc018c

16 files changed

+225
-835
lines changed

‎ctf/all‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<manifest>
33
<imports>
44
<localimport file="f16"/>
5-
<localimport file="f17"/>
65
<localimport file="f20"/>
7-
<localimport file="f21"/>
86
<localimport file="f22"/>
97
<localimport file="f23"/>
8+
<localimport file="f24"/>
9+
<localimport file="f25"/>
1010
</imports>
1111
</manifest>

‎ctf/f20‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package name="fuchsia/cts/${platform}"
66
path="prebuilt/ctf/f20/{{.OS}}-{{.Arch}}"
77
platforms="linux-amd64"
8-
version="git_revision:e1c0feae0fe84015e1c866c98dffdd73a83ec977" />
8+
version="git_revision:e75db3a0c0523add80618657cd7aca86fe1550b0" />
99
</packages>
1010
</manifest>

‎ctf/f22‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package name="fuchsia/cts/${platform}"
66
path="prebuilt/ctf/f22/{{.OS}}-{{.Arch}}"
77
platforms="linux-amd64"
8-
version="git_revision:669ef04adc21bec6851551c4cef4c326165ea101" />
8+
version="git_revision:e5e0c5527c72144f256351092d3447bd9d7abc81" />
99
</packages>
1010
</manifest>

‎ctf/f23‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package name="fuchsia/cts/${platform}"
66
path="prebuilt/ctf/f23/{{.OS}}-{{.Arch}}"
77
platforms="linux-amd64"
8-
version="git_revision:0312184f3466dbef2d2ebaf702e1251928d5913d" />
8+
version="git_revision:0dced93413e79558c9cc6e813537b0611a6e6b2c" />
99
</packages>
1010
</manifest>

‎ctf/f17‎ renamed to ‎ctf/f24‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<packages>
44
<!-- Versioned CTF release. See ctf_generate_manifest.py for details. -->
55
<package name="fuchsia/cts/${platform}"
6-
path="prebuilt/ctf/f17/{{.OS}}-{{.Arch}}"
6+
path="prebuilt/ctf/f24/{{.OS}}-{{.Arch}}"
77
platforms="linux-amd64"
8-
version="git_revision:365ddbbc4ee0d8bc733c3fee5beebf816f96c2ca" />
8+
version="git_revision:78e333f04b0a7f06ec1a6d454ff4705275564fa8" />
99
</packages>
1010
</manifest>

‎ctf/f21‎ renamed to ‎ctf/f25‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<packages>
44
<!-- Versioned CTF release. See ctf_generate_manifest.py for details. -->
55
<package name="fuchsia/cts/${platform}"
6-
path="prebuilt/ctf/f21/{{.OS}}-{{.Arch}}"
6+
path="prebuilt/ctf/f25/{{.OS}}-{{.Arch}}"
77
platforms="linux-amd64"
8-
version="git_revision:b59377755c6b27527a40a2ea2026d6457b638a77" />
8+
version="git_revision:90b66b243f0128699a36f8bfb3d2b8d2966112c4" />
99
</packages>
1010
</manifest>

‎infra/config/generated/fuchsia/fint_params/global.ci/core.x64-sdk_source_sets_and_shlibs-api17-build_only.textproto‎ renamed to ‎infra/config/generated/fuchsia/fint_params/global.ci/core.x64-sdk_source_sets_and_shlibs-api26-build_only.textproto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
optimize: DEBUG
55
product: "products/core.gni"
66
gn_args: "build_should_trace_actions = true"
7-
gn_args: "override_target_api_level = 17"
7+
gn_args: "override_target_api_level = 26"
88
gn_args: "restat_cc = true"
99
gn_args: "restat_rust = true"
1010
gn_args: "truncate_build_info_commit_date = true"

‎infra/config/generated/fuchsia/fint_params/global.ci/core.x64-sdk_source_sets_and_shlibs-api21-build_only.textproto‎ renamed to ‎infra/config/generated/fuchsia/fint_params/try/core.x64-sdk_source_sets_and_shlibs-api26-build_only.textproto‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
optimize: DEBUG
55
product: "products/core.gni"
66
gn_args: "build_should_trace_actions = true"
7-
gn_args: "override_target_api_level = 21"
7+
gn_args: "override_target_api_level = 26"
88
gn_args: "restat_cc = true"
99
gn_args: "restat_rust = true"
1010
gn_args: "truncate_build_info_commit_date = true"
@@ -16,6 +16,7 @@ host_labels: "//bundles/infra/build"
1616
target_arch: X64
1717
pave: true
1818
include_prebuilt_binary_manifests: true
19+
skip_if_unaffected: true
1920
rust_rbe_enable: true
2021
cxx_rbe_enable: true
2122
incremental: true

‎infra/config/generated/fuchsia/luci/cr-buildbucket.cfg‎

Lines changed: 85 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -18640,80 +18640,6 @@ buckets {
1864018640
dimensions: "pool:luci.fuchsia.ci"
1864118641
}
1864218642
}
18643-
builders {
18644-
name: "core.x64-sdk_source_sets_and_shlibs-api17-build_only"
18645-
swarming_host: "chromium-swarm.appspot.com"
18646-
dimensions: "cores:32"
18647-
dimensions: "cpu:x64"
18648-
dimensions: "gce:1"
18649-
dimensions: "os:Linux"
18650-
dimensions: "pool:luci.fuchsia.ci"
18651-
dimensions: "role:builder"
18652-
exe {
18653-
cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
18654-
cipd_version: "git_revision:90d41459556e2176139e3f97f66104bf8ec693c5"
18655-
cmd: "luciexe"
18656-
}
18657-
properties:
18658-
'{'
18659-
' "$fuchsia/builder_tags": {'
18660-
' "in_fuchsia_critical_path": true,'
18661-
' "include_in_flake_analysis": true'
18662-
' },'
18663-
' "led_builder_is_bootstrapped": true,'
18664-
' "recipe": "fuchsia/build",'
18665-
' "recipes_host_override": "fuchsia.googlesource.com"'
18666-
'}'
18667-
execution_timeout_secs: 10200
18668-
expiration_secs: 21600
18669-
caches {
18670-
name: "builder"
18671-
path: "builder"
18672-
}
18673-
caches {
18674-
name: "symbol"
18675-
path: "symbol"
18676-
}
18677-
caches {
18678-
name: "fuchsia_incremental_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
18679-
path: "incremental"
18680-
wait_for_warm_cache_secs: 120
18681-
}
18682-
caches {
18683-
name: "fuchsia_rbe_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
18684-
path: "rbe"
18685-
wait_for_warm_cache_secs: 120
18686-
}
18687-
service_account: "[email protected]"
18688-
experiments {
18689-
key: "use_ffx_test"
18690-
value: 100
18691-
}
18692-
resultdb {
18693-
enable: true
18694-
bq_exports {
18695-
project: "fuchsia-infra"
18696-
dataset: "resultdb"
18697-
table: "ci"
18698-
test_results {}
18699-
}
18700-
bq_exports {
18701-
project: "fuchsia-infra"
18702-
dataset: "resultdb"
18703-
table: "artifacts_ci"
18704-
text_artifacts {}
18705-
}
18706-
history_options {
18707-
use_invocation_timestamp: true
18708-
}
18709-
}
18710-
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air."
18711-
shadow_builder_adjustments {
18712-
service_account: "[email protected]"
18713-
pool: "luci.fuchsia.ci"
18714-
dimensions: "pool:luci.fuchsia.ci"
18715-
}
18716-
}
1871718643
builders {
1871818644
name: "core.x64-sdk_source_sets_and_shlibs-api20-build_only"
1871918645
swarming_host: "chromium-swarm.appspot.com"
@@ -18789,7 +18715,7 @@ buckets {
1878918715
}
1879018716
}
1879118717
builders {
18792-
name: "core.x64-sdk_source_sets_and_shlibs-api21-build_only"
18718+
name: "core.x64-sdk_source_sets_and_shlibs-api22-build_only"
1879318719
swarming_host: "chromium-swarm.appspot.com"
1879418720
dimensions: "cores:32"
1879518721
dimensions: "cpu:x64"
@@ -18863,7 +18789,7 @@ buckets {
1886318789
}
1886418790
}
1886518791
builders {
18866-
name: "core.x64-sdk_source_sets_and_shlibs-api22-build_only"
18792+
name: "core.x64-sdk_source_sets_and_shlibs-api23-build_only"
1886718793
swarming_host: "chromium-swarm.appspot.com"
1886818794
dimensions: "cores:32"
1886918795
dimensions: "cpu:x64"
@@ -18897,12 +18823,12 @@ buckets {
1889718823
path: "symbol"
1889818824
}
1889918825
caches {
18900-
name: "fuchsia_incremental_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
18826+
name: "fuchsia_incremental_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
1890118827
path: "incremental"
1890218828
wait_for_warm_cache_secs: 120
1890318829
}
1890418830
caches {
18905-
name: "fuchsia_rbe_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
18831+
name: "fuchsia_rbe_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
1890618832
path: "rbe"
1890718833
wait_for_warm_cache_secs: 120
1890818834
}
@@ -18937,7 +18863,7 @@ buckets {
1893718863
}
1893818864
}
1893918865
builders {
18940-
name: "core.x64-sdk_source_sets_and_shlibs-api23-build_only"
18866+
name: "core.x64-sdk_source_sets_and_shlibs-api24-build_only"
1894118867
swarming_host: "chromium-swarm.appspot.com"
1894218868
dimensions: "cores:32"
1894318869
dimensions: "cpu:x64"
@@ -18971,12 +18897,12 @@ buckets {
1897118897
path: "symbol"
1897218898
}
1897318899
caches {
18974-
name: "fuchsia_incremental_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
18900+
name: "fuchsia_incremental_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
1897518901
path: "incremental"
1897618902
wait_for_warm_cache_secs: 120
1897718903
}
1897818904
caches {
18979-
name: "fuchsia_rbe_9c2bd2e7ad3ccc411934f1aaab642489fe95245cfb0ef84a51b6662bf873ad4b"
18905+
name: "fuchsia_rbe_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
1898018906
path: "rbe"
1898118907
wait_for_warm_cache_secs: 120
1898218908
}
@@ -19011,7 +18937,7 @@ buckets {
1901118937
}
1901218938
}
1901318939
builders {
19014-
name: "core.x64-sdk_source_sets_and_shlibs-api24-build_only"
18940+
name: "core.x64-sdk_source_sets_and_shlibs-api25-build_only"
1901518941
swarming_host: "chromium-swarm.appspot.com"
1901618942
dimensions: "cores:32"
1901718943
dimensions: "cpu:x64"
@@ -19085,7 +19011,7 @@ buckets {
1908519011
}
1908619012
}
1908719013
builders {
19088-
name: "core.x64-sdk_source_sets_and_shlibs-api25-build_only"
19014+
name: "core.x64-sdk_source_sets_and_shlibs-api26-build_only"
1908919015
swarming_host: "chromium-swarm.appspot.com"
1909019016
dimensions: "cores:32"
1909119017
dimensions: "cpu:x64"
@@ -52205,10 +52131,7 @@ buckets {
5220552131
}
5220652132
properties:
5220752133
'{'
52208-
' "$fuchsia/builder_tags": {'
52209-
' "in_fuchsia_critical_path": true,'
52210-
' "include_in_flake_analysis": true'
52211-
' },'
52134+
' "is_fyi": true,'
5221252135
' "led_builder_is_bootstrapped": true,'
5221352136
' "recipe": "fuchsia/build",'
5221452137
' "recipes_host_override": "fuchsia.googlesource.com"'
@@ -52253,7 +52176,7 @@ buckets {
5225352176
text_artifacts {}
5225452177
}
5225552178
}
52256-
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nThe corresponding CI builder can be found <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.x64-sdk_source_sets_and_shlibs-api17-build_only\">here</a>"
52179+
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air."
5225752180
shadow_builder_adjustments {
5225852181
service_account: "[email protected]"
5225952182
pool: "luci.fuchsia.try"
@@ -52483,10 +52406,7 @@ buckets {
5248352406
}
5248452407
properties:
5248552408
'{'
52486-
' "$fuchsia/builder_tags": {'
52487-
' "in_fuchsia_critical_path": true,'
52488-
' "include_in_flake_analysis": true'
52489-
' },'
52409+
' "is_fyi": true,'
5249052410
' "led_builder_is_bootstrapped": true,'
5249152411
' "recipe": "fuchsia/build",'
5249252412
' "recipes_host_override": "fuchsia.googlesource.com"'
@@ -52531,7 +52451,7 @@ buckets {
5253152451
text_artifacts {}
5253252452
}
5253352453
}
52534-
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nThe corresponding CI builder can be found <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.x64-sdk_source_sets_and_shlibs-api21-build_only\">here</a>"
52454+
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air."
5253552455
shadow_builder_adjustments {
5253652456
service_account: "[email protected]"
5253752457
pool: "luci.fuchsia.try"
@@ -52767,7 +52687,10 @@ buckets {
5276752687
}
5276852688
properties:
5276952689
'{'
52770-
' "is_fyi": true,'
52690+
' "$fuchsia/builder_tags": {'
52691+
' "in_fuchsia_critical_path": true,'
52692+
' "include_in_flake_analysis": true'
52693+
' },'
5277152694
' "led_builder_is_bootstrapped": true,'
5277252695
' "recipe": "fuchsia/build",'
5277352696
' "recipes_host_override": "fuchsia.googlesource.com"'
@@ -52819,6 +52742,74 @@ buckets {
5281952742
dimensions: "pool:luci.fuchsia.try"
5282052743
}
5282152744
}
52745+
builders {
52746+
name: "core.x64-sdk_source_sets_and_shlibs-api26-build_only"
52747+
swarming_host: "chromium-swarm.appspot.com"
52748+
dimensions: "cores:32"
52749+
dimensions: "cpu:x64"
52750+
dimensions: "gce:1"
52751+
dimensions: "os:Linux"
52752+
dimensions: "pool:luci.fuchsia.try"
52753+
dimensions: "role:builder"
52754+
exe {
52755+
cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
52756+
cipd_version: "git_revision:90d41459556e2176139e3f97f66104bf8ec693c5"
52757+
cmd: "luciexe"
52758+
}
52759+
properties:
52760+
'{'
52761+
' "is_fyi": true,'
52762+
' "led_builder_is_bootstrapped": true,'
52763+
' "recipe": "fuchsia/build",'
52764+
' "recipes_host_override": "fuchsia.googlesource.com"'
52765+
'}'
52766+
execution_timeout_secs: 10200
52767+
expiration_secs: 21600
52768+
caches {
52769+
name: "builder"
52770+
path: "builder"
52771+
}
52772+
caches {
52773+
name: "symbol"
52774+
path: "symbol"
52775+
}
52776+
caches {
52777+
name: "fuchsia_incremental_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
52778+
path: "incremental"
52779+
wait_for_warm_cache_secs: 120
52780+
}
52781+
caches {
52782+
name: "fuchsia_rbe_4eb5a1deb85eef9577b2ed436e62ab8b12deb04c46c9ce1c3e0f57144c3759ff"
52783+
path: "rbe"
52784+
wait_for_warm_cache_secs: 120
52785+
}
52786+
service_account: "[email protected]"
52787+
experiments {
52788+
key: "use_ffx_test"
52789+
value: 100
52790+
}
52791+
resultdb {
52792+
enable: true
52793+
bq_exports {
52794+
project: "fuchsia-infra"
52795+
dataset: "resultdb"
52796+
table: "try"
52797+
test_results {}
52798+
}
52799+
bq_exports {
52800+
project: "fuchsia-infra"
52801+
dataset: "resultdb"
52802+
table: "artifacts_try"
52803+
text_artifacts {}
52804+
}
52805+
}
52806+
description_html: "The <a href=\"https://fuchsia.dev/fuchsia-src/development/build/build_system/boards_and_products?hl=en#core-product\">core</a> product has networking capabilities and supports updates and installing additional software over-the-air.\n\nThe corresponding CI builder can be found <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.x64-sdk_source_sets_and_shlibs-api26-build_only\">here</a>"
52807+
shadow_builder_adjustments {
52808+
service_account: "[email protected]"
52809+
pool: "luci.fuchsia.try"
52810+
dimensions: "pool:luci.fuchsia.try"
52811+
}
52812+
}
5282252813
builders {
5282352814
name: "core.x64-sdk_source_sets_and_shlibs-api4-build_only"
5282452815
swarming_host: "chromium-swarm.appspot.com"

0 commit comments

Comments
 (0)