Merge pull request #621 from vyos/mergify/bp/sagitta/pr-620

build-script: T3664: Add flavor and architecture to image name (rework) (backport #620)

Author: zdc

scripts/image-build/build-vyos-image

@@ -489,7 +489,7 @@ if __name__ == "__main__":
         iter(os.remove, artifacts)
 
         ## Create the target ISO file path
-        iso_file = "vyos-{0}-{1}.iso".format(version_data["version"], build_config["architecture"])
+        iso_file = f"vyos-{version_data['version']}-{build_config['build_flavor']}-{build_config['architecture']}.iso"
 
         ## Create live-build configuration files
 
@@ -645,6 +645,6 @@ Pin-Priority: 600
             for f in other_formats:
                 image_ext = build_config.get("image_ext", f)
                 image_opts = build_config.get("image_opts", "")
-                target = f"{os.path.splitext(raw_image)[0]}-{build_config['build_flavor']}.{image_ext}"
+                target = f"{os.path.splitext(raw_image)[0]}.{image_ext}"
                 print(f"I: Building {f} file {target}")
                 cmd(f"qemu-img convert -f raw -O {f} {image_opts} {raw_image} {target}")

scripts/image-build/raw_image.py

@@ -201,7 +201,7 @@ def create_raw_image(build_config, iso_file, work_dir):
         con.build_config = build_config
         version_data = read_version_data(con.iso_dir)
         version = version_data['version']
-        raw_file = f"vyos-{version}.raw"
+        raw_file = f"vyos-{version}-{build_config['build_flavor']}-{build_config['architecture']}.raw"
         print(f"I: Building raw file {raw_file}")
         create_disk(raw_file, build_config["disk_size"])
         setup_loop_device(con, raw_file)