Bug 1781248 - part 1: Bump taskgraph to version 2.0.0

taskcluster/ci/browsertime/kind.yml

@@ -19,7 +19,7 @@ only-for-abis:
     - armeabi-v7a
     - arm64-v8a
 
-job-defaults:
+task-defaults:
     attributes:
         artifact_prefix: public/test_info
         nightly: true
@@ -100,7 +100,7 @@ job-defaults:
             - linux64-minidump-stackwalk
             - linux64-node-16
 
-jobs:
+tasks:
     tp6m:
         page-load-tests:
             - amazon

taskcluster/ci/build/kind.yml

@@ -13,7 +13,7 @@ kind-dependencies:
     - toolchain
 
 
-job-defaults:
+task-defaults:
     # Builds generate multiple APKs with different ABIs. For each APK described
     # by `gradlew printVariant`, an artifact will be generated. `variant` and
     # the per-apk config from `printVariant` can be used as substitutions in
@@ -44,7 +44,7 @@ job-defaults:
         chain-of-trust: true
 
 
-jobs:
+tasks:
     debug:
         attributes:
             code-review: true

taskcluster/ci/bump/kind.yml

@@ -11,7 +11,7 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     treeherder:
         kind: build
         symbol: bump(a-c)
@@ -40,7 +40,7 @@ job-defaults:
         max-run-time: 7200
         chain-of-trust: true
 
-jobs:
+tasks:
     android-components:
         attributes:
             bump-type: android-components

taskcluster/ci/complete/kind.yml

@@ -14,11 +14,11 @@ transforms:
     - taskgraph.transforms.code_review:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     worker-type: succeed
 
 
-jobs:
+tasks:
     pr:
         description: PR Summary Task
         run-on-tasks-for: [github-pull-request]

taskcluster/ci/docker-image/kind.yml

@@ -10,7 +10,7 @@ transforms:
     - taskgraph.transforms.cached_tasks:transforms
     - taskgraph.transforms.task:transforms
 
-jobs:
+tasks:
     android-build:
         symbol: I(agb)
         parent: base

taskcluster/ci/fetch/kind.yml

@@ -9,10 +9,10 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     docker-image: {in-tree: base}
 
-jobs:
+tasks:
     android-sdk-3859397:
         description: Android SDK
         fetch:

taskcluster/ci/geckoview/kind.yml

@@ -4,12 +4,12 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     worker-type: always-optimized
     run:
         using: index-search
 
-jobs:
+tasks:
     nightly:
         description: "upstream nightly job"
         run:

taskcluster/ci/lint/kind.yml

@@ -13,7 +13,7 @@ kind-dependencies:
     - toolchain
 
 
-job-defaults:
+task-defaults:
     attributes:
         code-review: true
         retrigger: true
@@ -33,7 +33,7 @@ job-defaults:
         docker-image: {in-tree: base}
         max-run-time: 7200
 
-jobs:
+tasks:
     compare-locales:
         description: 'Validate strings.xml with compare-locales'
         run:

taskcluster/ci/startup-test/kind.yml

@@ -8,8 +8,8 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
-    description: Run a simple UI test to verify Nightly build can start 
+task-defaults:
+    description: Run a simple UI test to verify Nightly build can start
     treeherder:
         kind: test
         platform: 'nightly-start-test/opt'
@@ -35,7 +35,7 @@ job-defaults:
               json: true
     run-on-tasks-for: []
     attributes:
-        build-type: nightly 
+        build-type: nightly
         # cannot safely run this in Firebase
         # turning off til we can safely run test in taskcluster
         # https://github.com/mozilla-mobile/fenix/issues/7702
@@ -44,7 +44,7 @@ job-defaults:
         signing: signing-nightly
         signing-android-test: signing-android-test-nightly
 
-jobs:
+tasks:
     nightly-x86:
         run:
             commands:

taskcluster/ci/test/kind.yml

@@ -13,13 +13,13 @@ kind-dependencies:
     - toolchain
 
 
-job-defaults:
+task-defaults:
     attributes:
         retrigger: true
     description: Test Fenix
     extra:
         notify:
-            slackBlocks: | 
+            slackBlocks: |
                 [
                   {
                     "type": "header",
@@ -37,7 +37,7 @@ job-defaults:
                          "type": "mrkdwn",
                          "text": "*Task*: <https://firefox-ci-tc.services.mozilla.com/tasks/${status.taskId}|Taskcluster>"
                     }
-                  },                  
+                  },
                   {
                     "type": "section",
                     "text": {
@@ -93,7 +93,7 @@ job-defaults:
         docker-image: {in-tree: base}
         max-run-time: 7200
 
-jobs:
+tasks:
     debug:
         attributes:
             build-type: debug

taskcluster/ci/toolchain/android.yml

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
-job-defaults:
+task-defaults:
     run:
         using: toolchain-script
     treeherder:

taskcluster/ci/toolchain/gecko-derived.yml

@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ---
-job-defaults:
+task-defaults:
     run:
         using: index-search
     run-on-projects: []

taskcluster/ci/toolchain/kind.yml

@@ -13,6 +13,6 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 
-jobs-from:
+tasks-from:
     - android.yml
     - gecko-derived.yml

taskcluster/ci/ui-test/kind.yml

@@ -9,7 +9,7 @@ transforms:
     - taskgraph.transforms.job:transforms
     - taskgraph.transforms.task:transforms
 
-job-defaults:
+task-defaults:
     attributes:
         build-type: debug
         code-review: true
@@ -44,7 +44,7 @@ job-defaults:
                          "type": "mrkdwn",
                          "text": "*Task*: <https://firefox-ci-tc.services.mozilla.com/tasks/${status.taskId}|Taskcluster>"
                     }
-                  },                  
+                  },
                   {
                     "type": "section",
                     "text": {
@@ -100,7 +100,7 @@ job-defaults:
         retry-exit-status: [20]
     worker-type: b-android
 
-jobs:
+tasks:
     x86-debug:
         description: Test Fenix
         run-on-tasks-for: [github-pull-request, github-push]

taskcluster/fenix_taskgraph/transforms/mark_as_shipped.py

@@ -28,15 +28,15 @@ def resolve_keys(config, tasks):
 
 
 @transforms.add
-def make_task_description(config, jobs):
-    for job in jobs:
+def make_task_description(config, tasks):
+    for task in tasks:
         product = "Fenix"
         version = config.params["version"] or "{ver}"
-        job["worker"][
+        task["worker"][
             "release-name"
         ] = "{product}-{version}-build{build_number}".format(
             product=product,
             version=version,
             build_number=config.params.get("build_number", 1),
         )
-        yield job
+        yield task

taskcluster/requirements.in

@@ -1,6 +1,6 @@
 # For instructions on managing dependencies, see:
 # https://taskcluster-taskgraph.readthedocs.io/en/latest/howto/bootstrap-taskgraph.html
 
-taskcluster-taskgraph>=1.3.1
+taskcluster-taskgraph
 mozilla-version
 redo

taskcluster/requirements.txt

@@ -8,9 +8,9 @@ appdirs==1.4.4 \
     --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \
     --hash=sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128
     # via taskcluster-taskgraph
-attrs==21.4.0 \
-    --hash=sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4 \
-    --hash=sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd
+attrs==22.1.0 \
+    --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \
+    --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c
     # via
     #   mozilla-version
     #   taskcluster-taskgraph
@@ -91,18 +91,18 @@ slugid==2.0.0 \
     --hash=sha256:a950d98b72691178bdd4d6c52743c4a2aa039207cf7a97d71060a111ff9ba297 \
     --hash=sha256:aec8b0e01c4ad32e38e12d609eab3ec912fd129aaf6b2ded0199b56a5f8fd67c
     # via taskcluster-taskgraph
-taskcluster-taskgraph==1.7.1 \
-    --hash=sha256:736054efee8c56987417d4ad2960cfc99c91338253580eadece072a43e042718 \
-    --hash=sha256:9cb13e19ddf74331c51a9f1dd68afde179f148e7856269e8e5f6182e0a2e5732
+taskcluster-taskgraph==2.0.0 \
+    --hash=sha256:3d22ab488071ddc82997b33fc6c1c524a44bdc7e14b30a274d99dbbdd7389502 \
+    --hash=sha256:93eff40ba39a29cd290fc25a2124ed9bf5806d87891edd7e8de35df568708141
     # via -r requirements.in
 taskcluster-urls==13.0.1 \
     --hash=sha256:5e25e7e6818e8877178b175ff43d2e6548afad72694aa125f404a7329ece0973 \
     --hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \
     --hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b
     # via taskcluster-taskgraph
-urllib3==1.26.9 \
-    --hash=sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 \
-    --hash=sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e
+urllib3==1.26.11 \
+    --hash=sha256:c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc \
+    --hash=sha256:ea6e8fb210b19d950fab93b60c9009226c63a28808bc8386e05301e25883ac0a
     # via requests
 voluptuous==0.13.1 \
     --hash=sha256:4b838b185f5951f2d6e8752b68fcf18bd7a9c26ded8f143f92d6d28f3921a3e6 \