reduce nightly work

etc/ci/update-wpt-checkout

@@ -63,22 +63,24 @@ function cleanup() {
 # Build Servo and run the full WPT testsuite, saving the results to a log file.
 function unsafe_run_tests() {
     # Run the full testsuite and record the new test results.
-    ./mach test-wpt --release --processes 6 --log-raw "${1}" \
-           --always-succeed || return 1
+    #./mach test-wpt --release --processes 6 --log-raw "${1}" \
+    #       --always-succeed || return 1
 
     # Run the bluetooth testsuite, which uses the webdriver test harness.
-    ./mach test-wpt --release --processes 1 --product=servodriver --headless \
-           --log-raw "${2}" /bluetooth --always-succeed || return 2
+    #./mach test-wpt --release --processes 1 --product=servodriver --headless \
+    #       --log-raw "${2}" /bluetooth --always-succeed || return 2
+    echo "run"
 }
 
 # Using an existing log file, update the expected test results and amend the
 # last commit with the new results.
 function unsafe_update_metadata() {
-    ./mach update-wpt "${1}" "${2}" || return 1
+    #./mach update-wpt "${1}" "${2}" || return 1
     # Ensure any new directories or ini files are included in these changes.
-    git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2
+    #git add tests/wpt/metadata tests/wpt/mozilla/meta || return 2
     # Merge all changes with the existing commit.
-    git commit -a --amend --no-edit || return 3
+    #git commit -a --amend --no-edit || return 3
+    echo "update"
 }
 
 # Push the branch to a remote branch, then open a PR for the branch
@@ -92,8 +94,12 @@ function unsafe_open_pull_request() {
     git checkout "${BRANCH_NAME}" || return 0
 
     if [[ -z "${WPT_SYNC_TOKEN+set}" ]]; then
-        SECRET_RESPONSE=$(curl ${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/project/servo/wpt-sync)
+        SECRET_RESPONSE=$(curl ${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/garbage/servo/wpt-test)
+        echo "---"
+        echo "${SECRET_RESPONSE}"
+        echo "---"
         WPT_SYNC_TOKEN=`echo "${SECRET_RESPONSE}" | jq --raw-output '.secret.token'`
+        echo "token: ${WPT_SYNC_TOKEN}"
     fi
 
     if [[ -z "${WPT_SYNC_TOKEN}" ]]; then
@@ -103,9 +109,12 @@ function unsafe_open_pull_request() {
 
     # Push the changes to a remote branch owned by the bot.
     AUTH="${WPT_SYNC_USER}:${WPT_SYNC_TOKEN}"
+    echo "auth: ${AUTH}"
     UPSTREAM="https://${AUTH}@github.com/${WPT_SYNC_USER}/servo.git"
+    echo "upstream: ${UPSTREAM}"
     git remote add "${REMOTE_NAME}" "${UPSTREAM}" || return 2
-    git push -f "${REMOTE_NAME}" "${BRANCH_NAME}:${REMOTE_BRANCH_NAME}" &>/dev/null || return 3
+    echo "git push -f '${REMOTE_NAME}' '${BRANCH_NAME}:${REMOTE_BRANCH_NAME}'"
+    git push -f "${REMOTE_NAME}" "${BRANCH_NAME}:${REMOTE_BRANCH_NAME}" || return 3
 
     # Prepare the pull request metadata.
     BODY="Automated downstream sync of changes from upstream as of "

etc/taskcluster/decision_task.py

@@ -88,11 +88,11 @@ def main(task_for):
     # https://tools.taskcluster.net/hooks/project-servo/daily
     elif task_for == "daily":
         daily_tasks_setup()
-        with_rust_nightly()
-        linux_nightly()
-        android_nightly()
-        windows_nightly()
-        macos_nightly()
+        #with_rust_nightly()
+        #linux_nightly()
+        #android_nightly()
+        #windows_nightly()
+        #macos_nightly()
         update_wpt()
 
 
@@ -474,13 +474,14 @@ def macos_nightly():
 
 def update_wpt():
     # Reuse the release build that was made for landing the PR
-    build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha)
+    #build_task = decisionlib.Task.find("build.macos_x64_release." + CONFIG.git_sha)
+    build_task = macos_build_wpt()
     update_task = (
         macos_task("WPT update")
         .with_python2()
         .with_treeherder("macOS x64", "WPT update")
         .with_features("taskclusterProxy")
-        .with_scopes("secrets:get:project/servo/wpt-sync")
+        .with_scopes("secrets:get:garbage/servo/wpt-test")
         .with_index_and_artifacts_expire_in(log_artifacts_expire_in)
         .with_max_run_time_minutes(5 * 60)
     )
@@ -502,8 +503,8 @@ def update_wpt():
     )
 
 
-def macos_wpt():
-    build_task = (
+def macos_build_wpt():
+    return (
         macos_build_task("Release build")
         .with_treeherder("macOS x64", "Release")
         .with_script("""
@@ -518,6 +519,10 @@ def macos_wpt():
         .with_artifacts("repo/target.tar.gz")
         .find_or_create("build.macos_x64_release." + CONFIG.git_sha)
     )
+
+
+def macos_wpt():
+    build_task = macos_build_wpt()
     def macos_run_task(name):
         task = macos_task(name).with_python2()
         return (