starlingx/update
Code Issues Proposed changes

Update restart script name

Browse Source 
Adds the patch_id as prefix for the restart script name

Story: 2009969
Task: 45573
Signed-off-by: Luis Sampaio <luis.sampaio@windriver.com>
Change-Id: I1ab1a67c078a24089819f803d2d23eb99f6a94f8
This commit is contained in:
Luis Sampaio 2022-07-07 13:52:31 -07:00
parent bf1451ff01
commit 679f4fe09a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sw-patch/cgcs-patch/cgcs_make_patch/make_patch.py
View File

@ -126,6 +126,10 @@ class PatchRecipeData(object):
if "ID" in self.metadata: if "ID" in self.metadata:
self.patch_id = self.metadata["ID"] self.patch_id = self.metadata["ID"]
# Update restart script name - prefix with patch_id
if self.restart_script:
self.restart_script["metadata_name"] = self.patch_id + "_" \
+ self.restart_script["name"]
else: else:
msg = "patch is missing required field <PATCH_RECIPE><METADATA><ID>" msg = "patch is missing required field <PATCH_RECIPE><METADATA><ID>"
log.exception(msg) log.exception(msg)
@ -248,7 +252,11 @@ class PatchBuilder(object):
self.__add_text_tag_to_xml(top, "apply_active_release_only", self.patch_data.metadata["APPLY_ACTIVE_RELEASE_ONLY"]) self.__add_text_tag_to_xml(top, "apply_active_release_only", self.patch_data.metadata["APPLY_ACTIVE_RELEASE_ONLY"])
if self.patch_data.restart_script: if self.patch_data.restart_script:
self.__add_text_tag_to_xml(top, "restart_script", self.patch_data.restart_script["name"]) self.__add_text_tag_to_xml(
top,
"restart_script",
self.patch_data.restart_script["metadata_name"]
)
# Parse ostree_content # Parse ostree_content
content = ET.SubElement(top, "contents") content = ET.SubElement(top, "contents")
@ -424,7 +432,10 @@ class PatchBuilder(object):
if self.patch_data.restart_script: if self.patch_data.restart_script:
log.info("Saving restart scripts") log.info("Saving restart scripts")
shutil.copyfile(self.patch_data.restart_script["full_path"], self.patch_data.restart_script["name"]) shutil.copyfile(
self.patch_data.restart_script["full_path"],
self.patch_data.restart_script["metadata_name"]
)
filelist = ["metadata.tar", "software.tar"] filelist = ["metadata.tar", "software.tar"]
# Generate the local signature file # Generate the local signature file
@ -455,8 +466,9 @@ class PatchBuilder(object):
tar.add(file) tar.add(file)
tar.add("signature") tar.add("signature")
tar.add(self.detached_signature_file) tar.add(self.detached_signature_file)
if self.patch_data.restart_script and os.path.isfile(self.patch_data.restart_script["name"]): if self.patch_data.restart_script and \
tar.add(self.patch_data.restart_script["name"]) os.path.isfile(self.patch_data.restart_script["metadata_name"]):
tar.add(self.patch_data.restart_script["metadata_name"])
tar.close() tar.close()
os.chdir(self.deploy_dir) os.chdir(self.deploy_dir)