From 1c9b6399243b66378858449abf3743946b6eed1c Mon Sep 17 00:00:00 2001 From: Caohongtao Date: Mon, 29 Apr 2024 02:14:08 +0000 Subject: [PATCH 1/3] update src/cmd-build-validate. Signed-off-by: Caohongtao --- src/cmd-build-validate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd-build-validate b/src/cmd-build-validate index 37e031c9..dfd31c58 100755 --- a/src/cmd-build-validate +++ b/src/cmd-build-validate @@ -47,7 +47,7 @@ def validate_build(builddir): # Otherwise, assume it's a mountable disk image we can fsck validate_image(builddir, img_format, data) if not found: - raise SystemExit("Failed to find image type: {args.image}") + raise SystemExit(f"Failed to find image type: {args.image}") def validate_image(builddir, imgtype, data): -- Gitee From 362a5a6ddbda722178797b854d562ec9ead004b2 Mon Sep 17 00:00:00 2001 From: Caohongtao Date: Tue, 30 Apr 2024 02:47:25 +0000 Subject: [PATCH 2/3] update src/cosalib/build.py. Signed-off-by: Caohongtao --- src/cosalib/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cosalib/build.py b/src/cosalib/build.py index 49d5baab..dd9ce3db 100644 --- a/src/cosalib/build.py +++ b/src/cosalib/build.py @@ -4,7 +4,6 @@ Provides a base abstration class for build reuse. import logging as log import os -import os.path import shutil import time import tempfile @@ -415,7 +414,7 @@ class _Build: self.unset_token() log.info("Finished building artifacts") if len(self._found_files.keys()) == 0: - log.warn("There were no files found after building") + log.warning("There were no files found after building") def _build_artifacts(self, *args, **kwargs): """ -- Gitee From 67aec92696bea6cfa34c33a834fb04cc691ce625 Mon Sep 17 00:00:00 2001 From: Caohongtao Date: Tue, 30 Apr 2024 06:53:57 +0000 Subject: [PATCH 3/3] update src/cosalib/ibmcloud.py. Signed-off-by: Caohongtao --- src/cosalib/ibmcloud.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cosalib/ibmcloud.py b/src/cosalib/ibmcloud.py index 7a6e3c56..13294fef 100644 --- a/src/cosalib/ibmcloud.py +++ b/src/cosalib/ibmcloud.py @@ -89,9 +89,13 @@ class IBMCloudImage(QemuVariantImage): """ ovf_params = self.generate_ovf_parameters(image_name) - with open(OVA_TEMPLATE_FILE) as f: - template = f.read() - ovf_xml = template.format(**ovf_params) + try: + with open(OVA_TEMPLATE_FILE,'r') as f: + template = f.read() + ovf_xml = template.format(**ovf_params) + except IOError: + log.error(f"Failed to open the {OVA_TEMPLATE_FILE}") + raise "No file to read" with open(self.ovf_path, "w") as ovf: ovf.write(ovf_xml) @@ -129,7 +133,7 @@ def ibmcloud_run_ore(build, args): '--region', f"{region}", '--cloud-object-storage', f"{cloud_object_storage}", '--bucket', f"{args.bucket}", - '--name', ibmcloud_object_name, + '--name', f"{ibmcloud_object_name}", '--file', f"{build.image_path}", ]) @@ -162,7 +166,7 @@ def ibmcloud_run_ore_replicate(build, args): else: ibmcloud_img_data = build.meta.get('ibmcloud', []) if len(ibmcloud_img_data) < 1: - raise SystemExit(("buildmeta doesn't contain source images. " + raise SystemExit(("Buildmeta doesn't contain source images. " "Run buildextend-{platform} first")) # define regions - https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-creating-power-virtual-server#creating-service @@ -173,7 +177,7 @@ def ibmcloud_run_ore_replicate(build, args): log.info(("default: replicating to all regions. If this is not " " desirable, use '--regions'")) - log.info("replicating to regions: %s", args.region) + log.info("Replicating to regions: %s", args.region) # only replicate to regions that don't already exist existing_regions = [item['region'] for item in ibmcloud_img_data] @@ -183,7 +187,7 @@ def ibmcloud_run_ore_replicate(build, args): ", skipping listed region(s)...")) region_list = list(set(args.region) - set(duplicates)) if len(region_list) == 0: - print("no new regions detected") + print("No new regions detected") sys.exit(0) source_object = ibmcloud_img_data[0]['object'] @@ -257,7 +261,7 @@ def get_ibmcloud_variant(variant, parser, kwargs={}): """ Helper function to get the IBMCloudImage Build Obj """ - log.debug(f"returning IBMCloudImage for {variant}") + log.debug(f"Returning IBMCloudImage for {variant}") return IBMCloudImage( buildroot=parser.buildroot, build=parser.build, -- Gitee