infra: Move Android FIPS builders to RelWithAsserts Instead of building in Debug mode, use RelWithAsserts to speed up these builds. FIPS mode still has Debug mode coverage on Linux. Change-Id: I6485df6d3e2df5fec904792eb5a1f471fcc55a95 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/86547 Commit-Queue: Lily Chen <chlily@google.com> Auto-Submit: Lily Chen <chlily@google.com> Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 73ea66b..a981a11 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -35,25 +35,25 @@ name: "boringssl/try/android_aarch64_compile" } builders { - name: "boringssl/try/android_aarch64_fips" + name: "boringssl/try/android_aarch64_fips_noasm_rel" includable_only: true } builders { - name: "boringssl/try/android_aarch64_fips_compile" + name: "boringssl/try/android_aarch64_fips_noasm_rel_compile" } builders { - name: "boringssl/try/android_aarch64_fips_noasm" + name: "boringssl/try/android_aarch64_fips_rel" includable_only: true } builders { - name: "boringssl/try/android_aarch64_fips_noasm_compile" + name: "boringssl/try/android_aarch64_fips_rel_compile" } builders { - name: "boringssl/try/android_aarch64_fips_static" + name: "boringssl/try/android_aarch64_fips_static_rel" includable_only: true } builders { - name: "boringssl/try/android_aarch64_fips_static_compile" + name: "boringssl/try/android_aarch64_fips_static_rel_compile" } builders { name: "boringssl/try/android_aarch64_rel" @@ -78,11 +78,11 @@ name: "boringssl/try/android_arm_compile" } builders { - name: "boringssl/try/android_arm_fips" + name: "boringssl/try/android_arm_fips_rel" includable_only: true } builders { - name: "boringssl/try/android_arm_fips_compile" + name: "boringssl/try/android_arm_fips_rel_compile" } builders { name: "boringssl/try/android_arm_rel" @@ -185,6 +185,7 @@ } builders { name: "boringssl/try/mac_arm64_bazel" + includable_only: true } builders { name: "boringssl/try/mac_rel"
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 5bce2c5..8a936ba 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -35,7 +35,7 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips" + name: "android_aarch64_fips_noasm_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -45,7 +45,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" } execution_timeout_secs: 5400 caches { @@ -59,7 +59,7 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_noasm" + name: "android_aarch64_fips_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -69,7 +69,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 caches { @@ -83,7 +83,7 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_static" + name: "android_aarch64_fips_static_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -93,7 +93,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 caches { @@ -179,7 +179,7 @@ service_account: "boringssl-ci-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_arm_fips" + name: "android_arm_fips_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.ci" @@ -189,7 +189,7 @@ cipd_version: "refs/heads/main" properties_j: "$gatekeeper:{\"group\":\"client.boringssl\"}" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 caches { @@ -1405,7 +1405,7 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips" + name: "android_aarch64_fips_noasm_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" @@ -1414,13 +1414,13 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_compile" + name: "android_aarch64_fips_noasm_rel_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-24.04" @@ -1430,7 +1430,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1438,7 +1438,7 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_noasm" + name: "android_aarch64_fips_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" @@ -1447,13 +1447,13 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_noasm_compile" + name: "android_aarch64_fips_rel_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-24.04" @@ -1463,7 +1463,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1471,7 +1471,7 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_static" + name: "android_aarch64_fips_static_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" @@ -1480,13 +1480,13 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_aarch64_fips_static_compile" + name: "android_aarch64_fips_static_rel_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-24.04" @@ -1496,7 +1496,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"arm64-v8a\",\"ANDROID_PLATFORM\":\"android-24\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" } @@ -1603,7 +1603,7 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_arm_fips" + name: "android_arm_fips_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" dimensions: "pool:luci.flex.try" @@ -1612,13 +1612,13 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "android_arm_fips_compile" + name: "android_arm_fips_rel_compile" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-24.04" @@ -1628,7 +1628,7 @@ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" properties_j: "android:true" - properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"FIPS\":\"1\"}" + properties_j: "cmake_args:{\"ANDROID_ABI\":\"armeabi-v7a\",\"ANDROID_PLATFORM\":\"android-24\",\"BUILD_SHARED_LIBS\":\"1\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" properties_j: "run_ssl_tests:false" properties_j: "run_unit_tests:false" }
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg index 5ccb660..467e2f7 100644 --- a/infra/config/generated/luci-milo.cfg +++ b/infra/config/generated/luci-milo.cfg
@@ -21,17 +21,17 @@ short_name: "rel" } builders { - name: "buildbucket/luci.boringssl.ci/android_aarch64_fips" + name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_rel" category: "android|aarch64" short_name: "fips" } builders { - name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_noasm" + name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_noasm_rel" category: "android|aarch64" short_name: "fips3" } builders { - name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_static" + name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_static_rel" category: "android|aarch64" short_name: "fips2" } @@ -46,7 +46,7 @@ short_name: "rel" } builders { - name: "buildbucket/luci.boringssl.ci/android_arm_fips" + name: "buildbucket/luci.boringssl.ci/android_arm_fips_rel" category: "android|thumb" short_name: "fips" }
diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg index 927b77a..6bdb595 100644 --- a/infra/config/generated/luci-notify.cfg +++ b/infra/config/generated/luci-notify.cfg
@@ -30,7 +30,7 @@ } builders { bucket: "ci" - name: "android_aarch64_fips" + name: "android_aarch64_fips_noasm_rel" repository: "https://boringssl.googlesource.com/boringssl" } } @@ -45,7 +45,7 @@ } builders { bucket: "ci" - name: "android_aarch64_fips_noasm" + name: "android_aarch64_fips_rel" repository: "https://boringssl.googlesource.com/boringssl" } } @@ -60,7 +60,7 @@ } builders { bucket: "ci" - name: "android_aarch64_fips_static" + name: "android_aarch64_fips_static_rel" repository: "https://boringssl.googlesource.com/boringssl" } } @@ -120,7 +120,7 @@ } builders { bucket: "ci" - name: "android_arm_fips" + name: "android_arm_fips_rel" repository: "https://boringssl.googlesource.com/boringssl" } }
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg index 137dcd5..923a7da 100644 --- a/infra/config/generated/luci-scheduler.cfg +++ b/infra/config/generated/luci-scheduler.cfg
@@ -15,33 +15,33 @@ } } job { - id: "android_aarch64_fips" + id: "android_aarch64_fips_noasm_rel" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "android_aarch64_fips" + builder: "android_aarch64_fips_noasm_rel" } } job { - id: "android_aarch64_fips_noasm" + id: "android_aarch64_fips_rel" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "android_aarch64_fips_noasm" + builder: "android_aarch64_fips_rel" } } job { - id: "android_aarch64_fips_static" + id: "android_aarch64_fips_static_rel" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "android_aarch64_fips_static" + builder: "android_aarch64_fips_static_rel" } } job { @@ -75,13 +75,13 @@ } } job { - id: "android_arm_fips" + id: "android_arm_fips_rel" realm: "ci" acl_sets: "ci" buildbucket { server: "cr-buildbucket.appspot.com" bucket: "ci" - builder: "android_arm_fips" + builder: "android_arm_fips_rel" } } job { @@ -539,13 +539,13 @@ realm: "ci" acl_sets: "ci" triggers: "android_aarch64" - triggers: "android_aarch64_fips" - triggers: "android_aarch64_fips_noasm" - triggers: "android_aarch64_fips_static" + triggers: "android_aarch64_fips_noasm_rel" + triggers: "android_aarch64_fips_rel" + triggers: "android_aarch64_fips_static_rel" triggers: "android_aarch64_rel" triggers: "android_arm" triggers: "android_arm_armmode_rel" - triggers: "android_arm_fips" + triggers: "android_arm_fips_rel" triggers: "android_arm_rel" triggers: "android_riscv64_compile_only" triggers: "docs"
diff --git a/infra/config/main.star b/infra/config/main.star index f2fa5f1..7f6c2e1 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -390,7 +390,7 @@ }, ) both_builders( - "android_aarch64_fips", + "android_aarch64_fips_rel", # The Android FIPS configuration requires a newer device. WALLEYE_HOST, category = "android|aarch64", @@ -403,13 +403,14 @@ "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", + "CMAKE_BUILD_TYPE": "RelWithAsserts", "FIPS": "1", }, }, ) both_builders( - "android_aarch64_fips_noasm", + "android_aarch64_fips_noasm_rel", # The Android FIPS configuration requires a newer device. WALLEYE_HOST, category = "android|aarch64", @@ -423,6 +424,7 @@ "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", + "CMAKE_BUILD_TYPE": "RelWithAsserts", "FIPS": "1", }, }, @@ -432,7 +434,7 @@ # for android_aarch64_fips. Additionally, urandom_test doesn't work in shared # library builds, so this gives Android FIPS coverage for urandom_test. both_builders( - "android_aarch64_fips_static", + "android_aarch64_fips_static_rel", # The Android FIPS configuration requires a newer device. WALLEYE_HOST, category = "android|aarch64", @@ -443,6 +445,7 @@ "cmake_args": { "ANDROID_ABI": "arm64-v8a", "ANDROID_PLATFORM": "android-24", + "CMAKE_BUILD_TYPE": "RelWithAsserts", "FIPS": "1", }, }, @@ -485,7 +488,7 @@ }, ) both_builders( - "android_arm_fips", + "android_arm_fips_rel", # The Android FIPS configuration requires a newer device. WALLEYE_HOST, category = "android|thumb", @@ -498,6 +501,7 @@ "ANDROID_PLATFORM": "android-24", # FIPS mode on Android uses shared libraries. "BUILD_SHARED_LIBS": "1", + "CMAKE_BUILD_TYPE": "RelWithAsserts", "FIPS": "1", }, },