Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mharding-hpe committed Oct 9, 2024
2 parents 1155c9b + 9943c93 commit 876b11b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.30.2] - 2024-10-09
### Changed
- If an image artifact lacks `boot_parameters`, log this as informational instead of a warning.

## [2.30.1] - 2024-10-09
### Fixed
- Fix bug in sessions controller, attempting >= comparison with enumerated types.
Expand Down
8 changes: 6 additions & 2 deletions src/bos/server/controllers/v2/boot_set/artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from bos.operators.utils.boot_image_metadata.factory import BootImageMetaDataFactory
from bos.operators.utils.clients.s3 import S3Object, ArtifactNotFound

from .defs import LOGGER
from .exceptions import BootSetError, BootSetWarning


Expand Down Expand Up @@ -59,8 +60,11 @@ def validate_boot_artifacts(bs: dict):
obj = S3Object(path, etag)
_ = obj.object_header
except ArtifactNotFound as err:
raise BootSetWarning(
f"{image_metadata.manifest_s3_url.url} doesn't contain a {boot_artifact}") from err
msg = f"{image_metadata.manifest_s3_url.url} doesn't contain a {boot_artifact}"
# Plenty of images lack boot_parameters, and this is not a big deal.
if boot_artifact != "boot_parameters":
raise BootSetWarning(msg) from err
LOGGER.info(msg)
except Exception as err:
raise BootSetWarning(
f"Unable to check {boot_artifact} in {image_metadata.manifest_s3_url.url}. "
Expand Down

0 comments on commit 876b11b

Please sign in to comment.