From 244d56ce988e185fc518d055bc626082aeb61f11 Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Wed, 20 Nov 2024 02:40:09 +0200 Subject: [PATCH] - Image name/volume id format is changed to a common --- aarch64/variants_options.json | 4 ++-- ppc64le/variants_options.json | 4 ++-- pungi-build.conf.j2 | 4 ++-- s390x/variants_options.json | 4 ++-- x86_64/variants_options.json | 4 ++-- x86_64_v2/variants_options.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index 9f229a6..1a26cc8 100644 --- a/aarch64/variants_options.json +++ b/aarch64/variants_options.json @@ -70,12 +70,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_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 9f229a6..1a26cc8 100644 --- a/ppc64le/variants_options.json +++ b/ppc64le/variants_options.json @@ -70,12 +70,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2 index 0edc28b..ebcfa98 100644 --- a/pungi-build.conf.j2 +++ b/pungi-build.conf.j2 @@ -143,11 +143,11 @@ image_name_format = { "^{{ variant }}$": "{{ options['image_name_format'] }}", {% endif %} {% endfor %} - ".*": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", + ".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", } image_volid_formats = [ - '{release_short}-{{ distribution_major_version }}-{arch}', + '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}', ] # CREATEISO diff --git a/s390x/variants_options.json b/s390x/variants_options.json index a3b87a8..5afa8b1 100644 --- a/s390x/variants_options.json +++ b/s390x/variants_options.json @@ -70,12 +70,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_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 5714b79..37deeeb 100644 --- a/x86_64/variants_options.json +++ b/x86_64/variants_options.json @@ -88,12 +88,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{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 5714b79..37deeeb 100644 --- a/x86_64_v2/variants_options.json +++ b/x86_64_v2/variants_options.json @@ -88,12 +88,12 @@ }, "Minimal": { "gather_methods": "hybrid", - "image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "buildinstall_skip": false, "createiso_skip": true, "extra_isos": [{ "include_variants": [], - "filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", + "filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git",