Enable linux_bazel and mac_bazel on CI and CQ They seem to work! https://ci.chromium.org/ui/p/boringssl/builders/try/mac_arm64_bazel/b8738233970603159505/overview https://ci.chromium.org/ui/p/boringssl/builders/try/linux_bazel/b8738233970603159489/overview Fixed: 42290610 Change-Id: I273df7d0b39741e7293f9fff64a9bc66857ded15 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70770 Commit-Queue: Bob Beck <bbe@google.com> Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index 0ae098c..9a03608 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -111,7 +111,6 @@ } builders { name: "boringssl/try/linux_bazel" - includable_only: true } builders { name: "boringssl/try/linux_clang_cfi" @@ -178,7 +177,6 @@ } builders { name: "boringssl/try/mac_arm64_bazel" - includable_only: true } builders { name: "boringssl/try/mac_rel"
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index bce8469..d973a60 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -643,6 +643,39 @@ } } builders { + name: "linux_bazel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-22.04" + dimensions: "pool:luci.flex.ci" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.boringssl"' + ' },' + ' "recipe": "boringssl_bazel"' + '}' + execution_timeout_secs: 1800 + caches { + name: "gocache" + path: "gocache" + } + caches { + name: "gopath" + path: "gopath" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "linux_clang_cfi" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -1402,6 +1435,43 @@ } } builders { + name: "mac_arm64_bazel" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:arm64" + dimensions: "os:Mac" + dimensions: "pool:luci.flex.ci" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.boringssl"' + ' },' + ' "recipe": "boringssl_bazel"' + '}' + execution_timeout_secs: 3600 + caches { + name: "gocache" + path: "gocache" + } + caches { + name: "gopath" + path: "gopath" + } + caches { + name: "osx_sdk" + path: "osx_sdk" + } + service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "mac_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index d2184f7..a079828 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -180,6 +180,11 @@ short_name: "nosse2" } builders { + name: "buildbucket/luci.boringssl.ci/linux_bazel" + category: "linux" + short_name: "bzl" + } + builders { name: "buildbucket/luci.boringssl.ci/mac" category: "mac" short_name: "dbg" @@ -200,6 +205,11 @@ short_name: "arm64" } builders { + name: "buildbucket/luci.boringssl.ci/mac_arm64_bazel" + category: "mac" + short_name: "bzl" + } + builders { name: "buildbucket/luci.boringssl.ci/win32" category: "win|x86" short_name: "dbg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index 0c91d5e..f0c9e97 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -255,6 +255,21 @@ } builders { bucket: "ci" + name: "linux_bazel" + repository: "https://boringssl.googlesource.com/boringssl" + } +} +notifiers { + notifications { + on_occurrence: FAILURE + on_occurrence: INFRA_FAILURE + on_new_status: SUCCESS + email { + recipients: "boringssl@google.com" + } + } + builders { + bucket: "ci" name: "linux_clang_cfi" repository: "https://boringssl.googlesource.com/boringssl" } @@ -555,6 +570,21 @@ } builders { bucket: "ci" + name: "mac_arm64_bazel" + repository: "https://boringssl.googlesource.com/boringssl" + } +} +notifiers { + notifications { + on_occurrence: FAILURE + on_occurrence: INFRA_FAILURE + on_new_status: SUCCESS + email { + recipients: "boringssl@google.com" + } + } + builders { + bucket: "ci" name: "mac_rel" repository: "https://boringssl.googlesource.com/boringssl" }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index eb5d396..90ddc91 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -165,6 +165,16 @@ } } job { + id: "linux_bazel" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "linux_bazel" + } +} +job { id: "linux_clang_cfi" realm: "ci" acl_sets: "ci" @@ -365,6 +375,16 @@ } } job { + id: "mac_arm64_bazel" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "mac_arm64_bazel" + } +} +job { id: "mac_rel" realm: "ci" acl_sets: "ci" @@ -544,6 +564,7 @@ triggers: "linux32_nosse2_noasm" triggers: "linux32_rel" triggers: "linux32_sde" + triggers: "linux_bazel" triggers: "linux_clang_cfi" triggers: "linux_clang_rel" triggers: "linux_clang_rel_msan" @@ -564,6 +585,7 @@ triggers: "linux_small" triggers: "mac" triggers: "mac_arm64" + triggers: "mac_arm64_bazel" triggers: "mac_rel" triggers: "mac_small" triggers: "win32"
diff --git a/main.star b/main.star index 1013231..d6258ca 100755 --- a/main.star +++ b/main.star
@@ -450,7 +450,7 @@ # The default Android NDK cannot be updated until https://crbug.com/boringssl/454 is fixed. # Meanwhile, RISC-V support requires a newer NDK, thus we override for this builder. "gclient_vars": { - "android_ndk_revision": "wC8sJjVPRDPTbaZFlki_qXTC1lWJNbJi8glUO0woJ1MC" + "android_ndk_revision": "wC8sJjVPRDPTbaZFlki_qXTC1lWJNbJi8glUO0woJ1MC", }, "run_unit_tests": False, "run_ssl_tests": False, @@ -810,13 +810,12 @@ }, }, ) -# TODO(crbug.com/42290610): Enable this builder on CI and by default on CQ once -# it has been confirmed to work. -cq_builder( +both_builders( "linux_bazel", LINUX_HOST, + category = "linux", + short_name = "bzl", recipe = "boringssl_bazel", - cq_enabled = False, ) both_builders("mac", MAC_X86_64_HOST, category = "mac", short_name = "dbg") both_builders( @@ -843,13 +842,12 @@ }, ) both_builders("mac_arm64", MAC_ARM64_HOST, category = "mac", short_name = "arm64") -# TODO(crbug.com/42290610): Enable this builder on CI and by default on CQ once -# it has been confirmed to work. -cq_builder( +both_builders( "mac_arm64_bazel", MAC_ARM64_HOST, + category = "mac", + short_name = "bzl", recipe = "boringssl_bazel", - cq_enabled = False, ) both_builders( "win32",