Commit 3ad62d42 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot

Do not create duplicate time-based scheduler jobs.

Change-Id: Ieaa7dd3aab2e677967f3af9bd48d1a793c56c23b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142832
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@{#758020}
parent a107a161
...@@ -7422,16 +7422,6 @@ job: < ...@@ -7422,16 +7422,6 @@ job: <
builder: "android-asan" builder: "android-asan"
> >
> >
job: <
id: "ci-android-avd-packager"
schedule: "0 7 * * 0 *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-avd-packager"
>
>
job: < job: <
id: "ci-android-bfcache-rel" id: "ci-android-bfcache-rel"
acl_sets: "ci" acl_sets: "ci"
...@@ -7607,16 +7597,6 @@ job: < ...@@ -7607,16 +7597,6 @@ job: <
builder: "android-marshmallow-arm64-rel" builder: "android-marshmallow-arm64-rel"
> >
> >
job: <
id: "ci-android-marshmallow-x86-fyi-rel"
schedule: "0 7 * * *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-marshmallow-x86-fyi-rel"
>
>
job: < job: <
id: "ci-android-mojo-webview-rel" id: "ci-android-mojo-webview-rel"
acl_sets: "ci" acl_sets: "ci"
...@@ -7667,16 +7647,6 @@ job: < ...@@ -7667,16 +7647,6 @@ job: <
builder: "android-pie-x86-rel" builder: "android-pie-x86-rel"
> >
> >
job: <
id: "ci-android-sdk-packager"
schedule: "0 7 * * 0 *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "android-sdk-packager"
>
>
job: < job: <
id: "ci-chromeos-amd64-generic-asan-rel" id: "ci-chromeos-amd64-generic-asan-rel"
acl_sets: "ci" acl_sets: "ci"
...@@ -7875,16 +7845,6 @@ job: < ...@@ -7875,16 +7845,6 @@ job: <
builder: "ios-simulator-noncq" builder: "ios-simulator-noncq"
> >
> >
job: <
id: "ci-ios-webkit-tot"
schedule: "0 1-23/6 * * *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "ios-webkit-tot"
>
>
job: < job: <
id: "ci-ios13-beta-simulator" id: "ci-ios13-beta-simulator"
acl_sets: "ci" acl_sets: "ci"
...@@ -8160,16 +8120,6 @@ job: < ...@@ -8160,16 +8120,6 @@ job: <
builder: "linux-wpt-fyi-rel" builder: "linux-wpt-fyi-rel"
> >
> >
job: <
id: "ci-linux_chromium_component_updater"
schedule: "0 0,6,12,18 * * *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "linux_chromium_component_updater"
>
>
job: < job: <
id: "ci-m80-Android Release (Nexus 5X)" id: "ci-m80-Android Release (Nexus 5X)"
acl_sets: "ci-m80" acl_sets: "ci-m80"
...@@ -10049,16 +9999,6 @@ job: < ...@@ -10049,16 +9999,6 @@ job: <
builder: "mac-swangle-chromium-x64" builder: "mac-swangle-chromium-x64"
> >
> >
job: <
id: "ci-mac-upload-perfetto"
schedule: "with 3h interval"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "mac-upload-perfetto"
>
>
job: < job: <
id: "ci-win-annotator-rel" id: "ci-win-annotator-rel"
acl_sets: "ci" acl_sets: "ci"
...@@ -10095,16 +10035,6 @@ job: < ...@@ -10095,16 +10035,6 @@ job: <
builder: "win-asan" builder: "win-asan"
> >
> >
job: <
id: "ci-win-celab-builder-rel"
schedule: "0 0,6,12,18 * * *"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "win-celab-builder-rel"
>
>
job: < job: <
id: "ci-win-celab-tester-rel" id: "ci-win-celab-tester-rel"
acls: < acls: <
...@@ -10203,16 +10133,6 @@ job: < ...@@ -10203,16 +10133,6 @@ job: <
builder: "win-swangle-x86" builder: "win-swangle-x86"
> >
> >
job: <
id: "ci-win-upload-perfetto"
schedule: "with 3h interval"
acl_sets: "ci"
buildbucket: <
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "win-upload-perfetto"
>
>
job: < job: <
id: "ci-win10-code-coverage" id: "ci-win10-code-coverage"
acl_sets: "ci" acl_sets: "ci"
......
...@@ -3,6 +3,13 @@ def _ensure_ci_jobs_can_be_bucketed_or_not(ctx): ...@@ -3,6 +3,13 @@ def _ensure_ci_jobs_can_be_bucketed_or_not(ctx):
ci_jobs = {} ci_jobs = {}
for j in cfg.job: for j in cfg.job:
# The default behavior is the same as 'triggered', so look for non-empty
# schedules that are not 'triggered', we don't want to create duplicates of
# those jobs because it will cause double the number of builds to be
# scheduled
if j.schedule and j.schedule != 'triggered':
continue
bucket = j.buildbucket.bucket bucket = j.buildbucket.bucket
if bucket != 'luci.chromium.ci': if bucket != 'luci.chromium.ci':
continue continue
......
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