summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Srbecky <dsrbecky@google.com>2022-04-21 16:50:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-21 16:50:52 +0000
commit25fe661838228515aa268f88c52ddbb1e508ffa8 (patch)
tree116226b3af974f8ebc1a9bc31c1e8fc2f347a9b0
parent40f266c78c508cf988a995f40261e8edcc00e360 (diff)
parent5e50df52091b199e5fb096bc90b8c5ed3bcc719f (diff)
downloadart-25fe661838228515aa268f88c52ddbb1e508ffa8.tar.gz
Use "main" branch of LUCI's CIPD package am: 5e50df5209
Original change: https://android-review.googlesource.com/c/platform/art/+/2070987 Change-Id: Ic2c70f12d80785abea0c393153a063ffc4c65fa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tools/luci/config/generated/cr-buildbucket.cfg50
-rwxr-xr-xtools/luci/config/main.star2
2 files changed, 26 insertions, 26 deletions
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index d49b81dd93..e4a5923986 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -22,7 +22,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -46,7 +46,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -70,7 +70,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -94,7 +94,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -118,7 +118,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -142,7 +142,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -166,7 +166,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -190,7 +190,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -214,7 +214,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -238,7 +238,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -262,7 +262,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -286,7 +286,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -310,7 +310,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -334,7 +334,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -358,7 +358,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -382,7 +382,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -406,7 +406,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -430,7 +430,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -454,7 +454,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -478,7 +478,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -502,7 +502,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -526,7 +526,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -550,7 +550,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -574,7 +574,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
@@ -598,7 +598,7 @@ buckets {
recipe {
name: "art"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
- cipd_version: "refs/heads/master"
+ cipd_version: "refs/heads/main"
properties_j: "builder_group:\"client.art\""
}
execution_timeout_secs: 108000
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index ec1c88eae3..f4ad488020 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -153,7 +153,7 @@ def ci_builder(name, category, short_name):
bucket = "ci",
executable = luci.recipe(
cipd_package = "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",
- cipd_version = "refs/heads/master",
+ cipd_version = "refs/heads/main",
name = "art",
),
dimensions = {