[roll] Roll Global Integration
GitOrigin-RevId: 8cc172baad537aa0ab9725b5ec26c126c9bfc264
Change-Id: Ic561c4c6c67f7c903e3ff40b6fd0fd77f2ff7c07
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-arm64-mac.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-arm64-mac.textproto
deleted file mode 100644
index 88fc878..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-arm64-mac.textproto
+++ /dev/null
@@ -1,34 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_RELEASE
-board: "boards/arm64.gni"
-product: "products/core.gni"
-gn_args: "exported_package_labels=[]"
-host_labels: "//build/tools/json_validator:install"
-host_labels: "//src/developer/ffx:host"
-host_labels: "//src/diagnostics/triage:install"
-host_labels: "//src/storage/tools/blobfs-compression:blobfs-compression"
-host_labels: "//tools/build/ninjago/buildstats"
-host_labels: "//tools/build/ninjago/ninjatrace"
-host_labels: "//tools/bundle_fetcher"
-host_labels: "//tools/debug/buildidtool"
-host_labels: "//tools/debug/debugsyms"
-host_labels: "//tools/funnel:host"
-host_labels: "//tools/orchestrate"
-host_labels: "//tools/vboot_reference"
-target_arch: ARM64
-include_prebuilt_binary_manifests: true
-tools: "blobfs-compression"
-tools: "buildidtool"
-tools: "buildstats"
-tools: "bundle_fetcher"
-tools: "debugsyms"
-tools: "ffx"
-tools: "ffx"
-tools: "funnel"
-tools: "futility"
-tools: "json_validator"
-tools: "ninjatrace"
-tools: "orchestrate"
-tools: "triage"
diff --git a/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-x64-mac.textproto b/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-x64-mac.textproto
deleted file mode 100644
index 3e5347c..0000000
--- a/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-x64-mac.textproto
+++ /dev/null
@@ -1,34 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_RELEASE
-board: "boards/x64.gni"
-product: "products/core.gni"
-gn_args: "exported_package_labels=[]"
-host_labels: "//build/tools/json_validator:install"
-host_labels: "//src/developer/ffx:host"
-host_labels: "//src/diagnostics/triage:install"
-host_labels: "//src/storage/tools/blobfs-compression:blobfs-compression"
-host_labels: "//tools/build/ninjago/buildstats"
-host_labels: "//tools/build/ninjago/ninjatrace"
-host_labels: "//tools/bundle_fetcher"
-host_labels: "//tools/debug/buildidtool"
-host_labels: "//tools/debug/debugsyms"
-host_labels: "//tools/funnel:host"
-host_labels: "//tools/orchestrate"
-host_labels: "//tools/vboot_reference"
-target_arch: X64
-include_prebuilt_binary_manifests: true
-tools: "blobfs-compression"
-tools: "buildidtool"
-tools: "buildstats"
-tools: "bundle_fetcher"
-tools: "debugsyms"
-tools: "ffx"
-tools: "ffx"
-tools: "funnel"
-tools: "futility"
-tools: "json_validator"
-tools: "ninjatrace"
-tools: "orchestrate"
-tools: "triage"
diff --git a/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-arm64-mac.textproto b/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-arm64-mac.textproto
deleted file mode 100644
index 88fc878..0000000
--- a/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-arm64-mac.textproto
+++ /dev/null
@@ -1,34 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_RELEASE
-board: "boards/arm64.gni"
-product: "products/core.gni"
-gn_args: "exported_package_labels=[]"
-host_labels: "//build/tools/json_validator:install"
-host_labels: "//src/developer/ffx:host"
-host_labels: "//src/diagnostics/triage:install"
-host_labels: "//src/storage/tools/blobfs-compression:blobfs-compression"
-host_labels: "//tools/build/ninjago/buildstats"
-host_labels: "//tools/build/ninjago/ninjatrace"
-host_labels: "//tools/bundle_fetcher"
-host_labels: "//tools/debug/buildidtool"
-host_labels: "//tools/debug/debugsyms"
-host_labels: "//tools/funnel:host"
-host_labels: "//tools/orchestrate"
-host_labels: "//tools/vboot_reference"
-target_arch: ARM64
-include_prebuilt_binary_manifests: true
-tools: "blobfs-compression"
-tools: "buildidtool"
-tools: "buildstats"
-tools: "bundle_fetcher"
-tools: "debugsyms"
-tools: "ffx"
-tools: "ffx"
-tools: "funnel"
-tools: "futility"
-tools: "json_validator"
-tools: "ninjatrace"
-tools: "orchestrate"
-tools: "triage"
diff --git a/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-x64-mac.textproto b/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-x64-mac.textproto
deleted file mode 100644
index 3e5347c..0000000
--- a/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-x64-mac.textproto
+++ /dev/null
@@ -1,34 +0,0 @@
-# Auto-generated by lucicfg.
-# Do not modify manually.
-
-compilation_mode: COMPILATION_MODE_RELEASE
-board: "boards/x64.gni"
-product: "products/core.gni"
-gn_args: "exported_package_labels=[]"
-host_labels: "//build/tools/json_validator:install"
-host_labels: "//src/developer/ffx:host"
-host_labels: "//src/diagnostics/triage:install"
-host_labels: "//src/storage/tools/blobfs-compression:blobfs-compression"
-host_labels: "//tools/build/ninjago/buildstats"
-host_labels: "//tools/build/ninjago/ninjatrace"
-host_labels: "//tools/bundle_fetcher"
-host_labels: "//tools/debug/buildidtool"
-host_labels: "//tools/debug/debugsyms"
-host_labels: "//tools/funnel:host"
-host_labels: "//tools/orchestrate"
-host_labels: "//tools/vboot_reference"
-target_arch: X64
-include_prebuilt_binary_manifests: true
-tools: "blobfs-compression"
-tools: "buildidtool"
-tools: "buildstats"
-tools: "bundle_fetcher"
-tools: "debugsyms"
-tools: "ffx"
-tools: "ffx"
-tools: "funnel"
-tools: "futility"
-tools: "json_validator"
-tools: "ninjatrace"
-tools: "orchestrate"
-tools: "triage"
diff --git a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
index 9f4af38..672faea 100644
--- a/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/fuchsia/luci/cr-buildbucket.cfg
@@ -20110,69 +20110,6 @@
}
}
builders {
- name: "host_prebuilts-arm64-mac"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8|12"
- dimensions: "cpu:arm64"
- dimensions: "gce:0"
- dimensions: "os:Mac"
- dimensions: "pool:luci.fuchsia.ci"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:c48180c4c346612292403c848e69d2cb9ba0b939"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "is_fyi": true,'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "publish_build_artifacts",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 8400
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "macos_sdk_v2"
- path: "macos_sdk"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- caches {
- name: "fuchsia_incremental_7be6b18f676bd97a3f3e9b14e1822300db87010f11a9b17d374b096064e0a2ca"
- path: "incremental"
- }
- service_account: "tools-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
- }
- }
- shadow_builder_adjustments {
- service_account: "tools-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.ci"
- dimensions: "pool:luci.fuchsia.ci"
- }
- }
- builders {
name: "host_prebuilts-x64-linux"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:32"
@@ -20237,69 +20174,6 @@
}
}
builders {
- name: "host_prebuilts-x64-mac"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8|12"
- dimensions: "cpu:x64"
- dimensions: "gce:0"
- dimensions: "os:Mac"
- dimensions: "pool:luci.fuchsia.ci"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:c48180c4c346612292403c848e69d2cb9ba0b939"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "is_fyi": true,'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "publish_build_artifacts",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 8400
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "macos_sdk_v2"
- path: "macos_sdk"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- caches {
- name: "fuchsia_incremental_9010646b425794d694309cb123577c9262d3fe6f46116c676d681bfc25d3a020"
- path: "incremental"
- }
- service_account: "tools-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
- }
- }
- shadow_builder_adjustments {
- service_account: "tools-ci-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.ci"
- dimensions: "pool:luci.fuchsia.ci"
- }
- }
- builders {
name: "kythe"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:32"
@@ -57439,66 +57313,6 @@
}
}
builders {
- name: "host_prebuilts-arm64-mac"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8|12"
- dimensions: "cpu:arm64"
- dimensions: "gce:0"
- dimensions: "os:Mac"
- dimensions: "pool:luci.fuchsia.try"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:c48180c4c346612292403c848e69d2cb9ba0b939"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "is_fyi": true,'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "publish_build_artifacts",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 8400
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "macos_sdk_v2"
- path: "macos_sdk"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- caches {
- name: "fuchsia_incremental_7be6b18f676bd97a3f3e9b14e1822300db87010f11a9b17d374b096064e0a2ca"
- path: "incremental"
- }
- service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
- resultdb {
- enable: true
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "try"
- test_results {}
- }
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "artifacts_try"
- text_artifacts {}
- }
- }
- shadow_builder_adjustments {
- service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.try"
- dimensions: "pool:luci.fuchsia.try"
- }
- }
- builders {
name: "host_prebuilts-x64-linux"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:32"
@@ -57560,66 +57374,6 @@
}
}
builders {
- name: "host_prebuilts-x64-mac"
- swarming_host: "chromium-swarm.appspot.com"
- dimensions: "cores:8|12"
- dimensions: "cpu:x64"
- dimensions: "gce:0"
- dimensions: "os:Mac"
- dimensions: "pool:luci.fuchsia.try"
- exe {
- cipd_package: "fuchsia/infra/recipe_wrapper/${platform}"
- cipd_version: "git_revision:c48180c4c346612292403c848e69d2cb9ba0b939"
- cmd: "luciexe"
- }
- properties:
- '{'
- ' "is_fyi": true,'
- ' "led_builder_is_bootstrapped": true,'
- ' "recipe": "publish_build_artifacts",'
- ' "recipes_host_override": "fuchsia.googlesource.com"'
- '}'
- execution_timeout_secs: 8400
- expiration_secs: 21600
- caches {
- name: "builder"
- path: "builder"
- }
- caches {
- name: "macos_sdk_v2"
- path: "macos_sdk"
- }
- caches {
- name: "symbol"
- path: "symbol"
- }
- caches {
- name: "fuchsia_incremental_9010646b425794d694309cb123577c9262d3fe6f46116c676d681bfc25d3a020"
- path: "incremental"
- }
- service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
- resultdb {
- enable: true
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "try"
- test_results {}
- }
- bq_exports {
- project: "fuchsia-infra"
- dataset: "resultdb"
- table: "artifacts_try"
- text_artifacts {}
- }
- }
- shadow_builder_adjustments {
- service_account: "fuchsia-try-builder@fuchsia-infra.iam.gserviceaccount.com"
- pool: "luci.fuchsia.try"
- dimensions: "pool:luci.fuchsia.try"
- }
- }
- builders {
name: "infra"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cores:32"
diff --git a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
index 83f21c9..8c6681c 100644
--- a/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
+++ b/infra/config/generated/fuchsia/luci/fake-commit-queue.cfg
@@ -1820,21 +1820,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -4244,21 +4234,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -7785,21 +7765,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -11739,21 +11709,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -14257,21 +14217,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -17241,21 +17191,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -19665,21 +19605,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -22089,21 +22019,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -24611,21 +24531,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -27035,21 +26945,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -29459,21 +29359,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -32021,21 +31911,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -34445,21 +34325,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -36869,21 +36739,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -39293,21 +39153,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -41810,21 +41660,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -44234,21 +44074,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -46658,21 +46488,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
@@ -49338,21 +49158,11 @@
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-arm64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/host_prebuilts-x64-linux"
includable_only: true
disable_reuse_footers: "Depends-On"
}
builders {
- name: "fuchsia/try/host_prebuilts-x64-mac"
- includable_only: true
- disable_reuse_footers: "Depends-On"
- }
- builders {
name: "fuchsia/try/lockfile-checker"
disable_reuse_footers: "Depends-On"
location_filters {
diff --git a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
index 4b1d02d..388fd57 100644
--- a/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
+++ b/infra/config/generated/fuchsia/luci/luci-scheduler.cfg
@@ -1963,15 +1963,6 @@
}
}
job {
- id: "global.ci-host_prebuilts-arm64-mac-e5a0ec7f"
- realm: "global.ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "global.ci"
- builder: "host_prebuilts-arm64-mac"
- }
-}
-job {
id: "global.ci-host_prebuilts-x64-linux-e5a0ec7f"
realm: "global.ci"
buildbucket {
@@ -1981,15 +1972,6 @@
}
}
job {
- id: "global.ci-host_prebuilts-x64-mac-e5a0ec7f"
- realm: "global.ci"
- buildbucket {
- server: "cr-buildbucket.appspot.com"
- bucket: "global.ci"
- builder: "host_prebuilts-x64-mac"
- }
-}
-job {
id: "global.ci-kythe-e5a0ec7f"
realm: "global.ci"
buildbucket {
@@ -4658,9 +4640,7 @@
triggers: "global.ci-fuchsia.arm64-release-e5a0ec7f"
triggers: "global.ci-fuchsia.x64-release-e5a0ec7f"
triggers: "global.ci-host_prebuilts-arm64-linux-e5a0ec7f"
- triggers: "global.ci-host_prebuilts-arm64-mac-e5a0ec7f"
triggers: "global.ci-host_prebuilts-x64-linux-e5a0ec7f"
- triggers: "global.ci-host_prebuilts-x64-mac-e5a0ec7f"
triggers: "global.ci-kythe-e5a0ec7f"
triggers: "global.ci-minimal.arm64-balanced-e5a0ec7f"
triggers: "global.ci-minimal.arm64-release-build_only-e5a0ec7f"
diff --git a/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-arm64-mac.json b/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-arm64-mac.json
deleted file mode 100644
index 7f6506d..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-arm64-mac.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "$fuchsia/rbe": {
- "instance": "projects/rbe-fuchsia-prod/instances/default"
- },
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-arm64-mac.textproto",
- "manifest": "flower",
- "no_python2": true,
- "recipe": "publish_build_artifacts",
- "remote": "https://fuchsia.googlesource.com/integration",
- "tools": [
- {
- "gcs_bucket": "fuchsia-ffx",
- "gcs_path": "ffx-macos-arm64",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/blobfs-compression/${platform}",
- "name": "blobfs-compression"
- },
- {
- "cipd_package": "fuchsia/tools/buildidtool/${platform}",
- "name": "buildidtool"
- },
- {
- "cipd_package": "fuchsia/tools/buildstats/${platform}",
- "name": "buildstats"
- },
- {
- "cipd_package": "fuchsia/tools/bundle_fetcher/${platform}",
- "name": "bundle_fetcher"
- },
- {
- "cipd_package": "fuchsia/tools/debugsyms/${platform}",
- "name": "debugsyms"
- },
- {
- "cipd_package": "fuchsia/tools/ffx/${platform}",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/funnel/${platform}",
- "name": "funnel"
- },
- {
- "cipd_package": "fuchsia/tools/futility/${platform}",
- "name": "futility"
- },
- {
- "cipd_package": "fuchsia/tools/json_validator/${platform}",
- "name": "json_validator"
- },
- {
- "cipd_package": "fuchsia/tools/ninjatrace/${platform}",
- "name": "ninjatrace"
- },
- {
- "cipd_package": "fuchsia/tools/orchestrate/${platform}",
- "name": "orchestrate"
- },
- {
- "cipd_package": "fuchsia/tools/triage/${platform}",
- "name": "triage"
- }
- ]
-}
diff --git a/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-x64-mac.json b/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-x64-mac.json
deleted file mode 100644
index a3d4ab3..0000000
--- a/infra/config/generated/fuchsia/properties/global.ci/host_prebuilts-x64-mac.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "$fuchsia/rbe": {
- "instance": "projects/rbe-fuchsia-prod/instances/default"
- },
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/global.ci/host_prebuilts-x64-mac.textproto",
- "manifest": "flower",
- "no_python2": true,
- "recipe": "publish_build_artifacts",
- "remote": "https://fuchsia.googlesource.com/integration",
- "tools": [
- {
- "gcs_bucket": "fuchsia-ffx",
- "gcs_path": "ffx-macos-x64",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/blobfs-compression/${platform}",
- "name": "blobfs-compression"
- },
- {
- "cipd_package": "fuchsia/tools/buildidtool/${platform}",
- "name": "buildidtool"
- },
- {
- "cipd_package": "fuchsia/tools/buildstats/${platform}",
- "name": "buildstats"
- },
- {
- "cipd_package": "fuchsia/tools/bundle_fetcher/${platform}",
- "name": "bundle_fetcher"
- },
- {
- "cipd_package": "fuchsia/tools/debugsyms/${platform}",
- "name": "debugsyms"
- },
- {
- "cipd_package": "fuchsia/tools/ffx/${platform}",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/funnel/${platform}",
- "name": "funnel"
- },
- {
- "cipd_package": "fuchsia/tools/futility/${platform}",
- "name": "futility"
- },
- {
- "cipd_package": "fuchsia/tools/json_validator/${platform}",
- "name": "json_validator"
- },
- {
- "cipd_package": "fuchsia/tools/ninjatrace/${platform}",
- "name": "ninjatrace"
- },
- {
- "cipd_package": "fuchsia/tools/orchestrate/${platform}",
- "name": "orchestrate"
- },
- {
- "cipd_package": "fuchsia/tools/triage/${platform}",
- "name": "triage"
- }
- ]
-}
diff --git a/infra/config/generated/fuchsia/properties/try/host_prebuilts-arm64-mac.json b/infra/config/generated/fuchsia/properties/try/host_prebuilts-arm64-mac.json
deleted file mode 100644
index 73369f4..0000000
--- a/infra/config/generated/fuchsia/properties/try/host_prebuilts-arm64-mac.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "$fuchsia/rbe": {
- "instance": "projects/rbe-fuchsia-prod/instances/default"
- },
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-arm64-mac.textproto",
- "manifest": "flower",
- "no_python2": true,
- "recipe": "publish_build_artifacts",
- "remote": "https://fuchsia.googlesource.com/integration",
- "tools": [
- {
- "gcs_bucket": "fuchsia-ffx",
- "gcs_path": "ffx-macos-arm64",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/blobfs-compression/${platform}",
- "name": "blobfs-compression"
- },
- {
- "cipd_package": "fuchsia/tools/buildidtool/${platform}",
- "name": "buildidtool"
- },
- {
- "cipd_package": "fuchsia/tools/buildstats/${platform}",
- "name": "buildstats"
- },
- {
- "cipd_package": "fuchsia/tools/bundle_fetcher/${platform}",
- "name": "bundle_fetcher"
- },
- {
- "cipd_package": "fuchsia/tools/debugsyms/${platform}",
- "name": "debugsyms"
- },
- {
- "cipd_package": "fuchsia/tools/ffx/${platform}",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/funnel/${platform}",
- "name": "funnel"
- },
- {
- "cipd_package": "fuchsia/tools/futility/${platform}",
- "name": "futility"
- },
- {
- "cipd_package": "fuchsia/tools/json_validator/${platform}",
- "name": "json_validator"
- },
- {
- "cipd_package": "fuchsia/tools/ninjatrace/${platform}",
- "name": "ninjatrace"
- },
- {
- "cipd_package": "fuchsia/tools/orchestrate/${platform}",
- "name": "orchestrate"
- },
- {
- "cipd_package": "fuchsia/tools/triage/${platform}",
- "name": "triage"
- }
- ]
-}
diff --git a/infra/config/generated/fuchsia/properties/try/host_prebuilts-x64-mac.json b/infra/config/generated/fuchsia/properties/try/host_prebuilts-x64-mac.json
deleted file mode 100644
index 5756844..0000000
--- a/infra/config/generated/fuchsia/properties/try/host_prebuilts-x64-mac.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "$fuchsia/rbe": {
- "instance": "projects/rbe-fuchsia-prod/instances/default"
- },
- "fint_params_path": "integration/infra/config/generated/fuchsia/fint_params/try/host_prebuilts-x64-mac.textproto",
- "manifest": "flower",
- "no_python2": true,
- "recipe": "publish_build_artifacts",
- "remote": "https://fuchsia.googlesource.com/integration",
- "tools": [
- {
- "gcs_bucket": "fuchsia-ffx",
- "gcs_path": "ffx-macos-x64",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/blobfs-compression/${platform}",
- "name": "blobfs-compression"
- },
- {
- "cipd_package": "fuchsia/tools/buildidtool/${platform}",
- "name": "buildidtool"
- },
- {
- "cipd_package": "fuchsia/tools/buildstats/${platform}",
- "name": "buildstats"
- },
- {
- "cipd_package": "fuchsia/tools/bundle_fetcher/${platform}",
- "name": "bundle_fetcher"
- },
- {
- "cipd_package": "fuchsia/tools/debugsyms/${platform}",
- "name": "debugsyms"
- },
- {
- "cipd_package": "fuchsia/tools/ffx/${platform}",
- "name": "ffx"
- },
- {
- "cipd_package": "fuchsia/tools/funnel/${platform}",
- "name": "funnel"
- },
- {
- "cipd_package": "fuchsia/tools/futility/${platform}",
- "name": "futility"
- },
- {
- "cipd_package": "fuchsia/tools/json_validator/${platform}",
- "name": "json_validator"
- },
- {
- "cipd_package": "fuchsia/tools/ninjatrace/${platform}",
- "name": "ninjatrace"
- },
- {
- "cipd_package": "fuchsia/tools/orchestrate/${platform}",
- "name": "orchestrate"
- },
- {
- "cipd_package": "fuchsia/tools/triage/${platform}",
- "name": "triage"
- }
- ]
-}
