diff --git a/.taskcluster.yml b/.taskcluster.yml index 182fd5f88..2f665bb3a 100644 --- a/.taskcluster.yml +++ b/.taskcluster.yml @@ -213,7 +213,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-v21.0.0@sha256:79091767b31dff55b1d4e89851afe77f387139c4699e008245b14fa08b51c0ff + image: mozillareleases/taskgraph:decision-v23.0.0@sha256:3654f72ea7df1e0b9cb1c2a30dd9f4365138e3e86c4fc4948dc463c69f134aee maxRunTime: 1800 command: diff --git a/taskcluster/scriptworker_taskgraph/parameters.py b/taskcluster/scriptworker_taskgraph/parameters.py index d5ab6c731..29cf5ed1e 100644 --- a/taskcluster/scriptworker_taskgraph/parameters.py +++ b/taskcluster/scriptworker_taskgraph/parameters.py @@ -3,8 +3,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. +from typing import Literal, Optional + from taskgraph.parameters import extend_parameters_schema -from voluptuous import Any, Optional +from taskgraph.util.schema import Schema PROJECT_SPECIFIC_PREFIXES = { "refs/heads/dev-": "dev", @@ -23,14 +25,17 @@ def get_defaults(_): } -scriptworker_schema = { - Optional("docker_tag"): Any(str, None), - Optional("script_name"): Any(str, None), - Optional("script_revision"): Any(str, None), - Optional("shipping_phase"): Any("build", "promote", None), -} +ScriptworkerSchema = Schema.from_dict( + { + "docker_tag": Optional[str], + "script_name": Optional[str], + "script_revision": Optional[str], + "shipping_phase": Optional[Literal["build", "promote"]], + }, + name="ScriptworkerSchema", +) -extend_parameters_schema(scriptworker_schema, defaults_fn=get_defaults) +extend_parameters_schema(ScriptworkerSchema, defaults_fn=get_defaults) def get_decision_parameters(graph_config, parameters):