ALBS-1073: Prepare new configs of the building artifacts generator for all arches for 8.8-beta & 9.2-beta

- Option `extra_files` for extra_isos
This commit is contained in:
soksanichenko 2023-04-12 18:44:38 +03:00
parent 6bc55909b1
commit ed061c244a
5 changed files with 88 additions and 10 deletions

View File

@ -9,7 +9,17 @@
"AppStream" "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 }}-{arch}-{disc_type}{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"AppStream": { "AppStream": {
@ -84,7 +94,17 @@
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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 }}-{arch}-minimal{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"devel": { "devel": {

View File

@ -9,7 +9,17 @@
"AppStream" "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 }}-{arch}-{disc_type}{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"AppStream": { "AppStream": {
@ -84,7 +94,17 @@
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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 }}-{arch}-minimal{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"devel": { "devel": {

View File

@ -21,8 +21,6 @@ comps_file = {
"file": "{{ arch }}/comps.xml", "file": "{{ arch }}/comps.xml",
} }
compose_type = 'test'
link_type = 'hardlink' link_type = 'hardlink'
module_defaults_dir = { module_defaults_dir = {

View File

@ -9,7 +9,17 @@
"AppStream" "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 }}-{arch}-{disc_type}{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"AppStream": { "AppStream": {
@ -84,7 +94,17 @@
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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 }}-{arch}-minimal{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"devel": { "devel": {

View File

@ -9,7 +9,17 @@
"AppStream" "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 }}-{arch}-{disc_type}{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"AppStream": { "AppStream": {
@ -102,7 +112,17 @@
"extra_isos": [{ "extra_isos": [{
"include_variants": [], "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 }}-{arch}-minimal{suffix}",
"skip_src": true "skip_src": true,
"extra_files": [{
"scm": "git",
"repo": "https://git.almalinux.org/rpms/almalinux-release.git",
"branch": "a{{ distribution_major_version }}",
"file": [
"GPL",
"EULA",
"RPM-GPG-KEY-AlmaLinux-{{ distribution_major_version }}"
]
}]
}] }]
}, },
"devel": { "devel": {