Merge mozilla-central to autoland. a=merge CLOSED TREE

dothq · Dec 20, 2018 · 1d18a3f · 1d18a3f
2 parents 2104ae0 + 767c971
commit 1d18a3f
Show file tree

Hide file tree

Showing 70 changed files with 269 additions and 1,429 deletions.
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -146,9 +146,6 @@ tasks:
                 GECKO_COMMIT_MSG: {$if: 'tasks_for != "action"', then: '${push.comment}'}
                 HG_STORE_PATH: /builds/worker/checkouts/hg-store
                 TASKCLUSTER_CACHES: /builds/worker/checkouts
-                # someday, these will be provided by the worker - Bug 1492664
-                TASKCLUSTER_ROOT_URL: https://taskcluster.net
-                TASKCLUSTER_PROXY_URL: http://taskcluster
               - $if: 'tasks_for == "action"'
                 then:
                   ACTION_TASK_GROUP_ID: '${action.taskGroupId}'     # taskGroupId of the target task

diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt
@@ -45,7 +45,6 @@ mozilla.pth:third_party/python/pytest/src
 mozilla.pth:third_party/python/pytoml
 mozilla.pth:third_party/python/redo
 mozilla.pth:third_party/python/six
-mozilla.pth:third_party/python/taskcluster-urls
 mozilla.pth:third_party/python/voluptuous
 mozilla.pth:third_party/python/json-e
 mozilla.pth:build

diff --git a/mobile/android/mach_commands.py b/mobile/android/mach_commands.py
@@ -50,13 +50,9 @@ def REMOVED(cls):
 @CommandProvider
 class MachCommands(MachCommandBase):
     def _root_url(self, artifactdir=None, objdir=None):
-        """Generate a publicly-accessible URL for the tasks's artifacts, or an objdir path"""
         if 'TASK_ID' in os.environ and 'RUN_ID' in os.environ:
-            import taskcluster_urls
-            return taskcluster_urls.api(
-                os.environ['TASKCLUSTER_ROOT_URL'],
-                'queue', 'v1', 'task/{}/runs/{}/artifacts/{}'.format(
-                    os.environ['TASK_ID'], os.environ['RUN_ID'], artifactdir))
+            return 'https://queue.taskcluster.net/v1/task/{}/runs/{}/artifacts/{}'.format(
+                os.environ['TASK_ID'], os.environ['RUN_ID'], artifactdir)
         else:
             return os.path.join(self.topobjdir, objdir)
 

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
@@ -46,8 +46,6 @@
     backends,
 )
 
-import taskgraph
-
 
 BUILD_WHAT_HELP = '''
 What to build. Can be a top-level make target or a relative directory. If
@@ -1259,7 +1257,6 @@ def _make_artifacts(self, tree=None, job=None, skip_cache=False):
         help='Skip all local caches to force re-fetching remote artifacts.',
         default=False)
     def artifact_install(self, source=None, skip_cache=False, tree=None, job=None, verbose=False):
-        taskgraph.set_root_url_env()
         self._set_log_level(verbose)
         artifacts = self._make_artifacts(tree=tree, job=job, skip_cache=skip_cache)
 

diff --git a/python/mozrelease/mozrelease/buglist_creator.py b/python/mozrelease/mozrelease/buglist_creator.py
@@ -218,7 +218,6 @@ def email_release_drivers(
 
     notify_options = {}
     if 'TASKCLUSTER_PROXY_URL' in os.environ:
-        # Until bug 1460015 is finished, use the old baseUrl style of proxy URL
         base_url = os.environ['TASKCLUSTER_PROXY_URL'].rstrip('/')
         notify_options['baseUrl'] = '{}/notify/v1'.format(base_url)
     notify = Notify(notify_options)

diff --git a/taskcluster/ci/l10n/kind.yml b/taskcluster/ci/l10n/kind.yml
@@ -108,27 +108,27 @@ job-template:
             linux.*:    # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
-                    artifact-reference: <build-signing/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             macosx64:
                 EN_US_PACKAGE_NAME: target.dmg
                 EN_US_BINARY_URL:
-                    artifact-reference: <repackage/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<repackage>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             win.*:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
-                    artifact-reference: <build-signing/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/{artifact_prefix}
                 EN_US_INSTALLER_BINARY_URL:
-                    artifact-reference: <repackage-signing/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<repackage-signing>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             android-api-16:
                 EN_US_PACKAGE_NAME: target.apk
                 EN_US_BINARY_URL:
-                    artifact-reference: <build/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}
     mozharness:
         config:
             by-build-platform:

diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml
@@ -137,27 +137,27 @@ job-template:
             linux.*:    # linux64 and 32 get same treatment here
                 EN_US_PACKAGE_NAME: target.tar.bz2
                 EN_US_BINARY_URL:
-                    artifact-reference: <build-signing/artifacts/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/artifacts/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             macosx64.*:
                 EN_US_PACKAGE_NAME: target.dmg
                 EN_US_BINARY_URL:
-                    artifact-reference: <repackage/artifacts/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<repackage>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/artifacts/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             win.*:
                 EN_US_PACKAGE_NAME: target.zip
                 EN_US_BINARY_URL:
-                    artifact-reference: <build-signing/artifacts/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build-signing>/artifacts/{artifact_prefix}
                 EN_US_INSTALLER_BINARY_URL:
-                    artifact-reference: <repackage-signing/artifacts/{artifact_prefix}>
+                    task-reference: https://queue.taskcluster.net/v1/task/<repackage-signing>/artifacts/{artifact_prefix}
                 MAR_TOOLS_URL:
-                    artifact-reference: <build/artifacts/{artifact_prefix}/host/bin>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/host/bin
             android-api-16-nightly:
                 EN_US_PACKAGE_NAME: target.apk
                 EN_US_BINARY_URL:
-                    artifact-reference: <build/artifacts/{artifact_prefix}/en-US>
+                    task-reference: https://queue.taskcluster.net/v1/task/<build>/artifacts/{artifact_prefix}/en-US
     mozharness:
         config:
             by-build-platform:

diff --git a/taskcluster/ci/upload-symbols/kind.yml b/taskcluster/ci/upload-symbols/kind.yml
@@ -24,11 +24,12 @@ job-template:
         docker-image: {in-tree: "lint"}
         max-run-time: 900
         env:
+            ARTIFACT_TASKID: {"task-reference": "<build>"}
             # {level} gets replaced in the upload_symbols transform
             SYMBOL_SECRET: "project/releng/gecko/build/level-{level}/gecko-symbol-upload"
     run:
         using: mach
-        mach: {artifact-reference: "python toolkit/crashreporter/tools/upload_symbols.py <build/public/build/target.crashreporter-symbols-full.zip>"}
+        mach: python toolkit/crashreporter/tools/upload_symbols.py https://queue.taskcluster.net/v1/task/${ARTIFACT_TASKID}/artifacts/public/build/target.crashreporter-symbols-full.zip
         sparse-profile: upload-symbols
     optimization:
         only-if-dependencies-run: null

diff --git a/taskcluster/docker/debian-base/Dockerfile b/taskcluster/docker/debian-base/Dockerfile
@@ -49,9 +49,8 @@ RUN apt-get update && \
 COPY setup_packages.sh /usr/local/sbin/
 COPY cloud-mirror-workaround.sh /usr/local/sbin/
 
-# %ARG TASKCLUSTER_ROOT_URL
 # %ARG DOCKER_IMAGE_PACKAGES
-RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES && \
+RUN /usr/local/sbin/setup_packages.sh $DOCKER_IMAGE_PACKAGES && \
     echo 'dir::bin::methods::https "/usr/local/sbin/cloud-mirror-workaround.sh";' > /etc/apt/apt.conf.d/99cloud-mirror-workaround && \
     apt-get update && \
     apt-get install \

diff --git a/taskcluster/docker/debian-base/setup_packages.sh b/taskcluster/docker/debian-base/setup_packages.sh
@@ -1,17 +1,5 @@
 #!/bin/sh
 
-TASKCLUSTER_ROOT_URL=$1
-shift
-
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-fi
-
-
 for task in "$@"; do
-  echo "adding package source $queue_base/task/$task/artifacts/public/build/"
-  echo "deb [trusted=yes] $queue_base/task/$task/artifacts/public/build/ debian/" > "/etc/apt/sources.list.d/99$task.list"
+  echo "deb [trusted=yes] https://queue.taskcluster.net/v1/task/$task/artifacts/public/build/ debian/" > "/etc/apt/sources.list.d/99$task.list"
 done
diff --git a/taskcluster/docker/debian7-build/Dockerfile b/taskcluster/docker/debian7-build/Dockerfile
@@ -8,9 +8,8 @@ VOLUME /builds/worker/tooltool-cache
 
 ENV XZ_OPT=-T0
 
-# %ARG TASKCLUSTER_ROOT_URL
 # %ARG DOCKER_IMAGE_PACKAGES
-RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES
+RUN /usr/local/sbin/setup_packages.sh $DOCKER_IMAGE_PACKAGES
 
 # %ARG ARCH
 RUN dpkg --add-architecture $ARCH

diff --git a/taskcluster/docker/debian7-mozjs-rust-build/Dockerfile b/taskcluster/docker/debian7-mozjs-rust-build/Dockerfile
@@ -6,8 +6,7 @@ VOLUME /builds/worker/checkouts
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 
-# %ARG TASKCLUSTER_ROOT_URL
 # %ARG DOCKER_IMAGE_PACKAGES
-RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES && \
+RUN /usr/local/sbin/setup_packages.sh $DOCKER_IMAGE_PACKAGES && \
     apt-get update && \
     apt-get install cmake
diff --git a/taskcluster/docker/diffoscope/get_and_diffoscope b/taskcluster/docker/diffoscope/get_and_diffoscope
@@ -11,13 +11,6 @@ mkdir a b
 # implemented, it's better to first manually extract the data.
 # Plus dmg files are not supported yet.
 
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-fi
-
 case "$ORIG_URL" in
 */target.zip|*/target.apk)
 	curl -sL "$ORIG_URL" > a.zip
@@ -33,7 +26,7 @@ case "$ORIG_URL" in
 	# We don't have mach available to call mach artifact toolchain.
 	# This is the trivial equivalent for those toolchains we use here.
 	for t in $MOZ_TOOLCHAINS; do
-		curl -sL $queue_base/task/${t#*@}/artifacts/${t%@*} | tar -Jxf -
+		curl -sL https://queue.taskcluster.net/v1/task/${t#*@}/artifacts/${t%@*} | tar -Jxf -
 	done
 	for tool in lipo otool; do
 		ln -s /builds/worker/cctools/bin/x86_64-apple-darwin*-$tool bin/$tool

diff --git a/taskcluster/docker/funsize-update-generator/runme.sh b/taskcluster/docker/funsize-update-generator/runme.sh
@@ -9,14 +9,8 @@ test "$SHA384_SIGNING_CERT"
 ARTIFACTS_DIR="/home/worker/artifacts"
 mkdir -p "$ARTIFACTS_DIR"
 
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-fi
-
-curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json "$queue_base/task/$TASK_ID"
+curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json \
+    "https://queue.taskcluster.net/v1/task/$TASK_ID"
 
 # auth:aws-s3:read-write:tc-gp-private-1d-us-east-1/releng/mbsdiff-cache/
 # -> bucket of tc-gp-private-1d-us-east-1, path of releng/mbsdiff-cache/
@@ -33,8 +27,7 @@ then
   test "${AWS_BUCKET_NAME}"
 
   set +x  # Don't echo these.
-  # Until bug 1460015 is finished, use baseUrl-style proxy URLs
-  secret_url="${TASKCLUSTER_PROXY_URL}/auth/v1/aws/s3/read-write/${AWS_BUCKET_NAME}/${S3_PATH}"
+  secret_url="taskcluster/auth/v1/aws/s3/read-write/${AWS_BUCKET_NAME}/${S3_PATH}"
   AUTH=$(curl "${secret_url}")
   AWS_ACCESS_KEY_ID=$(echo "${AUTH}" | jq -r '.credentials.accessKeyId')
   AWS_SECRET_ACCESS_KEY=$(echo "${AUTH}" | jq -r '.credentials.secretAccessKey')

diff --git a/taskcluster/docker/funsize-update-generator/scripts/funsize.py b/taskcluster/docker/funsize-update-generator/scripts/funsize.py
@@ -35,19 +35,16 @@
 ddstats = ThreadStats(namespace='releng.releases.partials')
 
 
-ROOT_URL = os.environ['TASKCLUSTER_ROOT_URL']
-QUEUE_PREFIX = ("https://queue.taskcluster.net/"
-                if ROOT_URL == 'https://taskcluster.net'
-                else ROOT_URL + '/api/queue/')
 ALLOWED_URL_PREFIXES = (
     "http://download.cdn.mozilla.net/pub/mozilla.org/firefox/nightly/",
     "http://download.cdn.mozilla.net/pub/firefox/nightly/",
     "https://mozilla-nightly-updates.s3.amazonaws.com",
+    "https://queue.taskcluster.net/",
     "http://ftp.mozilla.org/",
     "http://download.mozilla.org/",
     "https://archive.mozilla.org/",
     "http://archive.mozilla.org/",
-    QUEUE_PREFIX,
+    "https://queue.taskcluster.net/v1/task/",
 )
 STAGING_URL_PREFIXES = (
     "http://ftp.stage.mozaws.net/",

diff --git a/taskcluster/docker/periodic-updates/runme.sh b/taskcluster/docker/periodic-updates/runme.sh
@@ -51,25 +51,18 @@ fi
 export ARTIFACTS_DIR="/home/worker/artifacts"
 mkdir -p "$ARTIFACTS_DIR"
 
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-fi
-
 # Get Arcanist API token
 
 if [ -n "${TASK_ID}" ]
 then
-  curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json "$queue_base/task/$TASK_ID"
+  curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json \
+    "https://queue.taskcluster.net/v1/task/$TASK_ID"
   ARC_SECRET=$(jq -r '.scopes[] | select(contains ("arc-phabricator-token"))' /home/worker/task.json | awk -F: '{print $3}')
 fi
 if [ -n "${ARC_SECRET}" ] && getent hosts taskcluster
 then
   set +x # Don't echo these
-  # Until bug 1460015 is finished, use baseUrl-style proxy URLs
-  secrets_url="${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/${ARC_SECRET}"
+  secrets_url="http://taskcluster/secrets/v1/secret/${ARC_SECRET}"
   SECRET=$(curl "${secrets_url}")
   TOKEN=$(echo "${SECRET}" | jq -r '.secret.token')
 elif [ -n "${ARC_TOKEN}" ] # Allow for local testing.

diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh
@@ -95,15 +95,6 @@ BLOCKLIST_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${BLOCKLIST_DIFF_ARTIFACT:-"blocklist.
 REMOTE_SETTINGS_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${REMOTE_SETTINGS_DIFF_ARTIFACT:-"remote-settings.diff"}"
 SUFFIX_LIST_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${SUFFIX_LIST_DIFF_ARTIFACT:-"effective_tld_names.diff"}"
 
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-    index_base='https://index.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-    index_base="$TASKCLUSTER_ROOT_URL/api/index/v1"
-fi
-
 # Get the current in-tree version for a code branch.
 function get_version {
   VERSION_REPO=$1
@@ -155,11 +146,11 @@ function download_shared_artifacts_from_tc {
 
   # Download everything we need to run js with xpcshell
   echo "INFO: Downloading all the necessary pieces from the taskcluster index..."
-  TASKID_URL="$index_base/task/gecko.v2.${REPODIR}.latest.${PRODUCT}.linux64-opt"
+  TASKID_URL="https://index.taskcluster.net/v1/task/gecko.v2.${REPODIR}.latest.${PRODUCT}.linux64-opt"
   if [ "${USE_MC}" == "true" ]; then
-    TASKID_URL="$index_base/task/gecko.v2.mozilla-central.latest.${PRODUCT}.linux64-opt"
+    TASKID_URL="https://index.taskcluster.net/v1/task/gecko.v2.mozilla-central.latest.${PRODUCT}.linux64-opt"
   fi
-  ${WGET} -O ${TASKID_FILE} "${TASKID_URL}"
+  ${WGET} -O ${TASKID_FILE} ${TASKID_URL}
   INDEX_TASK_ID="$($JQ -r '.taskId' ${TASKID_FILE})"
   if [ -z "${INDEX_TASK_ID}" ]; then
     echo "Failed to look up taskId at ${TASKID_URL}"
@@ -169,16 +160,16 @@ function download_shared_artifacts_from_tc {
   fi
 
   TASKSTATUS_FILE="taskstatus.json"
-  STATUS_URL="$queue_base/task/${INDEX_TASK_ID}/status"
+  STATUS_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/status"
   ${WGET} -O "${TASKSTATUS_FILE}" "${STATUS_URL}"
   LAST_RUN_INDEX=$(($(jq '.status.runs | length' ${TASKSTATUS_FILE}) - 1))
   echo "INFO: Examining run number ${LAST_RUN_INDEX}"
 
-  BROWSER_ARCHIVE_URL="$queue_base/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${BROWSER_ARCHIVE}"
+  BROWSER_ARCHIVE_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${BROWSER_ARCHIVE}"
   echo "INFO: ${WGET} ${BROWSER_ARCHIVE_URL}"
   ${WGET} "${BROWSER_ARCHIVE_URL}"
 
-  TESTS_ARCHIVE_URL="$queue_base/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${TESTS_ARCHIVE}"
+  TESTS_ARCHIVE_URL="https://queue.taskcluster.net/v1/task/${INDEX_TASK_ID}/runs/${LAST_RUN_INDEX}/artifacts/public/build/${TESTS_ARCHIVE}"
   echo "INFO: ${WGET} ${TESTS_ARCHIVE_URL}"
   ${WGET} "${TESTS_ARCHIVE_URL}"
 }

diff --git a/taskcluster/docker/pipfile-updates/runme.sh b/taskcluster/docker/pipfile-updates/runme.sh
@@ -19,25 +19,18 @@ fi
 export ARTIFACTS_DIR="/home/worker/artifacts"
 mkdir -p "$ARTIFACTS_DIR"
 
-# duplicate the functionality of taskcluster-lib-urls, but in bash..
-if [ "$TASKCLUSTER_ROOT_URL" = "https://taskcluster.net" ]; then
-    queue_base='https://queue.taskcluster.net/v1'
-else
-    queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
-fi
-
 # Get Arcanist API token
 
 if [ -n "${TASK_ID}" ]
 then
-  curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json "$queue_base/task/$TASK_ID"
+  curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json \
+    "https://queue.taskcluster.net/v1/task/$TASK_ID"
   ARC_SECRET=$(jq -r '.scopes[] | select(contains ("arc-phabricator-token"))' /home/worker/task.json | awk -F: '{print $3}')
 fi
 if [ -n "${ARC_SECRET}" ] && getent hosts taskcluster
 then
   set +x # Don't echo these
-  # Until bug 1460015 is finished, use the old, baseUrl-style proxy URLs
-  secrets_url="${TASKCLUSTER_PROXY_URL}/secrets/v1/secret/${ARC_SECRET}"
+  secrets_url="http://taskcluster/secrets/v1/secret/${ARC_SECRET}"
   SECRET=$(curl "${secrets_url}")
   TOKEN=$(echo "${SECRET}" | jq -r '.secret.token')
 elif [ -n "${ARC_TOKEN}" ] # Allow for local testing.

diff --git a/taskcluster/docker/toolchain-build/Dockerfile b/taskcluster/docker/toolchain-build/Dockerfile
@@ -9,8 +9,7 @@ VOLUME /builds/worker/tooltool-cache
 ENV XZ_OPT=-T0
 
 # %ARG DOCKER_IMAGE_PACKAGES
-# %ARG TASKCLUSTER_ROOT_URL
-RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES
+RUN /usr/local/sbin/setup_packages.sh $DOCKER_IMAGE_PACKAGES
 
 RUN apt-get update && \
     apt-get install \

diff --git a/taskcluster/docs/optimization-process.rst b/taskcluster/docs/optimization-process.rst
@@ -70,6 +70,6 @@ label. At this phase, the edges in the task graph diverge from the
 ``task.dependencies`` attributes, as the latter may contain dependencies
 outside of the taskgraph (for replacement tasks).
 
-As a side-effect, this phase also expands all ``{"task-reference": ".."}`` and
-``{"artifact-reference": ".."}`` objects within the task definitions.
+As a side-effect, this phase also expands all ``{"task-reference": ".."}``
+objects within the task definitions.