|  | 
| 13 | 13 | from taskgraph.transforms.base import TransformSequence | 
| 14 | 14 | from taskgraph.util import json | 
| 15 | 15 | from taskgraph.util.docker import create_context_tar, generate_context_hash | 
|  | 16 | +from taskgraph.util.taskcluster import get_artifact_prefix_from_parameters | 
| 16 | 17 | from taskgraph.util.schema import Schema | 
| 17 | 18 | 
 | 
| 18 | 19 | from .task import task_description_schema | 
| @@ -143,6 +144,8 @@ def fill_template(config, tasks): | 
| 143 | 144 |                     f"Missing package job for {config.kind}-{image_name}: {p}" | 
| 144 | 145 |                 ) | 
| 145 | 146 | 
 | 
|  | 147 | +        artifact_prefix = get_artifact_prefix_from_parameters(config.params) | 
|  | 148 | + | 
| 146 | 149 |         if not taskgraph.fast: | 
| 147 | 150 |             context_path = os.path.join("taskcluster", "docker", definition) | 
| 148 | 151 |             topsrcdir = os.path.dirname(config.graph_config.taskcluster_yml) | 
| @@ -199,12 +202,12 @@ def fill_template(config, tasks): | 
| 199 | 202 |                     { | 
| 200 | 203 |                         "type": "file", | 
| 201 | 204 |                         "path": "/workspace/image.tar.zst", | 
| 202 |  | -                        "name": "public/image.tar.zst", | 
|  | 205 | +                        "name": f"{artifact_prefix}/image.tar.zst", | 
| 203 | 206 |                     } | 
| 204 | 207 |                 ], | 
| 205 | 208 |                 "env": { | 
| 206 | 209 |                     "CONTEXT_TASK_ID": {"task-reference": "<decision>"}, | 
| 207 |  | -                    "CONTEXT_PATH": f"public/docker-contexts/{image_name}.tar.gz", | 
|  | 210 | +                    "CONTEXT_PATH": f"{artifact_prefix}/docker-contexts/{image_name}.tar.gz", | 
| 208 | 211 |                     "HASH": context_hash, | 
| 209 | 212 |                     "PROJECT": config.params["project"], | 
| 210 | 213 |                     "IMAGE_NAME": image_name, | 
|  | 
0 commit comments