starlingx/root
Code Issues Proposed changes

Fix metadata tag and location

Browse Source 
During the creation of prepatched iso the updated metadata was copied
only to upgrade folder, this commit fix it by copying to patches as
well. It also fix a tag location to be on root level.

Test Plan:
PASS: Build prepatched image.
PASS: Check SHA is the same between patches/upgrade metadata.xml.
PASS: Check prepatched_iso tag is on root level.

Story: 2010676
Task: 50936

Change-Id: I3b7c1f614877c48497d23bbcddc4ea4bb23b3352
Signed-off-by: Luis Eduardo Bonatti <LuizEduardo.Bonatti@windriver.com>
This commit is contained in:
Luis Eduardo Bonatti 2024-08-29 12:07:22 -03:00
parent a1a167bb71
commit e25d6ed7dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-tools/create-prepatched-iso
View File

@ -226,7 +226,7 @@ def add_tag_xml(parent, name, text):
tag = ET.SubElement(parent, name) tag = ET.SubElement(parent, name)
tag.text = text tag.text = text
def add_ostree_info(metadata, iso_path): def update_metadata_info(metadata, iso_path):
"""Adds ostree repository info to a metadata file """Adds ostree repository info to a metadata file
This function get the ostree data from inside the iso and update This function get the ostree data from inside the iso and update
@ -245,15 +245,15 @@ def add_ostree_info(metadata, iso_path):
add_tag_xml(ostree, "number_of_commits", "1") add_tag_xml(ostree, "number_of_commits", "1")
# Update prepatched iso field
add_tag_xml(root, "prepatched_iso", "Y")
base_element = ET.SubElement(ostree, "base") base_element = ET.SubElement(ostree, "base")
# For now we add empty values here as the software # For now we add empty values here as the software
# expect this fields to be in the XML # expect this fields to be in the XML
add_tag_xml(base_element, "commit", "") add_tag_xml(base_element, "commit", "")
add_tag_xml(base_element, "checksum", "") add_tag_xml(base_element, "checksum", "")
# Add Y to prepatched-iso tag
add_tag_xml(base_element, "prepatched_iso", "Y")
# Get ostree commit # Get ostree commit
try: try:
cmd = f"ostree --repo={iso_path}/ostree_repo rev-parse starlingx" cmd = f"ostree --repo={iso_path}/ostree_repo rev-parse starlingx"
@ -449,9 +449,9 @@ def main():
# Copy only the patch metadata with the biggest patch version to ISO # Copy only the patch metadata with the biggest patch version to ISO
patch_num = int(patch["sw_version"].split(".")[-1]) patch_num = int(patch["sw_version"].split(".")[-1])
if latest_patch_number == patch_num: if latest_patch_number == patch_num:
shutil.copy(patch["metadata"], f"{iso_folder}/patches")
# Metadata inside upgrades requires ostree information # Metadata inside upgrades requires ostree information
add_ostree_info(patch["metadata"], iso_folder) update_metadata_info(patch["metadata"], iso_folder)
shutil.copy(patch["metadata"], f"{iso_folder}/patches")
shutil.copy(patch["metadata"], f"{iso_folder}/upgrades") shutil.copy(patch["metadata"], f"{iso_folder}/upgrades")
# Update ostree summary # Update ostree summary