Auto merge of #23316 - servo:scope, r=SimonSapin

Give the correct scopes to daily tasks

Follow up to https://github.com/servo/servo/pull/23304
Example of failing tasks: https://tools.taskcluster.net/groups/GsqivaANRMyJJ3qA1ycvhg

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23316)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-05-03 09:09:19 -04:00 committed by GitHub
commit dd5ab9eaeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -279,10 +279,10 @@ def android_nightly(job):
} }
return ( return (
android_build_task("Release build") android_build_task("Nightly build and upload")
.with_treeherder("Android " + details[job]["name"], "Nightly") .with_treeherder("Android " + details[job]["name"], "Nightly")
.with_features("taskclusterProxy") .with_features("taskclusterProxy")
.with_scopes("secrets:get:project/servo/s3-upload") .with_scopes("secrets:get:project/servo/s3-upload-credentials")
.with_script(""" .with_script("""
./mach build {flag} --release ./mach build {flag} --release
./mach package {flag} --release --maven ./mach package {flag} --release --maven
@ -393,9 +393,9 @@ def windows_release():
def windows_nightly(): def windows_nightly():
return ( return (
windows_build_task("Release build") windows_build_task("Nightly build and upload")
.with_treeherder("Windows x64", "Nightly") .with_treeherder("Windows x64", "Nightly")
.with_scopes("secrets:get:project/servo/s3-upload") .with_scopes("secrets:get:project/servo/s3-upload-credentials")
.with_script("mach build --release", .with_script("mach build --release",
"mach package --release", "mach package --release",
"mach upload-nightly windows-msvc --secret-from-taskcluster") "mach upload-nightly windows-msvc --secret-from-taskcluster")
@ -410,7 +410,7 @@ def linux_nightly():
linux_build_task("Nightly build and upload") linux_build_task("Nightly build and upload")
.with_treeherder("Linux x64", "Nightly") .with_treeherder("Linux x64", "Nightly")
.with_features("taskclusterProxy") .with_features("taskclusterProxy")
.with_scopes("secrets:get:project/servo/s3-upload") .with_scopes("secrets:get:project/servo/s3-upload-credentials")
# Not reusing the build made for WPT because it has debug assertions # Not reusing the build made for WPT because it has debug assertions
.with_script( .with_script(
"./mach build --release", "./mach build --release",
@ -445,11 +445,11 @@ def linux_wpt():
def macos_nightly(): def macos_nightly():
return ( return (
macos_build_task("Release build") macos_build_task("Nightly build and upload")
.with_treeherder("macOS x64", "Nightly") .with_treeherder("macOS x64", "Nightly")
.with_features("taskclusterProxy") .with_features("taskclusterProxy")
.with_scopes( .with_scopes(
"secrets:get:project/servo/s3-upload", "secrets:get:project/servo/s3-upload-credentials",
"secrets:get:project/servo/github-homebrew-token", "secrets:get:project/servo/github-homebrew-token",
"secrets:get:project/servo/wpt-sync", "secrets:get:project/servo/wpt-sync",
) )