From b50484dbe0954c14506a6d780fdfd2575e9b982f Mon Sep 17 00:00:00 2001 From: Mark Mentovai Date: Thu, 4 Nov 2021 16:54:59 -0400 Subject: [PATCH] infra: Enable bbagent and use_python3 Change-Id: Ibfe01bd8f327bae137bd948082dc09504d8a5cb8 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3260456 Reviewed-by: Mark Mentovai Commit-Queue: Mark Mentovai --- infra/config/generated/cr-buildbucket.cfg | 660 +++++++++++++--------- infra/config/generated/project.cfg | 2 +- infra/config/main.star | 5 +- 3 files changed, 388 insertions(+), 279 deletions(-) diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 66c5e375..d34621cd 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -25,16 +25,25 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -42,10 +51,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_arm64_rel" @@ -54,16 +59,25 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -71,10 +85,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_x64_dbg" @@ -83,15 +93,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -99,10 +118,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_x64_rel" @@ -111,15 +126,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -127,10 +151,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_arm64_dbg" @@ -138,16 +158,25 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -159,10 +188,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_arm64_rel" @@ -170,16 +195,25 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -191,10 +225,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_x64_dbg" @@ -202,15 +232,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -222,10 +261,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_x64_rel" @@ -233,15 +268,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -253,10 +297,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_linux_x64_dbg" @@ -265,15 +305,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"linux\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "linux"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -281,10 +330,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_linux_x64_rel" @@ -293,15 +338,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"linux\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "linux"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -309,10 +363,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_mac_x64_dbg" @@ -320,15 +370,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"mac\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "mac"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_mac" @@ -340,10 +399,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_mac_x64_rel" @@ -351,15 +406,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"mac\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "mac"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_mac" @@ -371,10 +435,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_win_x64_dbg" @@ -383,15 +443,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Windows-10" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"win\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "win"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -399,10 +468,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_win_x64_rel" @@ -411,15 +476,24 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Windows-10" dimensions: "pool:luci.flex.ci" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$gatekeeper:{\"group\":\"client.crashpad\"}" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"win\"" + cmd: "luciexe" } + properties: + '{' + ' "$gatekeeper": {' + ' "group": "client.crashpad"' + ' },' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "win"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -427,10 +501,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } } } @@ -463,15 +533,22 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -479,10 +556,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_arm64_rel" @@ -491,15 +564,22 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -507,10 +587,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_x64_dbg" @@ -519,14 +595,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -534,10 +617,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_fuchsia_x64_rel" @@ -546,14 +625,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"fuchsia\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "fuchsia"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -561,10 +647,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_arm64_dbg" @@ -572,15 +654,22 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -592,10 +681,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_arm64_rel" @@ -603,15 +688,22 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_cpu:\"arm64\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_cpu": "arm64",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -623,10 +715,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_x64_dbg" @@ -634,14 +722,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -653,10 +748,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_ios_x64_rel" @@ -664,14 +755,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"ios\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "ios"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_ios" @@ -683,10 +781,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_linux_x64_dbg" @@ -695,14 +789,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"linux\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "linux"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -710,10 +811,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_linux_x64_rel" @@ -722,14 +819,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Ubuntu-16.04" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"linux\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "linux"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -737,10 +841,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_mac_x64_dbg" @@ -748,14 +848,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"mac\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "mac"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_mac" @@ -767,10 +874,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_mac_x64_rel" @@ -778,14 +881,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Mac-10.15" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"mac\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "mac"' + '}' execution_timeout_secs: 10800 caches { name: "osx_sdk_mac" @@ -797,10 +907,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_win_x64_dbg" @@ -809,14 +915,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Windows-10" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Debug\"" - properties_j: "target_os:\"win\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Debug",' + ' "recipe": "crashpad/build",' + ' "target_os": "win"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -824,10 +937,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } builders { name: "crashpad_win_x64_rel" @@ -836,14 +945,21 @@ buckets { dimensions: "cpu:x86-64" dimensions: "os:Windows-10" dimensions: "pool:luci.flex.try" - recipe { - name: "crashpad/build" + exe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/main" - properties_j: "$kitchen:{\"devshell\":true,\"git_auth\":true}" - properties_j: "config:\"Release\"" - properties_j: "target_os:\"win\"" + cmd: "luciexe" } + properties: + '{' + ' "$kitchen": {' + ' "devshell": true,' + ' "git_auth": true' + ' },' + ' "config": "Release",' + ' "recipe": "crashpad/build",' + ' "target_os": "win"' + '}' execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" @@ -851,10 +967,6 @@ buckets { key: "luci.recipes.use_python3" value: 100 } - experiments { - key: "luci.use_realms" - value: 100 - } } } } diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg index 3a159bb1..9dcccbfa 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg @@ -7,7 +7,7 @@ name: "crashpad" access: "group:all" lucicfg { - version: "1.29.1" + version: "1.30.1" package_dir: ".." config_dir: "generated" entry_point: "main.star" diff --git a/infra/config/main.star b/infra/config/main.star index 965b18af..f51ef23e 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -18,10 +18,6 @@ lucicfg.check_version("1.28.0", "Please update depot_tools") # Enable LUCI Realms support and Launch 100% of Swarming tasks for builds in # "realms-aware mode". lucicfg.enable_experiment("crbug.com/1085650") -luci.builder.defaults.experiments.set({ - "luci.use_realms": 100, - "luci.recipes.use_python3": 100, -}) REPO_URL = "https://chromium.googlesource.com/crashpad/crashpad" REVIEW_URL = "https://chromium-review.googlesource.com/crashpad/crashpad" @@ -146,6 +142,7 @@ def crashpad_recipe(): return luci.recipe( name = "crashpad/build", cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build", + use_python3=True, ) def crashpad_caches(platform):