Add an aarch64 static fips noasm builder Change-Id: I52a2afd66ef6ef87459552c37468e498a856edc1 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/71187 Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index 9a03608..f235898 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -48,6 +48,13 @@ name: "boringssl/try/android_aarch64_fips_static_compile" } builders { + name: "boringssl/try/android_aarch64_fips_static_noasm" + includable_only: true + } + builders { + name: "boringssl/try/android_aarch64_fips_static_noasm_compile" + } + builders { name: "boringssl/try/android_aarch64_rel" includable_only: true }
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index d973a60..b344896 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -125,6 +125,45 @@ } } builders { + name: "android_aarch64_fips_static_noasm" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_type:walleye" + 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"' + ' },' + ' "android": true,' + ' "cmake_args": {' + ' "ANDROID_ABI": "arm64-v8a",' + ' "ANDROID_PLATFORM": "android-21",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "recipe": "boringssl"' + '}' + execution_timeout_secs: 3600 + 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: "android_aarch64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye" @@ -2334,6 +2373,65 @@ } } builders { + name: "android_aarch64_fips_static_noasm" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "device_type:walleye" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "android": true,' + ' "cmake_args": {' + ' "ANDROID_ABI": "arm64-v8a",' + ' "ANDROID_PLATFORM": "android-21",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "recipe": "boringssl"' + '}' + execution_timeout_secs: 3600 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { + name: "android_aarch64_fips_static_noasm_compile" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-22.04" + dimensions: "pool:luci.flex.try" + exe { + cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" + cipd_version: "refs/heads/main" + cmd: "luciexe" + } + properties: + '{' + ' "android": true,' + ' "cmake_args": {' + ' "ANDROID_ABI": "arm64-v8a",' + ' "ANDROID_PLATFORM": "android-21",' + ' "FIPS": "1",' + ' "OPENSSL_NO_ASM": "1"' + ' },' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "run_unit_tests": false' + '}' + execution_timeout_secs: 1800 + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "android_aarch64_rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "device_type:walleye"
diff --git a/generated/luci-milo.cfg b/generated/luci-milo.cfg index a079828..9a5f55b 100644 --- a/generated/luci-milo.cfg +++ b/generated/luci-milo.cfg
@@ -31,6 +31,11 @@ short_name: "fips2" } builders { + name: "buildbucket/luci.boringssl.ci/android_aarch64_fips_static_noasm" + category: "android|aarch64" + short_name: "fips3" + } + builders { name: "buildbucket/luci.boringssl.ci/android_arm" category: "android|thumb" short_name: "dbg"
diff --git a/generated/luci-notify.cfg b/generated/luci-notify.cfg index f0c9e97..e18e8f2 100644 --- a/generated/luci-notify.cfg +++ b/generated/luci-notify.cfg
@@ -60,6 +60,21 @@ } builders { bucket: "ci" + name: "android_aarch64_fips_static_noasm" + 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: "android_aarch64_rel" repository: "https://boringssl.googlesource.com/boringssl" }
diff --git a/generated/luci-scheduler.cfg b/generated/luci-scheduler.cfg index 90ddc91..3d03fb8 100644 --- a/generated/luci-scheduler.cfg +++ b/generated/luci-scheduler.cfg
@@ -35,6 +35,16 @@ } } job { + id: "android_aarch64_fips_static_noasm" + realm: "ci" + acl_sets: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "android_aarch64_fips_static_noasm" + } +} +job { id: "android_aarch64_rel" realm: "ci" acl_sets: "ci" @@ -551,6 +561,7 @@ triggers: "android_aarch64" triggers: "android_aarch64_fips" triggers: "android_aarch64_fips_static" + triggers: "android_aarch64_fips_static_noasm" triggers: "android_aarch64_rel" triggers: "android_arm" triggers: "android_arm_armmode_rel"
diff --git a/generated/project.cfg b/generated/project.cfg index f91baed..b5864be 100644 --- a/generated/project.cfg +++ b/generated/project.cfg
@@ -7,7 +7,7 @@ name: "boringssl" access: "group:all" lucicfg { - version: "1.43.13" + version: "1.40.0" package_dir: ".." config_dir: "generated" entry_point: "main.star"
diff --git a/main.star b/main.star index d6258ca..10b84da 100755 --- a/main.star +++ b/main.star
@@ -360,6 +360,24 @@ ) both_builders( + "android_aarch64_fips_static_noasm", + # The Android FIPS configuration requires a newer device. + WALLEYE_HOST, + category = "android|aarch64", + short_name = "fips3", + cq_compile_only = LINUX_HOST, + properties = { + "android": True, + "cmake_args": { + "OPENSSL_NO_ASM": "1", + "ANDROID_ABI": "arm64-v8a", + "ANDROID_PLATFORM": "android-21", + "FIPS": "1", + }, + }, +) + +both_builders( "android_arm", WALLEYE_HOST, category = "android|thumb",