summaryrefslogtreecommitdiff
path: root/chromium/infra/config/generators
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/infra/config/generators
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/infra/config/generators')
-rw-r--r--chromium/infra/config/generators/cq-builders-md.star4
-rw-r--r--chromium/infra/config/generators/scheduler-bucketed-jobs.star4
-rw-r--r--chromium/infra/config/generators/scheduler-noop-jobs.star6
-rw-r--r--chromium/infra/config/generators/sort-consoles.star8
4 files changed, 21 insertions, 1 deletions
diff --git a/chromium/infra/config/generators/cq-builders-md.star b/chromium/infra/config/generators/cq-builders-md.star
index 454d41e3c77..594eb0ebe2e 100644
--- a/chromium/infra/config/generators/cq-builders-md.star
+++ b/chromium/infra/config/generators/cq-builders-md.star
@@ -1,3 +1,7 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
_MD_HEADER = """\
<!-- Auto-generated by lucicfg (via cq-builders-md.star). -->
<!-- Do not modify manually. -->
diff --git a/chromium/infra/config/generators/scheduler-bucketed-jobs.star b/chromium/infra/config/generators/scheduler-bucketed-jobs.star
index 6d12c901672..42074f6461e 100644
--- a/chromium/infra/config/generators/scheduler-bucketed-jobs.star
+++ b/chromium/infra/config/generators/scheduler-bucketed-jobs.star
@@ -1,3 +1,7 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
def _ensure_ci_jobs_can_be_bucketed_or_not(ctx):
cfg = ctx.output['luci-scheduler.cfg']
diff --git a/chromium/infra/config/generators/scheduler-noop-jobs.star b/chromium/infra/config/generators/scheduler-noop-jobs.star
index 7a6b01d08ac..95b22729e84 100644
--- a/chromium/infra/config/generators/scheduler-noop-jobs.star
+++ b/chromium/infra/config/generators/scheduler-noop-jobs.star
@@ -1,10 +1,14 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
# Don't make a habit of this - it isn't public API
load('@stdlib//internal/luci/proto.star', 'scheduler_pb')
load('//project.star', 'settings')
_BRANCH_NOOP_CONFIG = struct(
- buckets = ['ci-m81', 'ci-m83'],
+ buckets = ['ci-m83', 'ci-m84'],
fmt = '{bucket}-{builder}',
) if settings.is_master else struct(
buckets = ['ci'],
diff --git a/chromium/infra/config/generators/sort-consoles.star b/chromium/infra/config/generators/sort-consoles.star
new file mode 100644
index 00000000000..54be15e1d40
--- /dev/null
+++ b/chromium/infra/config/generators/sort-consoles.star
@@ -0,0 +1,8 @@
+def _sort_consoles(ctx):
+ milo = ctx.output['luci-milo.cfg']
+ # Sort so that the overview consoles appear at the top of the console list
+ # The overview consoles specify a title, so checking c.id == c.name will put
+ # the overview consoles first
+ milo.consoles = sorted(milo.consoles, key=lambda c: (c.id == c.name, c.id))
+
+lucicfg.generator(_sort_consoles)