Skip to content

Commit fa9c7ee

Browse files
committed
Review fixes
1 parent c8b66fe commit fa9c7ee

File tree

3 files changed

+15
-17
lines changed

3 files changed

+15
-17
lines changed

scripts/release/atomic_pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
TRACER = trace.get_tracer("evergreen-agent")
2828

2929

30-
@TRACER.start_as_current_span("build_image_generic")
30+
@TRACER.start_as_current_span("build_image")
3131
def build_image(
3232
dockerfile_path: str,
3333
build_configuration: ImageBuildConfiguration,

scripts/release/build/image_signing.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ def verify_signature(repository: str, tag: str):
230230
# Access the content of the file
231231
kubernetes_operator_public_key = r.text
232232
else:
233-
logger.error(f"Failed to retrieve the public key from {public_key_url}: Status code {r.status_code}")
234-
return
233+
raise Exception(f"Failed to retrieve the public key from {public_key_url}: Status code {r.status_code}")
235234

236235
public_key_var_name = "OPERATOR_PUBLIC_KEY"
237236
additional_args = [
@@ -245,8 +244,7 @@ def verify_signature(repository: str, tag: str):
245244
run_command_with_retries(command, retries=10)
246245
except subprocess.CalledProcessError as e:
247246
# Fail the pipeline if verification fails
248-
logger.error(f"Failed to verify signature for image {image}: {e.stderr}")
249-
raise
247+
raise Exception(f"Failed to verify signature for image {image}")
250248

251249
end_time = time.time()
252250
duration = end_time - start_time

scripts/release/pipeline_main.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,19 @@ def get_builder_function_for_image_name() -> Dict[str, Callable]:
6565
"""Returns a dictionary of image names that can be built."""
6666

6767
image_builders = {
68-
MEKO_TESTS_IMAGE: build_tests_image, # working
69-
OPERATOR_IMAGE: build_operator_image, # working
70-
MCO_TESTS_IMAGE: build_mco_tests_image, # working
71-
READINESS_PROBE_IMAGE: build_readiness_probe_image, # working
72-
UPGRADE_HOOK_IMAGE: build_upgrade_hook_image, # working
73-
DATABASE_IMAGE: build_database_image, # working
74-
AGENT_IMAGE: build_agent_default_case, # working
68+
MEKO_TESTS_IMAGE: build_tests_image,
69+
OPERATOR_IMAGE: build_operator_image,
70+
MCO_TESTS_IMAGE: build_mco_tests_image,
71+
READINESS_PROBE_IMAGE: build_readiness_probe_image,
72+
UPGRADE_HOOK_IMAGE: build_upgrade_hook_image,
73+
DATABASE_IMAGE: build_database_image,
74+
AGENT_IMAGE: build_agent_default_case,
7575
# Init images
76-
INIT_APPDB_IMAGE: build_init_appdb_image, # working
77-
INIT_DATABASE_IMAGE: build_init_database_image, # working
78-
INIT_OPS_MANAGER_IMAGE: build_init_om_image, # working
76+
INIT_APPDB_IMAGE: build_init_appdb_image,
77+
INIT_DATABASE_IMAGE: build_init_database_image,
78+
INIT_OPS_MANAGER_IMAGE: build_init_om_image,
7979
# Ops Manager image
80-
OPS_MANAGER_IMAGE: build_om_image, # working
80+
OPS_MANAGER_IMAGE: build_om_image,
8181
}
8282

8383
return image_builders
@@ -189,7 +189,7 @@ def main():
189189
# Override arguments for build context and configuration
190190
parser.add_argument(
191191
"--platform",
192-
help="Override the platforms instead of resolving from build scenario",
192+
help="Override the platforms instead of resolving from build scenario. Multi-arch builds are comma-separated. Example: linux/amd64,linux/arm64",
193193
)
194194
parser.add_argument(
195195
"--version",

0 commit comments

Comments
 (0)