- Image name/volume id format is changed to a common

This commit is contained in:
Stepan Oksanichenko 2024-11-20 02:40:09 +02:00
parent 0391777da4
commit 244d56ce98
Signed by: soksanichenko
GPG Key ID: AB9983172AB1E45B
6 changed files with 12 additions and 12 deletions

View File

@ -70,12 +70,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "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, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

View File

@ -70,12 +70,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "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, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

View File

@ -143,11 +143,11 @@ image_name_format = {
"^{{ variant }}$": "{{ options['image_name_format'] }}", "^{{ variant }}$": "{{ options['image_name_format'] }}",
{% endif %} {% endif %}
{% endfor %} {% 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 = [ image_volid_formats = [
'{release_short}-{{ distribution_major_version }}-{arch}', '{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}',
] ]
# CREATEISO # CREATEISO

View File

@ -70,12 +70,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "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, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

View File

@ -88,12 +88,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "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, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",

View File

@ -88,12 +88,12 @@
}, },
"Minimal": { "Minimal": {
"gather_methods": "hybrid", "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, "buildinstall_skip": false,
"createiso_skip": true, "createiso_skip": true,
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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, "skip_src": true,
"extra_files": [{ "extra_files": [{
"scm": "git", "scm": "git",