From 76c4a756992c4995251d743113b62cc96f61361a Mon Sep 17 00:00:00 2001 From: akachanova Date: Wed, 27 Nov 2024 12:55:46 +0000 Subject: [PATCH] Fixing disc_type in BaseOS isos names --- aarch64/variants_options.json | 4 ++-- ppc64le/variants_options.json | 4 ++-- s390x/variants_options.json | 4 ++-- x86_64/variants_options.json | 4 ++-- x86_64_v2/variants_options.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index a4ce346..c1f0abe 100644 --- a/aarch64/variants_options.json +++ b/aarch64/variants_options.json @@ -2,13 +2,13 @@ "BaseOS": { "gather_methods": "hybrid", "buildinstall_skip": false, - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json index a4ce346..c1f0abe 100644 --- a/ppc64le/variants_options.json +++ b/ppc64le/variants_options.json @@ -2,13 +2,13 @@ "BaseOS": { "gather_methods": "hybrid", "buildinstall_skip": false, - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/s390x/variants_options.json b/s390x/variants_options.json index 7fb5230..007e807 100644 --- a/s390x/variants_options.json +++ b/s390x/variants_options.json @@ -2,13 +2,13 @@ "BaseOS": { "gather_methods": "hybrid", "buildinstall_skip": false, - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json index 1a1b510..62c2f27 100644 --- a/x86_64/variants_options.json +++ b/x86_64/variants_options.json @@ -2,13 +2,13 @@ "BaseOS": { "gather_methods": "hybrid", "buildinstall_skip": false, - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/x86_64_v2/variants_options.json b/x86_64_v2/variants_options.json index 1a1b510..62c2f27 100644 --- a/x86_64_v2/variants_options.json +++ b/x86_64_v2/variants_options.json @@ -2,13 +2,13 @@ "BaseOS": { "gather_methods": "hybrid", "buildinstall_skip": false, - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", -- 2.43.5