From c0e80d2024a4ec31f02a5940c0d4792ba2594a87 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Fri, 8 Dec 2023 09:31:11 -0500 Subject: [PATCH] ci: upgrade to Taskgraph 7.0.0 --- .taskcluster.yml | 2 +- .../taskcluster/ci/codecov/kind.yml | 2 +- .../taskcluster/ci/fetch/kind.yml | 2 +- .../taskcluster/ci/test/kind.yml | 2 +- taskcluster/{ci => }/config.yml | 0 taskcluster/{ci => kinds}/codecov/kind.yml | 2 +- taskcluster/{ci => kinds}/docker-image/kind.yml | 0 taskcluster/{ci => kinds}/fetch/kind.yml | 2 +- taskcluster/{ci => kinds}/test/kind.yml | 2 +- taskcluster/requirements.in | 2 +- taskcluster/requirements.txt | 15 +++++---------- 11 files changed, 13 insertions(+), 18 deletions(-) rename taskcluster/{ci => }/config.yml (100%) rename taskcluster/{ci => kinds}/codecov/kind.yml (96%) rename taskcluster/{ci => kinds}/docker-image/kind.yml (100%) rename taskcluster/{ci => kinds}/fetch/kind.yml (94%) rename taskcluster/{ci => kinds}/test/kind.yml (96%) diff --git a/.taskcluster.yml b/.taskcluster.yml index 53b7902..59ba6fc 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -212,7 +212,7 @@ tasks: features: taskclusterProxy: true - image: mozillareleases/taskgraph:decision-f19bfa3ae9dbc19190149445bfc38ad966b713336e44342c7643b3f7f1e0b023@sha256:ddcc7348db272885e8ea32825f698bfafa4727401099531cd8239d3d458b39aa + image: mozillareleases/taskgraph:decision-c4ac262880970ca484105929e02dd12f00214d5f2603ab6ce4c0d17de5cd0280@sha256:2dd667994aa13fccdcdcede85c570a5eb4a5247e42875a9e95a135ef774ee469 maxRunTime: 1800 command: diff --git a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/codecov/kind.yml b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/codecov/kind.yml index 944754b..295ad1e 100644 --- a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/codecov/kind.yml +++ b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/codecov/kind.yml @@ -5,7 +5,7 @@ loader: taskgraph.loader.transform:loader transforms: - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms kind-dependencies: diff --git a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/fetch/kind.yml b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/fetch/kind.yml index 1e9e395..78ec597 100644 --- a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/fetch/kind.yml +++ b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/fetch/kind.yml @@ -6,7 +6,7 @@ loader: taskgraph.loader.transform:loader transforms: - taskgraph.transforms.fetch:transforms - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms tasks: diff --git a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/test/kind.yml b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/test/kind.yml index 2e2ed1c..1de30c6 100644 --- a/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/test/kind.yml +++ b/reps/templates/python/{{cookiecutter.__project_slug}}/taskcluster/ci/test/kind.yml @@ -2,7 +2,7 @@ loader: taskgraph.loader.transform:loader transforms: - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms task-defaults: diff --git a/taskcluster/ci/config.yml b/taskcluster/config.yml similarity index 100% rename from taskcluster/ci/config.yml rename to taskcluster/config.yml diff --git a/taskcluster/ci/codecov/kind.yml b/taskcluster/kinds/codecov/kind.yml similarity index 96% rename from taskcluster/ci/codecov/kind.yml rename to taskcluster/kinds/codecov/kind.yml index 27454be..6023d4b 100644 --- a/taskcluster/ci/codecov/kind.yml +++ b/taskcluster/kinds/codecov/kind.yml @@ -5,7 +5,7 @@ loader: taskgraph.loader.transform:loader transforms: - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms kind-dependencies: diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml similarity index 100% rename from taskcluster/ci/docker-image/kind.yml rename to taskcluster/kinds/docker-image/kind.yml diff --git a/taskcluster/ci/fetch/kind.yml b/taskcluster/kinds/fetch/kind.yml similarity index 94% rename from taskcluster/ci/fetch/kind.yml rename to taskcluster/kinds/fetch/kind.yml index 1e9e395..78ec597 100644 --- a/taskcluster/ci/fetch/kind.yml +++ b/taskcluster/kinds/fetch/kind.yml @@ -6,7 +6,7 @@ loader: taskgraph.loader.transform:loader transforms: - taskgraph.transforms.fetch:transforms - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms tasks: diff --git a/taskcluster/ci/test/kind.yml b/taskcluster/kinds/test/kind.yml similarity index 96% rename from taskcluster/ci/test/kind.yml rename to taskcluster/kinds/test/kind.yml index 2e2ed1c..1de30c6 100644 --- a/taskcluster/ci/test/kind.yml +++ b/taskcluster/kinds/test/kind.yml @@ -2,7 +2,7 @@ loader: taskgraph.loader.transform:loader transforms: - - taskgraph.transforms.job:transforms + - taskgraph.transforms.run:transforms - taskgraph.transforms.task:transforms task-defaults: diff --git a/taskcluster/requirements.in b/taskcluster/requirements.in index 18b93f7..95c2f02 100644 --- a/taskcluster/requirements.in +++ b/taskcluster/requirements.in @@ -1 +1 @@ -taskcluster-taskgraph +taskcluster-taskgraph>=7 diff --git a/taskcluster/requirements.txt b/taskcluster/requirements.txt index b78bd9e..a6eacee 100644 --- a/taskcluster/requirements.txt +++ b/taskcluster/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --generate-hashes # appdirs==1.4.4 \ --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \ @@ -242,12 +242,7 @@ requests==2.31.0 \ --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via # cookiecutter - # requests-unixsocket # taskcluster-taskgraph -requests-unixsocket==0.3.0 \ - --hash=sha256:28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e \ - --hash=sha256:c685c680f0809e1b2955339b1e5afc3c0022b3066f4f7eb343f43a6065fc0e5d - # via taskcluster-taskgraph six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 @@ -256,9 +251,9 @@ slugid==2.0.0 \ --hash=sha256:a950d98b72691178bdd4d6c52743c4a2aa039207cf7a97d71060a111ff9ba297 \ --hash=sha256:aec8b0e01c4ad32e38e12d609eab3ec912fd129aaf6b2ded0199b56a5f8fd67c # via taskcluster-taskgraph -taskcluster-taskgraph==5.5.0 \ - --hash=sha256:3e916a971261bdf66bca3d7ee598cd4a5e3adcafa8353dab7ddc7d3fdb90f430 \ - --hash=sha256:db200c6c1a37e1a882e8fd749e6de7854e759f4fb350afe90e3ece570003f7ca +taskcluster-taskgraph==7.0.0 \ + --hash=sha256:1553e1ae7709296643701faedafc8fc1e4a9b546f2ed270445ebd025d74101bf \ + --hash=sha256:9fa7fb1ccbf1b2e607117d599de3ea82fff71dbf732124216ac6c16bf19c3127 # via -r requirements.in taskcluster-urls==13.0.1 \ --hash=sha256:5e25e7e6818e8877178b175ff43d2e6548afad72694aa125f404a7329ece0973 \