Delete the mac_tmp_try_out_cas builder. Bug: 540364710 Change-Id: Ia458e095040cb1c1d502ebd994a78a906a6a6964 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/99971 Reviewed-by: Xiangfei Ding <xfding@google.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com>
diff --git a/infra/config/generated/commit-queue.cfg b/infra/config/generated/commit-queue.cfg index 7b5b8b7..04eaf86 100644 --- a/infra/config/generated/commit-queue.cfg +++ b/infra/config/generated/commit-queue.cfg
@@ -230,10 +230,6 @@ name: "boringssl/try/mac_small" } builders { - name: "boringssl/try/mac_tmp_try_out_cas" - includable_only: true - } - builders { name: "boringssl/try/presubmit" includable_only: true }
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 33a9760..e067c56 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg
@@ -52,7 +52,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 caches { @@ -82,7 +82,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 caches { @@ -300,7 +300,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 caches { @@ -2493,7 +2493,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\",\"OPENSSL_NO_ASM\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -2512,7 +2512,7 @@ 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" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 1800 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -2528,7 +2528,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -2547,7 +2547,7 @@ 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" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 1800 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -2743,7 +2743,7 @@ 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\",\"CMAKE_BUILD_TYPE\":\"RelWithAsserts\",\"FIPS\":\"1\"}" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 5400 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -2762,7 +2762,7 @@ 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" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so\"]" + properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"**/lib*.so*\"]" } execution_timeout_secs: 1800 service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -3547,28 +3547,6 @@ service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" } builders { - name: "mac_tmp_try_out_cas" - swarming_host: "chromium-swarm.appspot.com" - dimensions: "cpu:x86-64" - dimensions: "os:Mac-12|Mac-13" - dimensions: "pool:luci.flex.try" - recipe { - name: "boringssl" - cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" - cipd_version: "refs/heads/main" - properties_j: "cmake_args:{\"CMAKE_OSX_ARCHITECTURES\":\"arm64\",\"CMAKE_OSX_SYSROOT\":\"iphoneos\"}" - properties_j: "run_ssl_tests:false" - properties_j: "run_unit_tests:false" - properties_j: "upload_to_cas:[\"*_bench\",\"*_test\",\"bssl\",\"generate_*\",\"jitter_deltas\",\"ssl/test/bssl_shim\",\"test_*\",\"libcrypto.a\",\"libdecrepit.a\",\"libpki.a\",\"libssl.a\"]" - } - execution_timeout_secs: 3600 - caches { - name: "boringssl_osx_sdk" - path: "osx_sdk" - } - service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" - } - builders { name: "presubmit" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/infra/config/main.star b/infra/config/main.star index 5bae1f1..529c453 100755 --- a/infra/config/main.star +++ b/infra/config/main.star
@@ -1738,20 +1738,3 @@ "upload_to_cas": FINISHED_OUTPUT_FILES_WIN_STATIC, }), ) - -# TODO(crbug.com/540364710): Roll that flag to the other builds, then inline. -# Already tested: linux, linux_shared, mac, mac_shared, win32, win64_shared, -# android_aarch64_fips_rel, win32_rel, win64_shared_rel. -cq_builders( - "mac_tmp_try_out_cas", - MAC_X86_64_HOST, - cq_enabled = False, - properties = compile_only({ - # Now tested: "ios64". - "cmake_args": { - "CMAKE_OSX_ARCHITECTURES": "arm64", - "CMAKE_OSX_SYSROOT": "iphoneos", - }, - "upload_to_cas": FINISHED_OUTPUT_FILES_MAC_STATIC, - }), -)