Skip to content

Commit 7c9967a

Browse files
committed
Cleanup unused stuff
1 parent 4d4e4e9 commit 7c9967a

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

scripts/release/atomic_pipeline.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from concurrent.futures import ProcessPoolExecutor
1010
from copy import copy
1111
from queue import Queue
12-
from typing import Callable, Dict, List, Optional, Tuple, Union
12+
from typing import Dict, List, Optional, Tuple, Union
1313

1414
import requests
1515
import semver
@@ -35,14 +35,8 @@
3535
DEFAULT_NAMESPACE = "default"
3636

3737

38-
def make_list_of_str(value: Union[None, str, List[str]]) -> List[str]:
39-
if value is None:
40-
return []
4138

42-
if isinstance(value, str):
43-
return [e.strip() for e in value.split(",")]
4439

45-
return value
4640

4741

4842
def get_tools_distro(tools_version: str) -> Dict[str, str]:
@@ -57,11 +51,6 @@ def is_running_in_evg_pipeline():
5751
return os.getenv("RUNNING_IN_EVG", "") == "true"
5852

5953

60-
def is_running_in_patch():
61-
is_patch = os.environ.get("is_patch")
62-
return is_patch is not None and is_patch.lower() == "true"
63-
64-
6554
def load_release_file() -> Dict:
6655
with open("release.json") as release:
6756
return json.load(release)
@@ -207,7 +196,6 @@ def build_operator_image(build_configuration: BuildConfiguration):
207196
"version": build_configuration.version,
208197
"log_automation_config_diff": log_automation_config_diff,
209198
"test_suffix": test_suffix,
210-
"debug": build_configuration.debug,
211199
}
212200

213201
logger.info(f"Building Operator args: {args}")
@@ -230,7 +218,6 @@ def build_database_image(build_configuration: BuildConfiguration):
230218
"""
231219
Builds a new database image.
232220
"""
233-
release = load_release_file()
234221
args = {"version": build_configuration.version}
235222
build_image_generic(
236223
image_name="mongodb-kubernetes-database",
@@ -262,14 +249,6 @@ def build_CLI_SBOM(build_configuration: BuildConfiguration):
262249
generate_sbom_for_cli(version, platform)
263250

264251

265-
def should_skip_arm64():
266-
"""
267-
Determines if arm64 builds should be skipped based on environment.
268-
Returns True if running in Evergreen pipeline as a patch.
269-
"""
270-
return is_running_in_evg_pipeline() and is_running_in_patch()
271-
272-
273252
@TRACER.start_as_current_span("sign_image_in_repositories")
274253
def sign_image_in_repositories(args: Dict[str, str], arch: str = None):
275254
span = trace.get_current_span()

scripts/release/main.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import argparse
22
import os
33
import sys
4-
import time
5-
from typing import Callable, Dict, Iterable, List, Optional
4+
from typing import Callable, Dict
65

76
from opentelemetry import context, trace
87
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
@@ -17,7 +16,6 @@
1716
from opentelemetry.trace import NonRecordingSpan, SpanContext, TraceFlags
1817

1918
from lib.base_logger import logger
20-
from scripts.evergreen.release.images_signing import mongodb_artifactory_login
2119
from scripts.release.atomic_pipeline import (
2220
build_agent_default_case,
2321
build_CLI_SBOM,

0 commit comments

Comments
 (0)