From 4788433459bec13a9b94a7d4bdfe93325370b460 Mon Sep 17 00:00:00 2001 From: Heitor Matsui Date: Tue, 27 Feb 2024 11:45:45 -0300 Subject: [PATCH] Remove invalid checks from deploy precheck The deploy-precheck script is now stored in a versioned directory under /opt/software/rel-, 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 --- software/software/software_controller.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/software/software/software_controller.py b/software/software/software_controller.py index f6f5aa8f..055dd3da 100644 --- a/software/software/software_controller.py +++ b/software/software/software_controller.py @@ -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)