starlingx
/
update
Code Issues Proposed changes

Remove invalid checks from deploy precheck 

The deploy-precheck script is now stored in a versioned
directory under /opt/software/rel-<ver>, so there is no
need to check if the feed directory exists.

This commit removes deprecated variables and checks that are
not needed as result of the versioning of the release scripts
directory.

Test Plan
PASS: run "software deploy precheck" successfully

Story: 2010676
Task: 49633

Change-Id: I42b00143234f4aa5a3c871bbd6900f3bfce43c8d
Signed-off-by: Heitor Matsui <heitorvieira.matsui@windriver.com>
This commit is contained in:
Heitor Matsui 2024-02-27 11:45:45 -03:00
parent 9f7bddff25
commit 4788433459
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
software/software/software_controller.py
View File

@ -2120,17 +2120,13 @@ class PatchController(PatchService):
msg_warning = ""
msg_error = ""
rel_ver = utils.get_major_release_version(release_version)
rel_path = "rel-%s" % release_version
deployment_dir = os.path.join(constants.FEED_OSTREE_BASE_DIR, rel_path)
precheck_script = utils.get_precheck_script(release_version)
if not os.path.isdir(deployment_dir) or not os.path.isfile(precheck_script):
if not os.path.isfile(precheck_script):
msg = "Upgrade files for deployment %s are not present on the system, " \
"cannot proceed with the precheck." % rel_ver
"cannot proceed with the precheck." % release_version
LOG.error(msg)
msg_error = "Fail to perform deploy precheck. " \
"Uploaded release may have been damaged." \
"Uploaded release may have been damaged. " \
"Try delete and re-upload the release.\n"
return dict(info=msg_info, warning=msg_warning, error=msg_error)