From 3171a50e9c8b3f801b5bd0b6718390a8a636ebeb Mon Sep 17 00:00:00 2001 From: Luis Sampaio Date: Fri, 28 Oct 2022 10:45:54 -0700 Subject: [PATCH] Fix test patch missing sw_version This commits fixes a bug with the sw_version in the metadata xml for the INSVC patch and also the requires ID in the patch C. Test Plan: Pass: build patches Pass: validate metadata content Story: 2009969 Task: 45635 Signed-off-by: Luis Sampaio Change-Id: I18da57c36dea67444471927fc52fd9096dae4445 --- sw-patch/scripts/build_test_patches.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/sw-patch/scripts/build_test_patches.py b/sw-patch/scripts/build_test_patches.py index dd229423..293190e8 100755 --- a/sw-patch/scripts/build_test_patches.py +++ b/sw-patch/scripts/build_test_patches.py @@ -185,8 +185,13 @@ class TestPatchBuilder(): log.info("Generating RR patch for all nodes") # build image to trigger a new ostree commit self.build_image() + + rr_patch_name = pname + "_RR_ALL_NODES" + insvc_patch_name = pname + "_NRR_INSVC" + rr_requires_patch_name = pname + "_RR_ALL_NODES_REQUIRES" + patch_data = PatchRecipeData() - patch_data.patch_id = pname + "_RR_ALL_NODES" + patch_data.patch_id = rr_patch_name patch_data.sw_version = self.sw_version patch_data.metadata = { "SUMMARY": "RR ALL NODES", @@ -204,7 +209,8 @@ class TestPatchBuilder(): if inservice: patch_data = PatchRecipeData() - patch_data.patch_id = pname + "_NRR_INSVC" + patch_data.patch_id = insvc_patch_name + patch_data.sw_version = self.sw_version patch_data.metadata = { "SUMMARY": "IN SVC PATCH", "DESCRIPTION": "Test In Service patch", @@ -233,7 +239,8 @@ class TestPatchBuilder(): self.build_image() # Update patch ID and set requires patch_data = PatchRecipeData() - patch_data.patch_id = pname + "_RR_ALL_NODES_REQUIRES" + patch_data.patch_id = rr_requires_patch_name + patch_data.sw_version = self.sw_version patch_data.metadata = { "SUMMARY": "RR ALL NODES REQUIRES", "DESCRIPTION": "Test patch with dependency", @@ -243,7 +250,7 @@ class TestPatchBuilder(): "UNREMOVABLE": "N", "REBOOT_REQUIRED": "Y" } - patch_data.requires.append(pname) + patch_data.requires.append(rr_patch_name) # Create a patch log.info("Creating RR Requires patch %s", patch_data.patch_id) patch_builder.create_patch(patch_data, ostree_clone_name, formal)