Add SDE builders to CQ, but off by default This will make them available under "Choose tryjobs". Change-Id: I8a61e190aea4602422b8b541f95553c424c0332d Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/60725 Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/generated/commit-queue.cfg b/generated/commit-queue.cfg index c90e39f..8ae60ec 100644 --- a/generated/commit-queue.cfg +++ b/generated/commit-queue.cfg
@@ -106,6 +106,10 @@ name: "boringssl/try/linux32_rel" } builders { + name: "boringssl/try/linux32_sde" + includable_only: true + } + builders { name: "boringssl/try/linux_clang_cfi" includable_only: true } @@ -153,6 +157,10 @@ name: "boringssl/try/linux_rel" } builders { + name: "boringssl/try/linux_sde" + includable_only: true + } + builders { name: "boringssl/try/linux_shared" } builders { @@ -184,6 +192,10 @@ name: "boringssl/try/win32_rel" } builders { + name: "boringssl/try/win32_sde" + includable_only: true + } + builders { name: "boringssl/try/win32_small" } builders { @@ -207,6 +219,10 @@ name: "boringssl/try/win64_rel" } builders { + name: "boringssl/try/win64_sde" + includable_only: true + } + builders { name: "boringssl/try/win64_small" } builders {
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg index 202b82d..520bccd 100644 --- a/generated/cr-buildbucket.cfg +++ b/generated/cr-buildbucket.cfg
@@ -2759,6 +2759,38 @@ } } builders { + name: "linux32_sde" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-18.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: + '{' + ' "cmake_args": {' + ' "CMAKE_ASM_FLAGS": "-m32 -msse2",' + ' "CMAKE_BUILD_TYPE": "RelWithAsserts",' + ' "CMAKE_CXX_FLAGS": "-m32 -msse2",' + ' "CMAKE_C_FLAGS": "-m32 -msse2",' + ' "CMAKE_SYSTEM_NAME": "Linux",' + ' "CMAKE_SYSTEM_PROCESSOR": "x86"' + ' },' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "sde": true' + '}' + 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: "linux_clang_cfi" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3167,6 +3199,33 @@ } } builders { + name: "linux_sde" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Ubuntu-18.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: + '{' + ' "cmake_args": {' + ' "CMAKE_BUILD_TYPE": "RelWithAsserts"' + ' },' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "sde": true' + '}' + 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: "linux_shared" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3459,6 +3518,38 @@ } } builders { + name: "win32_sde" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + 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: + '{' + ' "cmake_args": {' + ' "CMAKE_BUILD_TYPE": "RelWithAsserts"' + ' },' + ' "msvc_target": "x86",' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "sde": true' + '}' + execution_timeout_secs: 1800 + caches { + name: "win_toolchain" + path: "win_toolchain" + } + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "win32_small" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64" @@ -3667,6 +3758,38 @@ } } builders { + name: "win64_sde" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "cpu:x86-64" + dimensions: "os:Windows-10" + 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: + '{' + ' "cmake_args": {' + ' "CMAKE_BUILD_TYPE": "RelWithAsserts"' + ' },' + ' "msvc_target": "x64",' + ' "recipe": "boringssl",' + ' "run_ssl_tests": false,' + ' "sde": true' + '}' + execution_timeout_secs: 1800 + caches { + name: "win_toolchain" + path: "win_toolchain" + } + service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } + } + builders { name: "win64_small" swarming_host: "chromium-swarm.appspot.com" dimensions: "cpu:x86-64"
diff --git a/main.star b/main.star index 83b630b..40524fe 100755 --- a/main.star +++ b/main.star
@@ -155,9 +155,18 @@ short_name = short_name, ) -def cq_builder(name, host, *, recipe = "boringssl", cq_enabled = True, properties = {}): +def cq_builder( + name, + host, + *, + recipe = "boringssl", + cq_enabled = True, + execution_timeout = None, + properties = {}): dimensions = dict(host["dimensions"]) dimensions["pool"] = "luci.flex.try" + if execution_timeout == None: + execution_timeout = host.get("execution_timeout", DEFAULT_TIMEOUT) builder = luci.builder( name = name, bucket = "try", @@ -187,6 +196,7 @@ short_name = None, cq_enabled = True, cq_compile_only = None, + execution_timeout = None, properties = {}): ci_builder( name, @@ -194,6 +204,7 @@ recipe = recipe, category = category, short_name = short_name, + execution_timeout = execution_timeout, properties = properties, ) @@ -207,6 +218,7 @@ host, recipe = recipe, cq_enabled = cq_enabled and not cq_compile_only, + execution_timeout = execution_timeout, properties = properties, ) if cq_compile_only: @@ -218,6 +230,7 @@ cq_compile_only, recipe = recipe, cq_enabled = cq_enabled, + execution_timeout = execution_timeout, properties = compile_properties, ) @@ -522,11 +535,12 @@ }, }, ) -ci_builder( +both_builders( "linux32_sde", LINUX_HOST, category = "linux|32", short_name = "sde", + cq_enabled = False, execution_timeout = SDE_TIMEOUT, properties = { "cmake_args": { @@ -743,11 +757,12 @@ }, }, ) -ci_builder( +both_builders( "linux_sde", LINUX_HOST, category = "linux", short_name = "sde", + cq_enabled = False, execution_timeout = SDE_TIMEOUT, properties = { "cmake_args": { @@ -841,11 +856,12 @@ "msvc_target": "x86", }, ) -ci_builder( +both_builders( "win32_sde", WIN_HOST, category = "win|x86", short_name = "sde", + cq_enabled = False, execution_timeout = SDE_TIMEOUT, properties = { "cmake_args": { @@ -923,11 +939,12 @@ "msvc_target": "x64", }, ) -ci_builder( +both_builders( "win64_sde", WIN_HOST, category = "win|x64", short_name = "sde", + cq_enabled = False, execution_timeout = SDE_TIMEOUT, properties = { "cmake_args": {