From 20330706e5080b78bab2d4edac4ac9312441f5ee Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Mon, 15 Apr 2024 19:30:15 +0300 Subject: [PATCH] - Separate variable for an image name --- aarch64/variants_options.json | 8 ++++---- ppc64le/variants_options.json | 8 ++++---- s390x/variants_options.json | 8 ++++---- x86_64/variants_options.json | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index fdd50a7..2e85241 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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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", @@ -68,12 +68,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json index fdd50a7..2e85241 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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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", @@ -68,12 +68,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/s390x/variants_options.json b/s390x/variants_options.json index fdd50a7..2e85241 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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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", @@ -68,12 +68,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/x86_64/variants_options.json b/x86_64/variants_options.json index 212e5d3..9c9ccb6 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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{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", @@ -86,12 +86,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git",