diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-05-02 10:41:54 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-05-02 10:49:24 -0400 |
| commit | 7e139db97dfa0e501c4d3fc16fe7418e7bf87b87 (patch) | |
| tree | f7cc4bdc9d04a9abad16fc85e90d6a89b9b5f1cb | |
| parent | dbdbbeb132ee1afb2cfe4b85391216a86a592689 (diff) | |
| download | servo-7e139db97dfa0e501c4d3fc16fe7418e7bf87b87.tar.gz servo-7e139db97dfa0e501c4d3fc16fe7418e7bf87b87.zip | |
Use taskcluster secret directly in WPT sync script.
| -rwxr-xr-x | etc/ci/update-wpt-checkout | 6 | ||||
| -rw-r--r-- | etc/taskcluster/decision_task.py | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/etc/ci/update-wpt-checkout b/etc/ci/update-wpt-checkout index 015018f7ab1..a058779f554 100755 --- a/etc/ci/update-wpt-checkout +++ b/etc/ci/update-wpt-checkout @@ -85,7 +85,6 @@ function unsafe_update_metadata() { # against servo/servo. function unsafe_open_pull_request() { WPT_SYNC_USER=servo-wpt-sync - WPT_SYNC_TOKEN=`cat .wpt-token` # If the branch doesn't exist, we'll silently exit. This deals with the # case where an earlier step either failed or discovered that syncing @@ -93,6 +92,11 @@ function unsafe_open_pull_request() { git checkout "${BRANCH_NAME}" || return 0 if [[ -z "${WPT_SYNC_TOKEN+set}" ]]; then + SECRET_RESPONSE=$(curl $TASKCLUSTER_PROXY_URL/api/secrets/v1/secret/project/servo/wpt-sync) + WPT_SYNC_TOKEN=`echo "${OPEN_PR_RESPONSE}" | jq '.token'` + fi + + if [[ -z "${WPT_SYNC_TOKEN}" ]]; then echo "Github auth token missing from .wpt-token file." return 1 fi diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 880b6191abd..94fe5bf9678 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -459,18 +459,11 @@ def macos_nightly(): "./mach upload-nightly mac --secret-from-taskcluster", ) .with_artifacts("repo/target/release/servo-tech-demo.dmg") - .with_env(PY2="""if 1: - import urllib, json - url = "http://taskcluster/secrets/v1/secret/project/servo/wpt-sync" - token = json.load(urllib.urlopen(url))["secret"]["token"] - open(".wpt-token", "w").write(token) - """) - .with_script(""" - python -c "$PY2" - ./etc/ci/update-wpt-checkout fetch-and-update-expectations - ./etc/ci/update-wpt-checkout open-pr - ./etc/ci/update-wpt-checkout cleanup - """) + .with_script( + "./etc/ci/update-wpt-checkout fetch-and-update-expectations", + "./etc/ci/update-wpt-checkout open-pr", + "./etc/ci/update-wpt-checkout cleanup", + ) .find_or_create("build.mac_x64_nightly." + CONFIG.git_sha) ) |