Skip to content

Commit ee86ebf

Browse files
committed
Doc and logs
1 parent 0fd4db8 commit ee86ebf

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

scripts/release/atomic_pipeline.py

Lines changed: 6 additions & 11 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 Dict, List, Optional, Tuple, Union
12+
from typing import Dict, List, Optional, Tuple
1313

1414
import requests
1515
import semver
@@ -202,7 +202,7 @@ def find_om_in_releases(om_version: str, releases: Dict[str, str]) -> Optional[s
202202

203203

204204
def get_om_releases() -> Dict[str, str]:
205-
"""Returns a dictionary representation of the Json document holdin all the OM
205+
"""Returns a dictionary representation of the Json document holding all the OM
206206
releases.
207207
"""
208208
ops_manager_release_archive = (
@@ -267,8 +267,7 @@ def build_image_generic(
267267
extra_args: dict | None = None,
268268
):
269269
"""
270-
Build one or more platform-specific images, then (optionally)
271-
push a manifest and sign the result.
270+
Build an image then (optionally) sign the result.
272271
"""
273272

274273
registry = build_configuration.base_registry
@@ -378,9 +377,6 @@ def build_agent_pipeline(
378377
):
379378
build_configuration_copy = copy(build_configuration)
380379
build_configuration_copy.version = image_version
381-
print(
382-
f"======== Building agent pipeline for version {image_version}, build configuration version: {build_configuration.version}"
383-
)
384380
args = {
385381
"version": image_version,
386382
"agent_version": agent_version,
@@ -404,7 +400,6 @@ def build_agent_default_case(build_configuration: BuildConfiguration):
404400
"""
405401
Build the agent only for the latest operator for patches and operator releases.
406402
407-
See more information in the function: build_agent_on_agent_bump
408403
"""
409404
release = load_release_file()
410405

@@ -426,12 +421,12 @@ def build_agent_default_case(build_configuration: BuildConfiguration):
426421
if build_configuration.parallel_factor > 0:
427422
max_workers = build_configuration.parallel_factor
428423
with ProcessPoolExecutor(max_workers=max_workers) as executor:
429-
logger.info(f"running with factor of {max_workers}")
430-
print(f"======= Versions to build {agent_versions_to_build} =======")
424+
logger.info(f"Running with factor of {max_workers}")
425+
logger.info(f"======= Agent versions to build {agent_versions_to_build} =======")
431426
for idx, agent_version in enumerate(agent_versions_to_build):
432427
# We don't need to keep create and push the same image on every build.
433428
# It is enough to create and push the non-operator suffixed images only during releases to ecr and quay.
434-
print(f"======= Building Agent {agent_version} ({idx}/{len(agent_versions_to_build)})")
429+
logger.info(f"======= Building Agent {agent_version} ({idx}/{len(agent_versions_to_build)})")
435430
_build_agent_operator(
436431
agent_version,
437432
build_configuration,

scripts/release/build_context.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class BuildScenario(str, Enum):
1111

1212
RELEASE = "release" # Official release triggered by a git tag
1313
PATCH = "patch" # CI build for a patch/pull request
14-
STAGING = "staging" # CI build from a merge to the master
14+
STAGING = "staging" # CI build from a merge to the master branch
1515
DEVELOPMENT = "development" # Local build on a developer machine
1616

1717
@classmethod
@@ -71,6 +71,7 @@ def get_version(self) -> str:
7171
return self.git_tag
7272
if self.patch_id:
7373
return self.patch_id
74+
# Alternatively, we can fail here if no ID is explicitly defined
7475
return "latest"
7576

7677
def get_base_registry(self) -> str:

0 commit comments

Comments
 (0)