From a8734de548a6610f8095b48ada3b0839440bf2d5 Mon Sep 17 00:00:00 2001 From: Stepan Oksanichenko Date: Fri, 27 Sep 2024 01:11:57 +0300 Subject: [PATCH] - Other naming of ISO images and volume ids --- aarch64/variants_options.json | 8 ++++---- ppc64le/variants_options.json | 8 ++++---- pungi-build.conf.j2 | 4 ++-- s390x/variants_options.json | 8 ++++---- x86_64/variants_options.json | 8 ++++---- x86_64_v2/variants_options.json | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aarch64/variants_options.json b/aarch64/variants_options.json index 23ab3ec..920ab4b 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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -79,12 +79,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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/ppc64le/variants_options.json b/ppc64le/variants_options.json index 23ab3ec..920ab4b 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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -79,12 +79,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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", diff --git a/pungi-build.conf.j2 b/pungi-build.conf.j2 index e888091..d0afc47 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}-{{ full_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}", + ".*": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", } image_volid_formats = [ - '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}', + '{release_short}-{{ distribution_major_version }}-{arch}', ] # CREATEISO diff --git a/s390x/variants_options.json b/s390x/variants_options.json index 4ec7871..91fd737 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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -79,12 +79,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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 da3cf66..6894e35 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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -97,12 +97,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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 da3cf66..6894e35 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 }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}", + "image_name_format": "{release_short}-{{ distribution_major_version }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}", "skip_src": true, "extra_files": [{ "scm": "git", @@ -97,12 +97,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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{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 }}{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-minimal{suffix}", "skip_src": true, "extra_files": [{ "scm": "git",