Merge branch 'maciejk/ar-image-staging' into maciejk/ar-image-release

# Conflicts:
#	scripts/release/build/build_info.py

Author: MaciejKaras

scripts/release/atomic_pipeline.py

@@ -11,7 +11,6 @@
 from queue import Queue
 from typing import Dict, List, Optional, Tuple
 
-import python_on_whales
 import requests
 from opentelemetry import trace
 
@@ -63,7 +62,7 @@ def build_image(
     span = trace.get_current_span()
     span.set_attribute("mck.image_name", image_name)
 
-    registries = build_configuration.get_registries
+    registries = build_configuration.get_registries()
 
     build_args = build_args or {}
 

scripts/release/build/build_info.py

@@ -29,25 +29,24 @@
 class ImageInfo:
     repositories: List[str]
     platforms: list[str]
-    version: str
+    version: str | None
     dockerfile_path: str
-    sign: bool = False
-    latest_tag: bool = False
-    olm_tag: bool = False
+    sign: bool
+    latest_tag: bool
 
 
 @dataclass
 class BinaryInfo:
     s3_store: str
     platforms: list[str]
-    version: str
+    version: str | None
     sign: bool = False
 
 
 @dataclass
 class HelmChartInfo:
     repository: List[str]
-    version: str
+    version: str | None
     sign: bool = False
 
 

scripts/release/tests/build_info_test.py

@@ -439,13 +439,15 @@ def test_load_build_info_manual_release(git_repo: Repo):
                 version=None,  # Version is None for manual_release scenario
                 dockerfile_path="docker/mongodb-agent/Dockerfile.atomic",
                 sign=True,
+                latest_tag=False,
             ),
             "ops-manager": ImageInfo(
                 repositories=["quay.io/mongodb/mongodb-enterprise-ops-manager"],
                 platforms=["linux/amd64"],
                 version=None,  # Version is None for manual_release scenario
                 dockerfile_path="docker/mongodb-enterprise-ops-manager/Dockerfile.atomic",
                 sign=True,
+                latest_tag=False,
             ),
         },
         binaries={},