|
8 | 8 | from concurrent.futures import ProcessPoolExecutor
|
9 | 9 | from copy import copy
|
10 | 10 | from queue import Queue
|
11 |
| -from typing import Dict, Optional, Tuple |
| 11 | +from typing import Dict, List, Optional, Tuple |
12 | 12 |
|
13 | 13 | import requests
|
14 | 14 | from opentelemetry import trace
|
@@ -123,11 +123,9 @@ def generate_agent_build_args(platforms: List[str], agent_version: str, tools_ve
|
123 | 123 | mapping = agent_info["platform_mappings"][platform]
|
124 | 124 | build_arg_names = get_build_arg_names(platform)
|
125 | 125 |
|
126 |
| - # Generate agent build arg |
127 | 126 | agent_filename = f"{agent_info['base_names']['agent']}-{agent_version}.{mapping['agent_suffix']}"
|
128 | 127 | build_args[build_arg_names["agent_build_arg"]] = agent_filename
|
129 | 128 |
|
130 |
| - # Generate tools build arg |
131 | 129 | tools_suffix = mapping["tools_suffix"].replace("{TOOLS_VERSION}", tools_version)
|
132 | 130 | tools_filename = f"{agent_info['base_names']['tools']}-{tools_suffix}"
|
133 | 131 | build_args[build_arg_names["tools_build_arg"]] = tools_filename
|
@@ -499,14 +497,6 @@ def queue_exception_handling(tasks_queue):
|
499 | 497 | )
|
500 | 498 |
|
501 | 499 |
|
502 |
| -def get_tools_distro(tools_version: str) -> Dict[str, str]: |
503 |
| - new_rhel_tool_version = "100.10.0" |
504 |
| - default_distro = {"arm": "rhel90-aarch64", "amd": "rhel90-x86_64"} |
505 |
| - if Version(tools_version) >= Version(new_rhel_tool_version): |
506 |
| - return {"arm": "rhel93-aarch64", "amd": "rhel93-x86_64"} |
507 |
| - return default_distro |
508 |
| - |
509 |
| - |
510 | 500 | def load_release_file() -> Dict:
|
511 | 501 | with open("release.json") as release:
|
512 | 502 | return json.load(release)
|
0 commit comments