From 63abb02707c804f756b3023edffa4e61dbebb4e2 Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Mon, 24 Apr 2023 13:14:44 +0300 Subject: [PATCH] - Serial number of the beta version --- aarch64/variants_options.json | 4 ++-- ppc64le/variants_options.json | 4 ++-- pungi-build.conf.j2 | 4 ++-- s390x/variants_options.json | 8 ++++---- x86_64/variants_options.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index 48ca059..1820a52 100644 --- a/aarch64/variants_options.json +++ b/aarch64/variants_options.json @@ -88,12 +88,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json index 48ca059..1820a52 100644 --- a/ppc64le/variants_options.json +++ b/ppc64le/variants_options.json @@ -88,12 +88,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2 index 5b2a8e0..770a129 100644 --- a/pungi-build.conf.j2 +++ b/pungi-build.conf.j2 @@ -140,11 +140,11 @@ image_name_format = { "^{{ variant }}$": "{{ options['image_name_format'] }}", {% endif %} {% endfor %} - ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}", + ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}-1-{arch}-{disc_type}{suffix}", } image_volid_formats = [ - '{release_short}-{{ full_version }}{{ beta_suffix }}-{arch}-{disc_type}', + '{release_short}-{{ full_version }}{{ beta_suffix }}-1-{arch}-{disc_type}', ] # CREATEISO diff --git a/s390x/variants_options.json b/s390x/variants_options.json index 48ca059..fedf9f4 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 }}-{arch}-{disc_type}{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-{disc_type}{suffix}", "createiso_skip": true, "extra_isos": [{ "include_variants": [ "AppStream" ], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-{disc_type}{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -88,12 +88,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{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 abe9dfa..1c42e56 100644 --- a/x86_64/variants_options.json +++ b/x86_64/variants_options.json @@ -106,12 +106,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}-1-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git",