Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 10 insertions, 15 deletions

diff --git a/taskcluster/docs/howto/index.rst b/taskcluster/docs/howto/index.rst
index ab1010666b..c3a03ef166 100644
--- a/taskcluster/docs/howto/index.rst
+++ b/taskcluster/docs/howto/index.rst
@@ -35,7 +35,7 @@ Changing Test Characteristics
 .............................
 
 First, find the test description.  This will be in
-``taskcluster/ci/*/tests.yml``, for the appropriate kind (consult
+``taskcluster/kinds/*/tests.yml``, for the appropriate kind (consult
 :ref:`kinds`).  You will find a YAML stanza for each test suite, and each
 stanza defines the test's characteristics.  For example, the ``chunks``
 property gives the number of chunks to run.  This can be specified as a simple
@@ -65,7 +65,7 @@ Adding a Test Suite
 To add a new test suite, you will need to know the proper mozharness invocation
 for that suite, and which kind it fits into (consult :ref:`kinds`).
 
-Add a new stanza to ``taskcluster/ci/<kind>/tests.yml``, copying from the other
+Add a new stanza to ``taskcluster/kinds/<kind>/tests.yml``, copying from the other
 stanzas in that file.  The meanings should be clear, but authoritative
 documentation is in
 ``taskcluster/gecko_taskgraph/transforms/test/__init__.py`` should you need
diff --git a/taskcluster/docs/kinds.rst b/taskcluster/docs/kinds.rst
index b54f95f0fa..76edaaa511 100644
--- a/taskcluster/docs/kinds.rst
+++ b/taskcluster/docs/kinds.rst
@@ -684,7 +684,7 @@ diffoscope
 ----------
 Tasks used to compare pairs of Firefox builds using https://diffoscope.org/.
 As of writing, this is mainly meant to be used in try builds, by editing
-taskcluster/ci/diffoscope/kind.yml for your needs.
+taskcluster/kinds/diffoscope/kind.yml for your needs.
 
 addon
 -----
@@ -703,11 +703,6 @@ webrender
 Tasks used to do testing of WebRender standalone (without gecko). The
 WebRender code lives in gfx/wr and has its own testing infrastructure.
 
-github-sync
-------------
-Tasks used to do synchronize parts of Gecko that have downstream GitHub
-repositories.
-
 instrumented-build
 ------------------
 Tasks that generate builds with PGO instrumentation enabled. This is an
diff --git a/taskcluster/docs/kinds/test.rst b/taskcluster/docs/kinds/test.rst
index 20d3635c5c..b577a4a993 100644
--- a/taskcluster/docs/kinds/test.rst
+++ b/taskcluster/docs/kinds/test.rst
@@ -120,7 +120,7 @@ manifest conditions pending the triage owner / manager to review.
 Please subscribe to alerts from `firefox-ci <https://groups.google.com/a/mozilla.com/g/firefox-ci>`
 group in order to be aware of changes to the CI, scheduling, or the policy.
 
-.. _variants.yml: https://searchfox.org/mozilla-central/source/taskcluster/ci/test/variants.yml
+.. _variants.yml: https://searchfox.org/mozilla-central/source/taskcluster/kinds/test/variants.yml
 .. _json-e: https://json-e.js.org/
 
 
diff --git a/taskcluster/docs/partner-attribution.rst b/taskcluster/docs/partner-attribution.rst
index f83eabb005..c283d4b529 100644
--- a/taskcluster/docs/partner-attribution.rst
+++ b/taskcluster/docs/partner-attribution.rst
@@ -27,7 +27,7 @@ partner repacks.
 logic. It's usually looked up during the release promotion action task, using the Github
 GraphQL API in the `get_partner_config_by_url()
 <python/taskgraph.util.html#taskgraph.util.partners.get_partner_config_by_url>`_ function, with the
-url defined in `taskcluster/ci/config.yml <https://searchfox.org/mozilla-central/search?q=partner-urls&path=taskcluster%2Fci%2Fconfig.yml&case=true&regexp=false&redirect=true>`_.
+url defined in `taskcluster/config.yml <https://searchfox.org/mozilla-central/search?q=partner-urls&path=taskcluster%2Fconfig.yml&case=true&regexp=false&redirect=true>`_.
 
 ``release_partner_build_number`` is an integer used to create unique upload paths in the firefox
 candidates directory, while ``release_partners`` is a list of partners that should be
diff --git a/taskcluster/docs/partner-repacks.rst b/taskcluster/docs/partner-repacks.rst
index 3ae352e06d..6aa3db7da7 100644
--- a/taskcluster/docs/partner-repacks.rst
+++ b/taskcluster/docs/partner-repacks.rst
@@ -40,7 +40,7 @@ release. They're both true for Firefox betas >= b8 and releases, but otherwise d
 logic. It's usually looked up during the release promotion action task, using the Github
 GraphQL API in the `get_partner_config_by_url()
 <python/taskgraph.util.html#taskgraph.util.partners.get_partner_config_by_url>`_ function, with the
-url defined in `taskcluster/ci/config.yml <https://searchfox
+url defined in `taskcluster/config.yml <https://searchfox
 .org/mozilla-release/search?q=regexp%3A^partner+path%3Aconfig.yml&redirect=true>`_.
 
 ``release_partner_build_number`` is an integer used to create unique upload paths in the firefox
diff --git a/taskcluster/docs/taskgraph.rst b/taskcluster/docs/taskgraph.rst
index 5b3ac83643..dbb74f3499 100644
--- a/taskcluster/docs/taskgraph.rst
+++ b/taskcluster/docs/taskgraph.rst
@@ -32,7 +32,7 @@ Kinds
 Generation starts with "kinds". These are yaml files that denote groupings of
 tasks that are loosely related to one another. For example, in Gecko there are
 ``build`` and ``test`` kinds. Each kind has its own directory under
-`taskcluster/ci`_ which contains a ``kind.yml`` file.
+`taskcluster/kinds`_ which contains a ``kind.yml`` file.
 
 For more information on kinds, see Taskgraph's `kind documentation`_. For a
 list of available kinds in ``mozilla-central``, see the :doc:`kinds reference
@@ -114,7 +114,7 @@ Graph Configuration
 
 There are several configuration settings that are pertain to the entire
 taskgraph. These are specified in :file:`config.yml` at the root of the
-taskgraph configuration (typically :file:`taskcluster/ci/`). The available
+taskgraph configuration (typically :file:`taskcluster`). The available
 settings are documented inline in `taskcluster/gecko_taskgraph/config.py
 <https://searchfox.org/mozilla-central/source/taskcluster/gecko_taskgraph/config.py>`_.
 
@@ -131,7 +131,7 @@ For more information, see Taskgraph's `actions documentation`_.
 
 .. _graph generation documentation: https://taskcluster-taskgraph.readthedocs.io/en/latest/concepts/task-graphs.html
 .. _this guide: https://taskcluster-taskgraph.readthedocs.io/en/latest/howto/run-locally.html
-.. _taskcluster/ci: https://searchfox.org/mozilla-central/source/taskcluster/ci
+.. _taskcluster/kinds: https://searchfox.org/mozilla-central/source/taskcluster/kinds
 .. _kind documentation: https://taskcluster-taskgraph.readthedocs.io/en/latest/concepts/kind.html
 .. _loader documentation: https://taskcluster-taskgraph.readthedocs.io/en/latest/concepts/loading.html
 .. _transforms documentation: https://taskcluster-taskgraph.readthedocs.io/en/latest/concepts/transforms.html
diff --git a/taskcluster/docs/versioncontrol.rst b/taskcluster/docs/versioncontrol.rst
index 835f8915cf..c187ea7f64 100644
--- a/taskcluster/docs/versioncontrol.rst
+++ b/taskcluster/docs/versioncontrol.rst
@@ -35,7 +35,7 @@ The locations are as follows:
 Debian Packages for Debian and Ubuntu Based Docker Images
 ---------------------------------------------------------
 
-``taskcluster/ci/packages/debian.yml`` and ``taskcluster/ci/packages/ubuntu.yml``
+``taskcluster/kinds/packages/debian.yml`` and ``taskcluster/kinds/packages/ubuntu.yml``
 define custom Debian packages for Mercurial. These are installed in various
 Docker images.