starlingx/update
Code Issues Proposed changes

Merge "Add deploy delete check"

Browse Source
This commit is contained in:
Zuul
2025-06-06 16:44:50 +00:00
committed by Gerrit Code Review
parent 1fb9100224 29521b4914
commit d38136430b
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
software/software/software_controller.py
View File

@@ -3602,7 +3602,6 @@ class PatchController(PatchService):
LOG.error(msg_error) LOG.error(msg_error)
raise SoftwareServiceError(msg_error) raise SoftwareServiceError(msg_error)
if os.path.isfile(INSTALL_LOCAL_FLAG):
# Remove install local flag if enabled # Remove install local flag if enabled
if os.path.isfile(INSTALL_LOCAL_FLAG): if os.path.isfile(INSTALL_LOCAL_FLAG):
try: try:
@@ -3614,6 +3613,14 @@ class PatchController(PatchService):
LOG.info("Software deployment in local installation mode is stopped") LOG.info("Software deployment in local installation mode is stopped")
if is_major_release: if is_major_release:
if SW_VERSION == major_release:
msg_error = (
f"Deploy {major_release} can't be deleted as it is still the"
"current running software.An error may have occurred during the deploy.")
LOG.error(msg_error)
raise SoftwareServiceError(msg_error)
clean_up_deployment_data(major_release) clean_up_deployment_data(major_release)
# Send message to agents cleanup their ostree environment # Send message to agents cleanup their ostree environment