[roll] Roll Global Integration
GitOrigin-RevId: 5990c459505a9cdb400d35f6d48f03633cdcb0bd
Change-Id: Iee63a753809c08d7491a85e3515b4a220331c325
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-host_test_only-mac.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-host_test_only-mac.textproto
deleted file mode 100644
index 8b9f31e..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-host_test_only-mac.textproto
+++ /dev/null
@@ -1,21 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-optimize: RELEASE
-product: "products/core.gni"
-ninja_targets: ":developer_host_tools"
-universe_packages: "//bundles/buildbot/core"
-host_labels: "//bundles/buildbot/host"
-host_labels: "//bundles/infra/build"
-host_labels: "//bundles/infra/test"
-target_arch: X64
-pave: true
-include_prebuilt_binary_manifests: true
-include_host_tests: true
-test_durations_file: "prebuilt/infra/test_durations/fuchsia/core.x64-host_test_only-mac.json"
-default_test_durations_file: "prebuilt/infra/test_durations/fuchsia/default.json"
-use_goma: true
-incremental: true
-use_temporary_go_cache: true
-hermetic_test_packages: "//bundles/buildbot/core:hermetic_tests"
-e2e_test_labels: "//bundles/buildbot/core:e2e_tests"
diff --git a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
index ab6f716..c07599c 100644
--- a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
@@ -16722,139 +16722,6 @@
}
}
builders {
- name: "core.x64-host_test_only-mac"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:2"
- dimensions: "cpu:x64"
- dimensions: "gce:1"
- dimensions: "os:Linux"
- dimensions: "pool:luci.fuchsia.ci"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:06366b6e3f518669907e377d256de87747dc21c1"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$fuchsia/builder_tags": {'
- ' "in_fuchsia_critical_path": true,'
- ' "include_in_flake_analysis": true'
- ' },'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "fuchsia/fuchsia",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 13800
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- resultdb {
- enable: true
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "ci"
- test_results {}
- }
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "artifacts_ci"
- text_artifacts {}
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- 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."
- shadow_builder_adjustments {
- service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.ci"
- dimensions: "pool:luci.fuchsia.ci"
- }
- }
- builders {
- name: "core.x64-host_test_only-mac-subbuild"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8|12"
- dimensions: "cpu:x64"
- dimensions: "gce:0"
- dimensions: "os:Mac"
- dimensions: "pool:luci.fuchsia.ci"
- dimensions: "role:builder"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:06366b6e3f518669907e377d256de87747dc21c1"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "$fuchsia/builder_tags": {'
- ' "in_fuchsia_critical_path": true,'
- ' "include_in_flake_analysis": true'
- ' },'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "fuchsia/build",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 13800
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "macos_sdk_v2"
- path: "macos_sdk"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- caches {
- name: "fuchsia_goma_b823579d1b33396abd22a1c005b1b8ba1419e4d7c0a69e4c10cc516a9f2f582b"
- path: "goma"
- wait_for_warm_cache_secs: 120
- }
- caches {
- name: "fuchsia_incremental_b823579d1b33396abd22a1c005b1b8ba1419e4d7c0a69e4c10cc516a9f2f582b"
- path: "incremental"
- wait_for_warm_cache_secs: 120
- }
- service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- resultdb {
- enable: true
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "ci"
- test_results {}
- }
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "artifacts_ci"
- text_artifacts {}
- }
- history_options {
- use_invocation_timestamp: true
- }
- }
- description_html: "This builder is the subbuild for <a href=\"https://ci.chromium.org/p/fuchsia/builders/global.ci/core.x64-host_test_only-mac\">core.x64-host_test_only-mac</a>.\n\nThe <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."
- shadow_builder_adjustments {
- service_account: "fuchsia-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.ci"
- dimensions: "pool:luci.fuchsia.ci"
- }
- }
- builders {
name: "core.x64-host_tsan"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:2"
@@ -50372,9 +50239,6 @@
}
properties:
'{'
- ' "$fuchsia/builder_tags": {'
- ' "run_postsubmit_tryjobs_include": true'
- ' },'
' "is_fyi": true,'
' "led_builder_is_bootstrapped": true,'
' "recipe": "fuchsia/fuchsia",'
@@ -50406,7 +50270,7 @@
text_artifacts {}
}
}
- 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-host_test_only-mac\">here</a>"
+ 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."
shadow_builder_adjustments {
service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
pool: "luci.fuchsia.try"
@@ -50474,7 +50338,7 @@
text_artifacts {}
}
}
- description_html: "This builder is the subbuild for <a href=\"https://ci.chromium.org/p/fuchsia/builders/try/core.x64-host_test_only-mac\">core.x64-host_test_only-mac</a>.\n\nThe <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-host_test_only-mac\">here</a>"
+ description_html: "This builder is the subbuild for <a href=\"https://ci.chromium.org/p/fuchsia/builders/try/core.x64-host_test_only-mac\">core.x64-host_test_only-mac</a>.\n\nThe <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."
shadow_builder_adjustments {
service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
pool: "luci.fuchsia.try"
diff --git a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
index 543d392..22400a9 100644
--- a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
+++ b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
@@ -1521,15 +1521,6 @@
}
}
job {
- id: "core.x64-host_test_only-mac-e5a0ec7f"
- realm: "global.ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "global.ci"
- builder: "core.x64-host_test_only-mac"
- }
-}
-job {
id: "core.x64-host_tsan-e5a0ec7f"
realm: "global.ci"
buildbucket {
@@ -4476,7 +4467,6 @@
triggers: "core.x64-fuzz_asan-build_only-e5a0ec7f"
triggers: "core.x64-fuzz_ubsan-build_only-e5a0ec7f"
triggers: "core.x64-gce-e5a0ec7f"
- triggers: "core.x64-host_test_only-mac-e5a0ec7f"
triggers: "core.x64-host_tsan-e5a0ec7f"
triggers: "core.x64-kasan-e5a0ec7f"
triggers: "core.x64-kubsan-e5a0ec7f"
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac-subbuild.json b/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac-subbuild.json
deleted file mode 100644
index 9d9606a..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac-subbuild.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "$fuchsia/rbe": {
- "instance": "projects/rbe-fuchsia-prod/instances/default"
- },
- "no_python2": true,
- "recipe": "fuchsia/build",
- "spec": {
- "artifact_gcs_bucket": "fuchsia-artifacts",
- "build": {
- "enable_sandboxing": true,
- "environment_tags": [
- "mac"
- ],
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-host_test_only-mac.textproto",
- "incremental": true,
- "run_tests": true,
- "timeout_secs": 7200
- },
- "checkout": {
- "manifest": "flower",
- "project": "integration",
- "remote": "https://fuchsia.googlesource.com/integration"
- },
- "gcs_bucket": "fuchsia-build",
- "test": {
- "affected_tests_multiply_threshold": 100,
- "botanist_grace_period_secs": 60,
- "default_service_account": "artifact-readers@fuchsia-infra.iam.gserviceaccount.com",
- "enable_sandboxing": true,
- "ffx_experiment_level": 1,
- "max_attempts": 1,
- "max_attempts_per_test": 3,
- "pave": true,
- "per_shard_package_repos": true,
- "per_test_timeout_secs": 300,
- "pool": "fuchsia.tests",
- "swarming_expiration_timeout_secs": 18000,
- "swarming_grace_period_secs": 30,
- "swarming_io_timeout_secs": 360,
- "target_shard_duration_secs": 540,
- "upload_results": true,
- "use_cas": true,
- "use_cas_for_images": true
- }
- }
-}
diff --git a/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac.json b/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac.json
deleted file mode 100644
index d7dc2b5..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/core.x64-host_test_only-mac.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "no_python2": true,
- "recipe": "fuchsia/fuchsia",
- "spec": {
- "artifact_gcs_bucket": "fuchsia-artifacts",
- "build": {
- "enable_sandboxing": true,
- "environment_tags": [
- "mac"
- ],
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/core.x64-host_test_only-mac.textproto",
- "incremental": true,
- "run_tests": true,
- "timeout_secs": 7200
- },
- "checkout": {
- "manifest": "flower",
- "project": "integration",
- "remote": "https://fuchsia.googlesource.com/integration"
- },
- "gcs_bucket": "fuchsia-build",
- "test": {
- "affected_tests_multiply_threshold": 100,
- "botanist_grace_period_secs": 60,
- "default_service_account": "artifact-readers@fuchsia-infra.iam.gserviceaccount.com",
- "enable_sandboxing": true,
- "ffx_experiment_level": 1,
- "max_attempts": 1,
- "max_attempts_per_test": 3,
- "pave": true,
- "per_shard_package_repos": true,
- "per_test_timeout_secs": 300,
- "pool": "fuchsia.tests",
- "swarming_expiration_timeout_secs": 18000,
- "swarming_grace_period_secs": 30,
- "swarming_io_timeout_secs": 360,
- "target_shard_duration_secs": 540,
- "upload_results": true,
- "use_cas": true,
- "use_cas_for_images": true
- }
- },
- "uses_subbuild": true
-}
diff --git a/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac-subbuild.json b/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac-subbuild.json
index c11ebac..49d6add 100644
--- a/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac-subbuild.json
+++ b/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac-subbuild.json
@@ -1,7 +1,4 @@
{
- "$fuchsia/autocorrelator": {
- "ci_bucket": "global.ci"
- },
"$fuchsia/rbe": {
"instance": "projects/rbe-fuchsia-prod/instances/default"
},
diff --git a/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac.json b/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac.json
index b78e0bf..df021d3 100644
--- a/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac.json
+++ b/infra/config/generated/fuchsia/properties/try/core.x64-host_test_only-mac.json
@@ -1,7 +1,4 @@
{
- "$fuchsia/autocorrelator": {
- "ci_bucket": "global.ci"
- },
"no_python2": true,
"recipe": "fuchsia/fuchsia",
"spec": {
