From 886a6fa87a6682a5f6ba485df5cab678fd4f665d Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Wed, 24 Aug 2022 09:45:32 +0200 Subject: [PATCH] chore: Bump taskgraph to v3.0.0 --- .taskcluster.yml | 8 +++--- .../fenix_taskgraph/transforms/browsertime.py | 2 +- .../transforms/release_deps.py | 2 +- taskcluster/requirements.txt | 26 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.taskcluster.yml b/.taskcluster.yml index 7901839e9..ec29dc076 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -206,7 +206,7 @@ tasks: chainOfTrust: true # Note: This task is built server side without the context or tooling that # exist in tree so we must hard code the hash - image: mozillareleases/taskgraph:decision-mobile-7e11b0cc3966ad9729e08b19551399b3343d3b385eac067b6335d4c34431a899@sha256:b309fa59efd59991ba286a326cb43b724c38e6f3872c52d0f85e96428899c2fc + image: mozillareleases/taskgraph:decision-mobile-625975b642c148be4c6f1d8ee5cedf7399f5d0dd33d275ff69d5934e3082d4a9@sha256:bfb26700182486e1c6c52701baea6f386fa39e5e25417423c27845933605ad43 maxRunTime: 1800 @@ -218,7 +218,7 @@ tasks: - bash - -cx - $let: - extraArgs: + extraArgs: $if: 'tasks_for == "cron"' then: '${cron.quoted_args}' else: '' @@ -250,7 +250,7 @@ tasks: 'public': type: 'directory' path: '/builds/worker/artifacts' - expires: + expires: $fromNow: '1 year' 'public/docker-contexts': type: 'directory' @@ -259,7 +259,7 @@ tasks: # decision task + the docker-image task deadlines. # It is set to a week to allow for some time for # debugging, but they are not useful long-term. - expires: + expires: $fromNow: '7 day' extra: diff --git a/taskcluster/fenix_taskgraph/transforms/browsertime.py b/taskcluster/fenix_taskgraph/transforms/browsertime.py index 0fdb2545e..12ab7a425 100644 --- a/taskcluster/fenix_taskgraph/transforms/browsertime.py +++ b/taskcluster/fenix_taskgraph/transforms/browsertime.py @@ -46,7 +46,7 @@ def add_variants(config, tasks): tests = list(tasks) - for dep_task in config.kind_dependencies_tasks: + for dep_task in config.kind_dependencies_tasks.values(): build_type = dep_task.attributes.get("build-type", "") if build_type not in only_types: continue diff --git a/taskcluster/fenix_taskgraph/transforms/release_deps.py b/taskcluster/fenix_taskgraph/transforms/release_deps.py index 3c218ed26..58f74b8ff 100644 --- a/taskcluster/fenix_taskgraph/transforms/release_deps.py +++ b/taskcluster/fenix_taskgraph/transforms/release_deps.py @@ -22,7 +22,7 @@ def add_dependencies(config, tasks): if release_type is None: continue - for dep_task in config.kind_dependencies_tasks: + for dep_task in config.kind_dependencies_tasks.values(): # Weed out unwanted tasks. # XXX we have run-on-projects which specifies the on-push behavior; # we need another attribute that specifies release promotion, diff --git a/taskcluster/requirements.txt b/taskcluster/requirements.txt index e5ddb2361..52b88e0b6 100644 --- a/taskcluster/requirements.txt +++ b/taskcluster/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.6 +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile --generate-hashes --output-file=requirements.txt requirements.in @@ -18,9 +18,9 @@ certifi==2022.6.15 \ --hash=sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d \ --hash=sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412 # via requests -charset-normalizer==2.0.12 \ - --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ - --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df +charset-normalizer==2.1.1 \ + --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \ + --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f # via requests future==0.18.2 \ --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d @@ -77,9 +77,9 @@ redo==2.0.4 \ # via # -r requirements.in # taskcluster-taskgraph -requests==2.27.1 \ - --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ - --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d +requests==2.28.1 \ + --hash=sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 \ + --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349 # via # requests-unixsocket # taskcluster-taskgraph @@ -91,18 +91,18 @@ slugid==2.0.0 \ --hash=sha256:a950d98b72691178bdd4d6c52743c4a2aa039207cf7a97d71060a111ff9ba297 \ --hash=sha256:aec8b0e01c4ad32e38e12d609eab3ec912fd129aaf6b2ded0199b56a5f8fd67c # via taskcluster-taskgraph -taskcluster-taskgraph==2.0.0 \ - --hash=sha256:3d22ab488071ddc82997b33fc6c1c524a44bdc7e14b30a274d99dbbdd7389502 \ - --hash=sha256:93eff40ba39a29cd290fc25a2124ed9bf5806d87891edd7e8de35df568708141 +taskcluster-taskgraph==3.0.0 \ + --hash=sha256:566e46ba9beeb42e6884f7594ceb5b512b82bb93097ae4abc395e4d513dbe556 \ + --hash=sha256:fba61e84ba3624056dd84c79d9c1796d4f50d1d25715f3217681c737f7ed3f03 # via -r requirements.in taskcluster-urls==13.0.1 \ --hash=sha256:5e25e7e6818e8877178b175ff43d2e6548afad72694aa125f404a7329ece0973 \ --hash=sha256:b25e122ecec249c4299ac7b20b08db76e3e2025bdaeb699a9d444556de5fd367 \ --hash=sha256:f66dcbd6572a6216ab65949f0fa0b91f2df647918028436c384e6af5cd12ae2b # via taskcluster-taskgraph -urllib3==1.26.11 \ - --hash=sha256:c33ccba33c819596124764c23a97d25f32b28433ba0dedeb77d873a38722c9bc \ - --hash=sha256:ea6e8fb210b19d950fab93b60c9009226c63a28808bc8386e05301e25883ac0a +urllib3==1.26.12 \ + --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ + --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 # via requests voluptuous==0.13.1 \ --hash=sha256:4b838b185f5951f2d6e8752b68fcf18bd7a9c26ded8f143f92d6d28f3921a3e6 \