Commit d21e2d9e authored by Aaron Gable's avatar Aaron Gable Committed by Commit Bot

Add triggerer ACL to android device tester no-op jobs

I mistakenly thought that the "ci" acl_set granted this
triggerer permission. It doesn't, so the triggerer
permission has to be granted separately.

Bug: 1057074
No-Try: True
Change-Id: Ie9fb7270ff76eda2ee4b946bd1f79e94fd4f0178
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080196
Commit-Queue: Aaron Gable <agable@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Aaron Gable <agable@chromium.org>
Reviewed-by: default avatarGarrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745512}
parent 7418f6ec
...@@ -6114,72 +6114,120 @@ job: < ...@@ -6114,72 +6114,120 @@ job: <
job: < job: <
id: "ci-beta-Android WebView L (dbg)" id: "ci-beta-Android WebView L (dbg)"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-Android WebView L (dbg)" id: "ci-stable-Android WebView L (dbg)"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
job: < job: <
id: "ci-beta-KitKat Phone Tester (dbg)" id: "ci-beta-KitKat Phone Tester (dbg)"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-KitKat Phone Tester (dbg)" id: "ci-stable-KitKat Phone Tester (dbg)"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
job: < job: <
id: "ci-beta-KitKat Tablet Tester" id: "ci-beta-KitKat Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-KitKat Tablet Tester" id: "ci-stable-KitKat Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
job: < job: <
id: "ci-beta-Lollipop Phone Tester" id: "ci-beta-Lollipop Phone Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-Lollipop Phone Tester" id: "ci-stable-Lollipop Phone Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
job: < job: <
id: "ci-beta-Lollipop Tablet Tester" id: "ci-beta-Lollipop Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-Lollipop Tablet Tester" id: "ci-stable-Lollipop Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
job: < job: <
id: "ci-beta-Marshmallow Tablet Tester" id: "ci-beta-Marshmallow Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-beta" acl_sets: "ci-beta"
noop: <> noop: <>
> >
job: < job: <
id: "ci-stable-Marshmallow Tablet Tester" id: "ci-stable-Marshmallow Tablet Tester"
schedule: "triggered" schedule: "triggered"
acls: <
role: TRIGGERER
granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
>
acl_sets: "ci-stable" acl_sets: "ci-stable"
noop: <> noop: <>
> >
......
...@@ -42,6 +42,10 @@ _ANDROID_TEST_NOOP_JOBS = [scheduler_pb.Job( ...@@ -42,6 +42,10 @@ _ANDROID_TEST_NOOP_JOBS = [scheduler_pb.Job(
id = bucket + '-' + builder, id = bucket + '-' + builder,
schedule = 'triggered', schedule = 'triggered',
acl_sets = [bucket], acl_sets = [bucket],
acls = [scheduler_pb.Acl(
role = scheduler_pb.Acl.TRIGGERER,
granted_to = 'chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com',
)],
noop = scheduler_pb.NoopTask(), noop = scheduler_pb.NoopTask(),
) for builder in _ANDROID_NON_BRANCHED_TESTERS for bucket in ( ) for builder in _ANDROID_NON_BRANCHED_TESTERS for bucket in (
'ci-beta', 'ci-beta',
......
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