From c647c0cb121299318b33ee3df2a16554a6eecd9e Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Wed, 27 Oct 2021 08:14:25 -0700 Subject: [PATCH] Use Python3 on all builders Bug: chromium:1256408 Change-Id: Id4af99414cc8c3cb9c43499bbd2508c0c233f559 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3247779 Reviewed-by: Mark Mentovai Commit-Queue: Joshua Peraza --- infra/config/generated/cr-buildbucket.cfg | 112 ++++++++++++++++++++++ infra/config/generated/project.cfg | 6 ++ infra/config/main.star | 5 +- 3 files changed, 122 insertions(+), 1 deletion(-) diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg index 6a0c463a..66c5e375 100644 --- a/infra/config/generated/cr-buildbucket.cfg +++ b/infra/config/generated/cr-buildbucket.cfg @@ -38,6 +38,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -63,6 +67,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -87,6 +95,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -111,6 +123,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -139,6 +155,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -167,6 +187,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -194,6 +218,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -221,6 +249,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -245,6 +277,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -269,6 +305,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -296,6 +336,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -323,6 +367,10 @@ buckets { } build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -347,6 +395,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -371,6 +423,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -419,6 +475,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -443,6 +503,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -466,6 +530,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -489,6 +557,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -516,6 +588,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -543,6 +619,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -569,6 +649,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -595,6 +679,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -618,6 +706,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -641,6 +733,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -667,6 +763,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -693,6 +793,10 @@ buckets { } build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -716,6 +820,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -739,6 +847,10 @@ buckets { execution_timeout_secs: 10800 build_numbers: YES service_account: "crashpad-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + 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 b68f45b7..3a159bb1 100644 --- a/infra/config/generated/project.cfg +++ b/infra/config/generated/project.cfg @@ -6,3 +6,9 @@ name: "crashpad" access: "group:all" +lucicfg { + version: "1.29.1" + package_dir: ".." + config_dir: "generated" + entry_point: "main.star" +} diff --git a/infra/config/main.star b/infra/config/main.star index 4aaeb80a..965b18af 100755 --- a/infra/config/main.star +++ b/infra/config/main.star @@ -18,7 +18,10 @@ 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.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"