No Bug - Remove taskcluster.net references in the tree.

Differential Revision: https://phabricator.services.mozilla.com//D58297
This commit is contained in:
Justin Wood 2020-01-24 00:16:37 +02:00
Родитель eb1a9e56fb
Коммит e38c52acbe
18 изменённых файлов: 21 добавлений и 63 удалений

Просмотреть файл

@ -8,7 +8,6 @@ ENV DEBIAN_FRONTEND=noninteractive
CMD ["/bin/bash", "--login"]
COPY setup_packages.sh /usr/local/sbin/
COPY cloud-mirror-workaround.sh /usr/local/sbin/
# %ARG DIST
# %ARG SNAPSHOT
@ -21,7 +20,6 @@ RUN for s in debian_$DIST debian_$DIST-updates debian_$DIST-backports debian-sec
echo 'APT::Install-Recommends "false";'; \
echo 'Acquire::Check-Valid-Until "false";'; \
echo 'Acquire::Retries "5";'; \
echo 'dir::bin::methods::https "/usr/local/sbin/cloud-mirror-workaround.sh";'; \
) > /etc/apt/apt.conf.d/99taskcluster
RUN apt-get update && \

Просмотреть файл

@ -1,10 +0,0 @@
#!/bin/sh
# The apt in Debian stretch mishandles the HTTP redirects from queue.taskcluster.net to
# cloud-mirror.taskcluster.net, and unescapes the url. This apt method wrapper
# strips redirections and sends directly to the S3 bucket. This has the downside of
# always hitting us-west-2 independently of the zone this runs on, but this is only
# used when creating docker images, so shouldn't generate huge cross-AWS-zone S3
# transfers.
/usr/lib/apt/methods/https | sed -u 's,^New-URI: https://cloud-mirror.taskcluster.net/v1/redirect/[^/]*/[^/]*/https://,New-URI: https://,'

Просмотреть файл

@ -4,11 +4,7 @@ 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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
for task in "$@"; do

Просмотреть файл

@ -3,6 +3,6 @@ To run this locally for testing/development purposes:
1. Find a funsize generating task ID
2. make pull DOCKERIO_USERNAME=mozillareleases
3. docker run -t -e TASKCLUSTER_ROOT_URL="https://taskcluster.net" -e SHA1_SIGNING_CERT='nightly_sha1' -e SHA384_SIGNING_CERT='nightly_sha384' -e TASK_ID="${TASK_ID}" -e EXTRA_PARAMS="--arch=x86_64" mozillareleases/funsize-update-generator /runme.sh
3. docker run -t -e TASKCLUSTER_ROOT_URL="https://firefox-ci-tc.services.mozilla.com/" -e SHA1_SIGNING_CERT='nightly_sha1' -e SHA384_SIGNING_CERT='nightly_sha384' -e TASK_ID="${TASK_ID}" -e EXTRA_PARAMS="--arch=x86_64" mozillareleases/funsize-update-generator /runme.sh
The TASK_ID should be a recent "partials" Task.

Просмотреть файл

@ -10,11 +10,7 @@ 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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
curl --location --retry 10 --retry-delay 10 -o /home/worker/task.json "$queue_base/task/$TASK_ID"

Просмотреть файл

@ -28,9 +28,7 @@ log = logging.getLogger(__name__)
ROOT_URL = os.environ['TASKCLUSTER_ROOT_URL']
QUEUE_PREFIX = ("https://queue.taskcluster.net/"
if ROOT_URL == 'https://taskcluster.net'
else ROOT_URL + '/api/queue/')
QUEUE_PREFIX = 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/",

Просмотреть файл

@ -46,7 +46,7 @@ up to date.
==Example Taskcluster Task==
https://tools.taskcluster.net/tasks/create
https://firefox-ci-tc.services.mozilla.com/tasks/create/
```yaml
provisionerId: aws-provisioner-v1
@ -84,7 +84,7 @@ metadata:
name: Periodic updates testing
description: Produce diffs for HSTS and HPKP in-tree files.
owner: sfraser@mozilla.com
source: 'https://tools.taskcluster.net/task-creator/'
source: 'https://firefox-ci-tc.services.mozilla.com/tasks/create'
tags: {}
extra:
treeherder:

Просмотреть файл

@ -57,11 +57,7 @@ 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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
# Get Arcanist API token

Просмотреть файл

@ -95,13 +95,8 @@ REMOTE_SETTINGS_DIFF_ARTIFACT="${ARTIFACTS_DIR}/${REMOTE_SETTINGS_DIFF_ARTIFACT:
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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
index_base="$TASKCLUSTER_ROOT_URL/api/index/v1"
# Get the current in-tree version for a code branch.
function get_version {

Просмотреть файл

@ -20,11 +20,7 @@ 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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
# Get Arcanist API token

Просмотреть файл

@ -266,6 +266,6 @@ More Information
For further details on actions in general, see `the actions.json spec`_.
The hooks used for in-tree actions are set up by `ci-admin`_ based on configuration in `ci-configuration`_.
.. _the actions.json spec: https://docs.taskcluster.net/manual/tasks/actions/spec
.. _the actions.json spec: https://firefox-ci-tc.services.mozilla.com/docs/manual/tasks/actions/spec
.. _ci-admin: http://hg.mozilla.org/ci/ci-admin/
.. _ci-configuration: http://hg.mozilla.org/ci/ci-configuration/

Просмотреть файл

@ -17,9 +17,9 @@ meaning of this file.
How It Works
------------
The `TaskCluster Hooks Service <https://tools.taskcluster.net/hooks>`_ has a
hook configured for each repository supporting periodic task graphs. The hook
runs every 15 minutes, and the resulting task is referred to as a "cron task".
The `TaskCluster Hooks Service <https://firefox-ci-tc.services.mozilla.com/hooks>`_
has a hook configured for each repository supporting periodic task graphs. The
hook runs every 15 minutes, and the resulting task is referred to as a "cron task".
That cron task runs `./mach taskgraph cron` in a checkout of the Gecko source
tree.

Просмотреть файл

@ -169,13 +169,13 @@ any other team.
.. _addonscript: https://github.com/mozilla-releng/addonscript/
.. _code signing: https://en.wikipedia.org/wiki/Code_signing
.. _chain of trust: https://scriptworker.readthedocs.io/en/latest/chain_of_trust.html
.. _depsigning: https://tools.taskcluster.net/provisioners/scriptworker-prov-v1/worker-types/depsigning
.. _depsigning: https://firefox-ci-tc.services.mozilla.com/provisioners/scriptworker-k8s/worker-types/gecko-t-signing
.. _should_sign_windows: https://github.com/mozilla-releng/signingscript/blob/65cbb99ea53896fda9f4844e050a9695c762d24f/signingscript/sign.py#L369
.. _Encrypted Media Extensions: https://hacks.mozilla.org/2014/05/reconciling-mozillas-mission-and-w3c-eme/
.. _signing password files: https://github.com/mozilla/build-puppet/tree/feff5e12ab70f2c060b29940464e77208c7f0ef2/modules/signing_scriptworker/templates
.. _signingscript: https://github.com/mozilla-releng/signingscript/
.. _signing-linux-dev: https://tools.taskcluster.net/provisioners/scriptworker-prov-v1/worker-types/signing-linux-dev
.. _signing-linux-v1: https://tools.taskcluster.net/provisioners/scriptworker-prov-v1/worker-types/signing-linux-v1
.. _signing-linux-dev: https://firefox-ci-tc.services.mozilla.com/provisioners/scriptworker-k8s/worker-types/gecko-t-signing-dev
.. _signing-linux-v1: https://firefox-ci-tc.services.mozilla.com/provisioners/scriptworker-k8s/worker-types/gecko-3-signing
.. _signtool: https://github.com/mozilla-releng/signtool
.. _Scriptworker: https://github.com/mozilla-releng/scriptworker/
.. _widevine site: https://www.widevine.com/wv_drm.html

Просмотреть файл

@ -19,11 +19,7 @@ strip dmg/dmg hfs/hfsplus
cp dmg/dmg hfs/hfsplus $STAGE
# 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
queue_base="$TASKCLUSTER_ROOT_URL/api/queue/v1"
cat >$STAGE/README<<EOF
Source is available as a taskcluster artifact:

Просмотреть файл

@ -579,9 +579,6 @@ def command_static_url(args):
def api(root_url, service, version, path):
# taskcluster-lib-urls is not available when this script runs, so
# simulate its behavior:
if root_url == 'https://taskcluster.net':
return 'https://{service}.taskcluster.net/{version}/{path}'.format(
service=service, version=version, path=path)
return '{root_url}/api/{service}/{version}/{path}'.format(
root_url=root_url, service=service, version=version, path=path)

Просмотреть файл

@ -9,7 +9,7 @@ import os
GECKO = os.path.normpath(os.path.realpath(os.path.join(__file__, '..', '..', '..')))
# Maximum number of dependencies a single task can have
# https://docs.taskcluster.net/reference/platform/taskcluster-queue/references/api#createTask
# https://firefox-ci-tc.services.mozilla.com/docs/reference/platform/queue/task-schema
# specifies 100, but we also optionally add the decision task id as a dep in
# taskgraph.create, so let's set this to 99.
MAX_DEPENDENCIES = 99

Просмотреть файл

@ -112,7 +112,7 @@ task_description_schema = Schema({
Optional('extra'): {text_type: object},
# treeherder-related information; see
# https://schemas.taskcluster.net/taskcluster-treeherder/v1/task-treeherder-config.json
# https://firefox-ci-tc.services.mozilla.com/schemas/taskcluster-treeherder/v1/task-treeherder-config.json
# If not specified, no treeherder extra information or routes will be
# added to the task
Optional('treeherder'): {

Просмотреть файл

@ -147,7 +147,7 @@ def verify_routes_notification_filters(task, taskgraph, scratch_pad, graph_confi
This function ensures that only understood filters for notifications are
specified.
See: https://docs.taskcluster.net/reference/core/taskcluster-notify/docs/usage
See: https://firefox-ci-tc.services.mozilla.com/docs/manual/using/task-notifications
"""
if task is None:
return