Commit fe83a4c5 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot

Disallow no-op jobs to be triggered by a trigger.

There's no reason to have a noop job triggered by a trigger: it is known
that it will not do any work and doesn't simplify any other code. The 2
noop jobs that were being triggered by a trigger are not set as children
of any builders in chromium_tests code, the fake builders exist only as
the builder for trybot mirrors.

Bug: 819899
Change-Id: Icfded342fc7c379e790f453fe3fe0196a1d3a483
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031045
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736908}
parent da66c880
......@@ -60,7 +60,6 @@ trigger {
refs: "refs/heads/master"
}
triggers: "ANGLE GPU Android Release (Nexus 5X)"
triggers: "ASAN Debug"
triggers: "ASAN Release Media"
triggers: "ASAN Release"
......@@ -243,7 +242,6 @@ trigger {
triggers: "Mojo ChromiumOS"
triggers: "Mojo Linux"
triggers: "Mojo Windows"
triggers: "Optional Android Release (Nexus 5X)"
triggers: "Site Isolation Android"
triggers: "TSAN Debug"
triggers: "TSAN Release"
......@@ -526,13 +524,6 @@ trigger {
# Android Builders. Sorted alphabetically.
################################################################################
job {
id: "ANGLE GPU Android Release (Nexus 5X)"
acl_sets: "default"
# This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
noop: {}
}
job {
id: "Android arm Builder (dbg)"
acl_sets: "default"
......@@ -1210,13 +1201,6 @@ job {
}
}
job {
id: "Optional Android Release (Nexus 5X)"
acl_sets: "default"
# This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
noop: {}
}
job {
id: "Oreo Phone Tester"
# triggered by "Android arm64 Builder (dbg)"
......
......@@ -60,7 +60,6 @@ trigger {
refs: "refs/heads/master"
}
triggers: "ANGLE GPU Android Release (Nexus 5X)"
triggers: "ASAN Debug"
triggers: "ASAN Release Media"
triggers: "ASAN Release"
......@@ -243,7 +242,6 @@ trigger {
triggers: "Mojo ChromiumOS"
triggers: "Mojo Linux"
triggers: "Mojo Windows"
triggers: "Optional Android Release (Nexus 5X)"
triggers: "Site Isolation Android"
triggers: "TSAN Debug"
triggers: "TSAN Release"
......@@ -526,13 +524,6 @@ trigger {
# Android Builders. Sorted alphabetically.
################################################################################
job {
id: "ANGLE GPU Android Release (Nexus 5X)"
acl_sets: "default"
# This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
noop: {}
}
job {
id: "Android arm Builder (dbg)"
acl_sets: "default"
......@@ -1210,13 +1201,6 @@ job {
}
}
job {
id: "Optional Android Release (Nexus 5X)"
acl_sets: "default"
# This bot doesn't actually exist, so it's noop'ed out. crbug.com/819899
noop: {}
}
job {
id: "Oreo Phone Tester"
# triggered by "Android arm64 Builder (dbg)"
......
......@@ -52,4 +52,30 @@ def _validate_scheduler(ctx):
msg.append('\n ]')
fail(''.join(msg))
noop_jobs = {}
for job in scheduler_cfg.job:
if not job.buildbucket.builder:
noop_jobs[job.id] = True
triggers_with_noop_jobs = {}
for trigger in scheduler_cfg.trigger:
for job in trigger.triggers:
if job in noop_jobs:
triggers_with_noop_jobs.setdefault(trigger.id, []).append(job)
if triggers_with_noop_jobs:
msg = ['The following triggers refer to no-op jobs']
for trigger, jobs in triggers_with_noop_jobs.items():
msg.append('\n ')
msg.append(repr(trigger))
msg.append(' -> [')
for job in jobs:
msg.append('\n ')
msg.append(repr(job))
msg.append(',')
msg.append('\n ]')
fail(''.join(msg))
lucicfg.generator(_validate_scheduler)
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