From d148be4f00259b1dc6d9e71806994139c47a14b8 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 1 Nov 2021 19:00:52 +0000 Subject: [PATCH] Infra: Use Python 3 for the Tint recipe BUG=chromium:1256440 Change-Id: If1983c22da65ef14f21c992edf89face29f7a388 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/68020 Auto-Submit: Ryan Harrison Reviewed-by: Ben Clayton Reviewed-by: Austin Eng Kokoro: Kokoro Commit-Queue: Ryan Harrison --- .../global/generated/cr-buildbucket.cfg | 100 ++++++++++++++++++ infra/config/global/generated/project.cfg | 6 ++ infra/config/global/main.star | 5 +- 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg index 9929bd0c2f..b11c10ed93 100644 --- a/infra/config/global/generated/cr-buildbucket.cfg +++ b/infra/config/global/generated/cr-buildbucket.cfg @@ -26,6 +26,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -47,6 +51,10 @@ buckets { properties_j: "target_cpu:\"x86\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -68,6 +76,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -89,6 +101,10 @@ buckets { properties_j: "target_cpu:\"x86\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -114,6 +130,10 @@ buckets { path: "osx_sdk" } service_account: "tint-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 +159,10 @@ buckets { path: "osx_sdk" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -164,6 +188,10 @@ buckets { path: "win_toolchain" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -189,6 +217,10 @@ buckets { path: "win_toolchain" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -214,6 +246,10 @@ buckets { path: "win_toolchain" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -239,6 +275,10 @@ buckets { path: "win_toolchain" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -259,6 +299,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -279,6 +323,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-ci-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -317,6 +365,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -339,6 +391,10 @@ buckets { properties_j: "target_cpu:\"x86\"" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -361,6 +417,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -383,6 +443,10 @@ buckets { properties_j: "target_cpu:\"x86\"" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -409,6 +473,10 @@ buckets { path: "osx_sdk" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -435,6 +503,10 @@ buckets { path: "osx_sdk" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -455,6 +527,10 @@ buckets { properties_j: "runhooks:true" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -481,6 +557,10 @@ buckets { path: "win_toolchain" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -507,6 +587,10 @@ buckets { path: "win_toolchain" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -533,6 +617,10 @@ buckets { path: "win_toolchain" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -559,6 +647,10 @@ buckets { path: "win_toolchain" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -580,6 +672,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-try-builder@chops-service-accounts.iam.gserviceaccount.com" + experiments { + key: "luci.recipes.use_python3" + value: 100 + } experiments { key: "luci.use_realms" value: 100 @@ -601,6 +697,10 @@ buckets { properties_j: "target_cpu:\"x64\"" } service_account: "tint-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/global/generated/project.cfg b/infra/config/global/generated/project.cfg index 047d6197a8..f3defcdd73 100644 --- a/infra/config/global/generated/project.cfg +++ b/infra/config/global/generated/project.cfg @@ -6,3 +6,9 @@ name: "tint" access: "group:all" +lucicfg { + version: "1.29.1" + package_dir: ".." + config_dir: "generated" + entry_point: "main.star" +} diff --git a/infra/config/global/main.star b/infra/config/global/main.star index faa43d41c0..263c2786fc 100755 --- a/infra/config/global/main.star +++ b/infra/config/global/main.star @@ -10,7 +10,10 @@ main.star: lucicfg configuration for Tint's standalone builers. # Enable realms experiment. 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, +}) lucicfg.config(fail_on_warnings = True)