Skip to content

GitLab

T
tangled
Commit d4883520 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Remove the versioned/vars starlark files. 

The lucicfg vars defined under versioneds/vars were used as the
mechanism to abstract the channel branch details away from the milestone
configuration. Since the channel details have been removed, the
milestone configuration can now be expressed more simply as simple
constants in a milestone specific vars file.

Bug: 1062828
Change-Id: I9ccf3b08d5253f85cdd70b6bbb38f5e0ba137013
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2122240
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754508}
parent 350ec69f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 174 deletions
infra/config/lib/bucket.star deleted 100644 → 0
View file @ 350ec69f
def var(*, default):
var = lucicfg.var(default = default)
def builder(builder):
return '{}/{}'.format(var.get(), builder)
return struct(
builder = builder,
get = var.get,
set = var.set,
)
infra/config/lib/builders.star
View file @ d4883520
......@@ -447,8 +447,16 @@ def builder(
)
def builder_name(builder, bucket=args.DEFAULT):
bucket = defaults.get_value('bucket', bucket)
if bucket == args.COMPUTE:
fail('Either a default for bucket must be set or bucket must be passed in')
return '{}/{}'.format(bucket, builder)
builders = struct(
builder = builder,
builder_name = builder_name,
cpu = cpu,
defaults = defaults,
goma = goma,
......
infra/config/versioned/README.md
View file @ d4883520
......@@ -2,14 +2,6 @@ This directory supports our branch CI/CQ configuration.
Contents:
* **branches**
* contains subdirectories that contain shims that set branch-specific
variables before executing the configuration in the appropriate **milestones**
subdirectory
* doesn't contain much actual configuration, so changes should be extremely
rare
* **milestones.star**
* module that maps the branches `beta` and `stable` to the milestones
* **milestones**
* contains subdirectories that contain the versioned configuration for the
active milestones
......@@ -17,7 +9,4 @@ Contents:
* **trunk**
* contains the versioned configuration for the current canary/dev builds
* open to changes
* **vars**
* contains modules with branch-specific variables; the variables are set by
the shims in **branches** when executing the configuration in **milestones**
infra/config/versioned/milestones/m80/buckets/ci.star
View file @ d4883520
load('//lib/builders.star', 'cpu', 'defaults', 'goma', 'os')
load('//lib/builders.star', 'builder_name', 'cpu', 'defaults', 'goma', 'os')
load('//lib/ci.star', 'ci')
load('//versioned/vars/ci.star', 'vars')
# Load this using relative path so that the load statement doesn't
# need to be changed when making a new milestone
load('../vars.star', milestone_vars='vars')
vars.bucket.set('ci-m80')
vars.poller.set('m80-gitiles-trigger')
load('../vars.star', 'vars')
defaults.pool.set('luci.chromium.ci')
luci.bucket(
name = vars.bucket.get(),
name = vars.ci_bucket,
acls = [
acl.entry(
roles = acl.BUILDBUCKET_READER,
......@@ -29,16 +25,16 @@ luci.bucket(
)
luci.gitiles_poller(
name = vars.poller.get(),
bucket = vars.bucket.get(),
name = vars.ci_poller,
bucket = vars.ci_bucket,
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [milestone_vars.ref],
refs = [vars.ref],
)
ci.defaults.bucket.set(vars.bucket.get())
ci.defaults.bucket.set(vars.ci_bucket)
ci.defaults.bucketed_triggers.set(True)
ci.defaults.triggered_by.set([vars.poller.get()])
ci.defaults.triggered_by.set([vars.ci_poller])
# Builders are sorted first lexicographically by the function used to define
......@@ -68,7 +64,7 @@ ci.chromiumos_builder(
ci.fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = None,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
......@@ -76,7 +72,7 @@ ci.fyi_windows_builder(
name = 'Win10 Tests x64 1803',
os = os.WINDOWS_10,
goma_backend = None,
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
......@@ -103,22 +99,22 @@ ci.gpu_builder(
ci.gpu_thin_tester(
name = 'Linux Release (NVIDIA)',
triggered_by = [vars.bucket.builder('GPU Linux Builder')],
triggered_by = [builder_name('GPU Linux Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Release (Intel)',
triggered_by = [vars.bucket.builder('GPU Mac Builder')],
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Retina Release (AMD)',
triggered_by = [vars.bucket.builder('GPU Mac Builder')],
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Win10 x64 Release (NVIDIA)',
triggered_by = [vars.bucket.builder('GPU Win x64 Builder')],
triggered_by = [builder_name('GPU Win x64 Builder')],
)
......@@ -129,7 +125,7 @@ ci.linux_builder(
ci.linux_builder(
name = 'Linux Tests',
goma_backend = None,
triggered_by = [vars.bucket.builder('Linux Builder')],
triggered_by = [builder_name('Linux Builder')],
)
ci.linux_builder(
......@@ -139,13 +135,13 @@ ci.linux_builder(
ci.linux_builder(
name = 'Linux Ozone Tester (Wayland)',
goma_backend = None,
triggered_by = [vars.bucket.builder('linux-ozone-rel')],
triggered_by = [builder_name('linux-ozone-rel')],
)
ci.linux_builder(
name = 'Linux Ozone Tester (X11)',
goma_backend = None,
triggered_by = [vars.bucket.builder('linux-ozone-rel')],
triggered_by = [builder_name('linux-ozone-rel')],
)
......@@ -157,37 +153,37 @@ ci.mac_builder(
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.12 Tests',
os = os.MAC_10_12,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.13 Tests',
os = os.MAC_10_13,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.14 Tests',
os = os.MAC_10_14,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
os = os.MAC_10_13,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
......@@ -200,7 +196,7 @@ ci.mac_ios_builder(
ci.win_builder(
name = 'Win 7 Tests x64 (1)',
os = os.WINDOWS_7,
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
ci.win_builder(
......@@ -211,5 +207,5 @@ ci.win_builder(
ci.win_builder(
name = 'Win10 Tests x64',
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
infra/config/versioned/milestones/m80/buckets/try.star
View file @ d4883520
load('//lib/builders.star', 'cpu', 'defaults', 'goma', 'os')
load('//lib/try.star', 'try_')
load('//versioned/vars/try.star', 'vars')
# Load this using relative path so that the load statement doesn't
# need to be changed when making a new milestone
load('../vars.star', milestone_vars='vars')
vars.bucket.set('try-m80')
vars.cq_group.set('cq-m80')
load('../vars.star', 'vars')
defaults.pool.set('luci.chromium.try')
luci.bucket(
name = vars.bucket.get(),
name = vars.try_bucket,
acls = [
acl.entry(
roles = acl.BUILDBUCKET_READER,
......@@ -38,12 +34,12 @@ luci.bucket(
)
luci.cq_group(
name = vars.cq_group.get(),
name = vars.cq_group,
cancel_stale_tryjobs = True,
retry_config = cq.RETRY_ALL_FAILURES,
watch = cq.refset(
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [milestone_vars.cq_ref_regexp],
refs = [vars.cq_ref_regexp],
),
acls = [
acl.entry(
......@@ -57,8 +53,8 @@ luci.cq_group(
],
)
try_.defaults.bucket.set(vars.bucket.get())
try_.defaults.cq_group.set(vars.cq_group.get())
try_.defaults.bucket.set(vars.try_bucket)
try_.defaults.cq_group.set(vars.cq_group)
# Builders are sorted first lexicographically by the function used to define
......
infra/config/versioned/milestones/m80/vars.star
View file @ d4883520
vars = struct(
ref = 'refs/branch-heads/3987',
ci_bucket = 'ci-m80',
ci_poller = 'm80-gitiles-trigger',
try_bucket = 'try-m80',
cq_group = 'cq-m80',
cq_ref_regexp = 'refs/branch-heads/3987'
)
infra/config/versioned/milestones/m81/buckets/ci.star
View file @ d4883520
load('//lib/builders.star', 'cpu', 'defaults', 'goma', 'os')
load('//lib/builders.star', 'builder_name', 'cpu', 'defaults', 'goma', 'os')
load('//lib/ci.star', 'ci')
load('//versioned/vars/ci.star', 'vars')
# Load this using relative path so that the load statement doesn't
# need to be changed when making a new milestone
load('../vars.star', milestone_vars='vars')
vars.bucket.set('ci-m81')
vars.poller.set('m81-gitiles-trigger')
load('../vars.star', 'vars')
defaults.pool.set('luci.chromium.ci')
luci.bucket(
name = vars.bucket.get(),
name = vars.ci_bucket,
acls = [
acl.entry(
roles = acl.BUILDBUCKET_READER,
......@@ -29,16 +25,16 @@ luci.bucket(
)
luci.gitiles_poller(
name = vars.poller.get(),
bucket = vars.bucket.get(),
name = vars.ci_poller,
bucket = vars.ci_bucket,
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [milestone_vars.ref],
refs = [vars.ref],
)
ci.defaults.bucket.set(vars.bucket.get())
ci.defaults.bucket.set(vars.ci_bucket)
ci.defaults.bucketed_triggers.set(True)
ci.defaults.triggered_by.set([vars.poller.get()])
ci.defaults.triggered_by.set([vars.ci_poller])
# Builders are sorted first lexicographically by the function used to define
......@@ -62,13 +58,13 @@ ci.android_builder(
ci.android_builder(
name = 'android-cronet-kitkat-arm-rel',
notifies = ['cronet'],
triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
triggered_by = [builder_name('android-cronet-arm-rel')],
)
ci.android_builder(
name = 'android-cronet-lollipop-arm-rel',
notifies = ['cronet'],
triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
triggered_by = [builder_name('android-cronet-arm-rel')],
)
ci.android_builder(
......@@ -102,7 +98,7 @@ ci.chromiumos_builder(
ci.fyi_builder(
name = 'mac-osxbeta-rel',
goma_backend = None,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
......@@ -110,7 +106,7 @@ ci.fyi_windows_builder(
name = 'Win10 Tests x64 1803',
goma_backend = None,
os = os.WINDOWS_10,
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
......@@ -137,22 +133,22 @@ ci.gpu_builder(
ci.gpu_thin_tester(
name = 'Linux Release (NVIDIA)',
triggered_by = [vars.bucket.builder('GPU Linux Builder')],
triggered_by = [builder_name('GPU Linux Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Release (Intel)',
triggered_by = [vars.bucket.builder('GPU Mac Builder')],
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Retina Release (AMD)',
triggered_by = [vars.bucket.builder('GPU Mac Builder')],
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Win10 x64 Release (NVIDIA)',
triggered_by = [vars.bucket.builder('GPU Win x64 Builder')],
triggered_by = [builder_name('GPU Win x64 Builder')],
)
......@@ -178,7 +174,7 @@ ci.linux_builder(
ci.linux_builder(
name = 'Linux Tests',
goma_backend = None,
triggered_by = [vars.bucket.builder('Linux Builder')],
triggered_by = [builder_name('Linux Builder')],
)
ci.linux_builder(
......@@ -188,13 +184,13 @@ ci.linux_builder(
ci.linux_builder(
name = 'Linux Ozone Tester (Wayland)',
goma_backend = None,
triggered_by = [vars.bucket.builder('linux-ozone-rel')],
triggered_by = [builder_name('linux-ozone-rel')],
)
ci.linux_builder(
name = 'Linux Ozone Tester (X11)',
goma_backend = None,
triggered_by = [vars.bucket.builder('linux-ozone-rel')],
triggered_by = [builder_name('linux-ozone-rel')],
)
ci.mac_builder(
......@@ -210,43 +206,43 @@ ci.mac_builder(
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.12 Tests',
os = os.MAC_10_12,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.13 Tests',
os = os.MAC_10_13,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.14 Tests',
os = os.MAC_10_14,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.13 Tests (dbg)',
os = os.MAC_ANY,
triggered_by = [vars.bucket.builder('Mac Builder (dbg)')],
triggered_by = [builder_name('Mac Builder (dbg)')],
)
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
os = os.MAC_10_13,
triggered_by = [vars.bucket.builder('Mac Builder')],
triggered_by = [builder_name('Mac Builder')],
)
......@@ -263,25 +259,25 @@ ci.memory_builder(
ci.memory_builder(
name = 'Linux ASan LSan Tests (1)',
triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
triggered_by = [builder_name('Linux ASan LSan Builder')],
)
ci.memory_builder(
name = 'Linux ASan Tests (sandboxed)',
triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
triggered_by = [builder_name('Linux ASan LSan Builder')],
)
ci.win_builder(
name = 'Win7 Tests (dbg)(1)',
os = os.WINDOWS_7,
triggered_by = [vars.bucket.builder('Win Builder (dbg)')],
triggered_by = [builder_name('Win Builder (dbg)')],
)
ci.win_builder(
name = 'Win 7 Tests x64 (1)',
os = os.WINDOWS_7,
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
ci.win_builder(
......@@ -298,5 +294,5 @@ ci.win_builder(
ci.win_builder(
name = 'Win10 Tests x64',
triggered_by = [vars.bucket.builder('Win x64 Builder')],
triggered_by = [builder_name('Win x64 Builder')],
)
infra/config/versioned/milestones/m81/buckets/try.star
View file @ d4883520
load('//lib/builders.star', 'cpu', 'defaults', 'goma', 'os')
load('//lib/try.star', 'try_')
load('//versioned/vars/try.star', 'vars')
# Load this using relative path so that the load statement doesn't
# need to be changed when making a new milestone
load('../vars.star', milestone_vars='vars')
vars.bucket.set('try-m81')
vars.cq_group.set('cq-m81')
load('../vars.star', 'vars')
defaults.pool.set('luci.chromium.try')
luci.bucket(
name = vars.bucket.get(),
name = vars.try_bucket,
acls = [
acl.entry(
roles = acl.BUILDBUCKET_READER,
......@@ -38,12 +34,12 @@ luci.bucket(
)
luci.cq_group(
name = vars.cq_group.get(),
name = vars.cq_group,
cancel_stale_tryjobs = True,
retry_config = cq.RETRY_ALL_FAILURES,
watch = cq.refset(
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [milestone_vars.cq_ref_regexp],
refs = [vars.cq_ref_regexp],
),
acls = [
acl.entry(
......@@ -57,8 +53,8 @@ luci.cq_group(
],
)
try_.defaults.bucket.set(vars.bucket.get())
try_.defaults.cq_group.set(vars.cq_group.get())
try_.defaults.bucket.set(vars.try_bucket)
try_.defaults.cq_group.set(vars.cq_group)
# Builders are sorted first lexicographically by the function used to define
......
infra/config/versioned/milestones/m81/vars.star
View file @ d4883520
vars = struct(
ref = 'refs/branch-heads/4044',
ci_bucket = 'ci-m81',
ci_poller = 'm81-gitiles-trigger',
try_bucket = 'try-m81',
cq_group = 'cq-m81',
cq_ref_regexp = 'refs/branch-heads/4044',
)
infra/config/versioned/trunk/buckets/try.star
View file @ d4883520
load('//lib/builders.star', 'cpu', 'goma', 'os')
load('//lib/try.star', 'try_')
load('//versioned/vars/try.star', 'vars')
# Load this using relative path so that the load statement doesn't
# need to be changed when making a new milestone
load('../vars.star', milestone_vars='vars')
load('../vars.star', 'vars')
luci.bucket(
name = vars.bucket.get(),
name = vars.try_bucket,
acls = [
acl.entry(
roles = acl.BUILDBUCKET_READER,
......@@ -33,13 +32,13 @@ luci.bucket(
)
luci.cq_group(
name = vars.cq_group.get(),
name = vars.cq_group,
cancel_stale_tryjobs = True,
retry_config = cq.RETRY_ALL_FAILURES,
tree_status_host = getattr(milestone_vars, 'tree_status_host', None),
tree_status_host = getattr(vars, 'tree_status_host', None),
watch = cq.refset(
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [milestone_vars.cq_ref_regexp],
refs = [vars.cq_ref_regexp],
),
acls = [
acl.entry(
......@@ -53,8 +52,8 @@ luci.cq_group(
],
)
try_.defaults.bucket.set(vars.bucket.get())
try_.defaults.cq_group.set(vars.cq_group.get())
try_.defaults.bucket.set(vars.try_bucket)
try_.defaults.cq_group.set(vars.cq_group)
# Builders are sorted first lexicographically by the function used to define
......
infra/config/versioned/trunk/vars.star
View file @ d4883520
vars = struct(
ref = 'refs/heads/master',
ci_bucket = 'ci',
ci_poller = 'master-gitiles-trigger',
try_bucket = 'try',
cq_group = 'cq',
cq_ref_regexp = 'refs/heads/.+',
# Delete this line for branches
tree_status_host = 'chromium-status.appspot.com/',
......
infra/config/versioned/vars/ci.star deleted 100644 → 0
View file @ 350ec69f
load('//lib/bucket.star', bucket_var='var')
vars = struct(
bucket = bucket_var(default = 'ci'),
poller = lucicfg.var(default = 'master-gitiles-trigger'),
poller_refs_regexp = lucicfg.var(default = 'refs/head/master'),
)
infra/config/versioned/vars/try.star deleted 100644 → 0
View file @ 350ec69f
load('//lib/bucket.star', bucket_var='var')
vars = struct(
bucket = bucket_var(default = 'try'),
cq_group = lucicfg.var(default = 'cq'),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment