almalinux/pungi-almalinux
14
2
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request 'Fix isos name template' (#5) from a10.0-beta-fix-isos-names into a10.0-beta

Browse Source 
Reviewed-on: #5
Reviewed-by: Stepan Oksanichenko <soksanichenko@noreply.localhost>
This commit is contained in:
Stepan Oksanichenko 2024-11-26 17:40:27 +00:00
commit abc668b736
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aarch64/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"createiso_skip": true,
"extra_isos": [{
"include_variants": [
"AppStream"
],
"filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"skip_src": true,
"extra_files": [{
"scm": "git",
@ -70,12 +70,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",

8
ppc64le/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"createiso_skip": true,
"extra_isos": [{
"include_variants": [
"AppStream"
],
"filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"skip_src": true,
"extra_files": [{
"scm": "git",
@ -70,12 +70,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",

2
pungi-build.conf.j2
View File

@ -143,7 +143,7 @@ image_name_format = {
"^{{ variant }}$": "{{ options['image_name_format'] }}",
{% endif %}
{% endfor %}
".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ volume_id_beta_suffix }}-{arch}-{disc_type}{suffix}",
".*": "{release_short}-{{ full_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-{disc_type}{suffix}",
}
image_volid_formats = [

8
s390x/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"createiso_skip": true,
"extra_isos": [{
"include_variants": [
"AppStream"
],
"filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"skip_src": true,
"extra_files": [{
"scm": "git",
@ -70,12 +70,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",

8
x86_64/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"createiso_skip": true,
"extra_isos": [{
"include_variants": [
"AppStream"
],
"filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{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 }}{{ 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",

8
x86_64_v2/variants_options.json
View File

@ -2,13 +2,13 @@
"BaseOS": {
"gather_methods": "hybrid",
"buildinstall_skip": false,
"image_name_format": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"image_name_format": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{suffix}",
"createiso_skip": true,
"extra_isos": [{
"include_variants": [
"AppStream"
],
"filename": "{release_short}-{{ distribution_major_version }}-{{ now(fmt='%Y%m%d') }}.{{ build_num }}-{arch}-{disc_type}{suffix}",
"filename": "{release_short}-{{ distribution_major_version }}.{{ distribution_minor_version }}{{ beta_suffix }}{{ image_name_beta_suffix }}-{arch}-boot{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 }}{{ 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",